From 43eb4dadc990574c378dc5b80b84140e90d60030 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 29 Nov 2015 11:53:22 +0000 Subject: [PATCH] Remove obsolete QuadRenderer. --- OpenRA.Game/Graphics/QuadRenderer.cs | 72 ---------------------------- OpenRA.Game/OpenRA.Game.csproj | 1 - OpenRA.Game/Renderer.cs | 3 -- 3 files changed, 76 deletions(-) delete mode 100644 OpenRA.Game/Graphics/QuadRenderer.cs diff --git a/OpenRA.Game/Graphics/QuadRenderer.cs b/OpenRA.Game/Graphics/QuadRenderer.cs deleted file mode 100644 index 39733df5a6..0000000000 --- a/OpenRA.Game/Graphics/QuadRenderer.cs +++ /dev/null @@ -1,72 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2015 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System; -using System.Drawing; - -namespace OpenRA.Graphics -{ - public class QuadRenderer : Renderer.IBatchRenderer - { - readonly Renderer renderer; - readonly IShader shader; - readonly Action renderAction; - - readonly Vertex[] vertices; - int nv = 0; - - public QuadRenderer(Renderer renderer, IShader shader) - { - this.renderer = renderer; - this.shader = shader; - vertices = new Vertex[renderer.TempBufferSize]; - renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.QuadList); - } - - public void Flush() - { - if (nv > 0) - { - renderer.Device.SetBlendMode(BlendMode.Alpha); - shader.Render(renderAction); - renderer.Device.SetBlendMode(BlendMode.None); - - nv = 0; - } - } - - public void FillRect(RectangleF rect, Color color) - { - renderer.CurrentBatchRenderer = this; - - if (nv + 4 > renderer.TempBufferSize) - Flush(); - - color = Util.PremultiplyAlpha(color); - var r = color.R / 255.0f; - var g = color.G / 255.0f; - var b = color.B / 255.0f; - var a = color.A / 255.0f; - vertices[nv] = new Vertex(new float2(rect.Left, rect.Top), r, g, b, a); - vertices[nv + 1] = new Vertex(new float2(rect.Right, rect.Top), r, g, b, a); - vertices[nv + 2] = new Vertex(new float2(rect.Right, rect.Bottom), r, g, b, a); - vertices[nv + 3] = new Vertex(new float2(rect.Left, rect.Bottom), r, g, b, a); - - nv += 4; - } - - public void SetViewportParams(Size screen, float zoom, int2 scroll) - { - shader.SetVec("Scroll", scroll.X, scroll.Y); - shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height); - shader.SetVec("r2", -1, 1); - } - } -} diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 23dd37ba76..4c9bf7f17b 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -102,7 +102,6 @@ - diff --git a/OpenRA.Game/Renderer.cs b/OpenRA.Game/Renderer.cs index c3952a9769..1321f09a66 100644 --- a/OpenRA.Game/Renderer.cs +++ b/OpenRA.Game/Renderer.cs @@ -22,7 +22,6 @@ namespace OpenRA { public SpriteRenderer WorldSpriteRenderer { get; private set; } public SpriteRenderer WorldRgbaSpriteRenderer { get; private set; } - public QuadRenderer WorldQuadRenderer { get; private set; } public LineRenderer WorldLineRenderer { get; private set; } public RgbaColorRenderer WorldRgbaColorRenderer { get; private set; } public VoxelRenderer WorldVoxelRenderer { get; private set; } @@ -69,7 +68,6 @@ namespace OpenRA WorldVoxelRenderer = new VoxelRenderer(this, Device.CreateShader("vxl")); LineRenderer = new LineRenderer(this, Device.CreateShader("color")); RgbaColorRenderer = new RgbaColorRenderer(this, Device.CreateShader("color")); - WorldQuadRenderer = new QuadRenderer(this, Device.CreateShader("color")); RgbaSpriteRenderer = new SpriteRenderer(this, Device.CreateShader("rgba")); SpriteRenderer = new SpriteRenderer(this, Device.CreateShader("shp")); @@ -135,7 +133,6 @@ namespace OpenRA WorldVoxelRenderer.SetViewportParams(Resolution, zoom, scroll); WorldLineRenderer.SetViewportParams(Resolution, zoom, scroll); WorldRgbaColorRenderer.SetViewportParams(Resolution, zoom, scroll); - WorldQuadRenderer.SetViewportParams(Resolution, zoom, scroll); } }