From ab14a86d39ff8d9115ce517f9b60fcfaf0e3cd02 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 5 Jun 2018 20:08:44 +0100 Subject: [PATCH] Rename Renderer.Device to Renderer.Window. --- OpenRA.Game/Game.cs | 2 +- OpenRA.Game/Graphics/HardwareCursor.cs | 6 +-- OpenRA.Game/Graphics/HardwarePalette.cs | 2 +- OpenRA.Game/Graphics/ModelRenderer.cs | 6 +-- OpenRA.Game/Graphics/Sheet.cs | 2 +- OpenRA.Game/Graphics/SoftwareCursor.cs | 2 +- OpenRA.Game/Graphics/SpriteRenderer.cs | 8 ++-- OpenRA.Game/Graphics/TerrainSpriteLayer.cs | 2 +- OpenRA.Game/Graphics/WorldRenderer.cs | 4 +- OpenRA.Game/Renderer.cs | 54 +++++++++++----------- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 4aac25096b..d2bba646ce 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -523,7 +523,7 @@ namespace OpenRA Bitmap bitmap; using (new PerfTimer("Renderer.TakeScreenshot")) - bitmap = Renderer.Device.TakeScreenshot(); + bitmap = Renderer.Window.TakeScreenshot(); ThreadPool.QueueUserWorkItem(_ => { diff --git a/OpenRA.Game/Graphics/HardwareCursor.cs b/OpenRA.Game/Graphics/HardwareCursor.cs index 11b4dd63f8..bcfa5f350f 100644 --- a/OpenRA.Game/Graphics/HardwareCursor.cs +++ b/OpenRA.Game/Graphics/HardwareCursor.cs @@ -80,7 +80,7 @@ namespace OpenRA.Graphics } } - return Game.Renderer.Device.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot); + return Game.Renderer.Window.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot); } public void SetCursor(string cursorName) @@ -113,13 +113,13 @@ namespace OpenRA.Graphics void Update() { if (cursor == null) - Game.Renderer.Device.SetHardwareCursor(null); + Game.Renderer.Window.SetHardwareCursor(null); else { if (frame >= cursor.Length) frame = frame % cursor.Length; - Game.Renderer.Device.SetHardwareCursor(hardwareCursors[cursor.Name][frame]); + Game.Renderer.Window.SetHardwareCursor(hardwareCursors[cursor.Name][frame]); } } diff --git a/OpenRA.Game/Graphics/HardwarePalette.cs b/OpenRA.Game/Graphics/HardwarePalette.cs index b3a812b7e7..0ea4376c15 100644 --- a/OpenRA.Game/Graphics/HardwarePalette.cs +++ b/OpenRA.Game/Graphics/HardwarePalette.cs @@ -27,7 +27,7 @@ namespace OpenRA.Graphics public HardwarePalette() { - Texture = Game.Renderer.Device.CreateTexture(); + Texture = Game.Renderer.Window.CreateTexture(); readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly(); } diff --git a/OpenRA.Game/Graphics/ModelRenderer.cs b/OpenRA.Game/Graphics/ModelRenderer.cs index 96d5a2bdf0..b0ce131394 100644 --- a/OpenRA.Game/Graphics/ModelRenderer.cs +++ b/OpenRA.Game/Graphics/ModelRenderer.cs @@ -300,14 +300,14 @@ namespace OpenRA.Graphics Game.Renderer.Flush(); fbo.Bind(); - Game.Renderer.Device.EnableDepthBuffer(); + Game.Renderer.Window.EnableDepthBuffer(); return fbo; } void DisableFrameBuffer(IFrameBuffer fbo) { Game.Renderer.Flush(); - Game.Renderer.Device.DisableDepthBuffer(); + Game.Renderer.Window.DisableDepthBuffer(); fbo.Unbind(); } @@ -356,7 +356,7 @@ namespace OpenRA.Graphics } var size = new Size(renderer.SheetSize, renderer.SheetSize); - var framebuffer = renderer.Device.CreateFrameBuffer(size); + var framebuffer = renderer.Window.CreateFrameBuffer(size); var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture); mappedBuffers.Add(sheet, framebuffer); diff --git a/OpenRA.Game/Graphics/Sheet.cs b/OpenRA.Game/Graphics/Sheet.cs index 9e594decb6..ec23905999 100644 --- a/OpenRA.Game/Graphics/Sheet.cs +++ b/OpenRA.Game/Graphics/Sheet.cs @@ -66,7 +66,7 @@ namespace OpenRA.Graphics { if (texture == null) { - texture = Game.Renderer.Device.CreateTexture(); + texture = Game.Renderer.Window.CreateTexture(); dirty = true; } diff --git a/OpenRA.Game/Graphics/SoftwareCursor.cs b/OpenRA.Game/Graphics/SoftwareCursor.cs index 48a6a69f8a..92d2a43367 100644 --- a/OpenRA.Game/Graphics/SoftwareCursor.cs +++ b/OpenRA.Game/Graphics/SoftwareCursor.cs @@ -50,7 +50,7 @@ namespace OpenRA.Graphics sheetBuilder.Current.ReleaseBuffer(); - Game.Renderer.Device.SetHardwareCursor(null); + Game.Renderer.Window.SetHardwareCursor(null); } PaletteReference CreatePaletteReference(string name) diff --git a/OpenRA.Game/Graphics/SpriteRenderer.cs b/OpenRA.Game/Graphics/SpriteRenderer.cs index 5f412f90d2..81df72410e 100644 --- a/OpenRA.Game/Graphics/SpriteRenderer.cs +++ b/OpenRA.Game/Graphics/SpriteRenderer.cs @@ -43,10 +43,10 @@ namespace OpenRA.Graphics sheets[i] = null; } - renderer.Device.SetBlendMode(currentBlend); + renderer.Window.SetBlendMode(currentBlend); shader.PrepareRender(); renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList); - renderer.Device.SetBlendMode(BlendMode.None); + renderer.Window.SetBlendMode(BlendMode.None); nv = 0; ns = 0; @@ -131,10 +131,10 @@ namespace OpenRA.Graphics public void DrawVertexBuffer(IVertexBuffer buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode) { shader.SetTexture("Texture0", sheet.GetTexture()); - renderer.Device.SetBlendMode(blendMode); + renderer.Window.SetBlendMode(blendMode); shader.PrepareRender(); renderer.DrawBatch(buffer, start, length, type); - renderer.Device.SetBlendMode(BlendMode.None); + renderer.Window.SetBlendMode(BlendMode.None); } // For RGBAColorRenderer diff --git a/OpenRA.Game/Graphics/TerrainSpriteLayer.cs b/OpenRA.Game/Graphics/TerrainSpriteLayer.cs index 87175c54d1..6ba0689bef 100644 --- a/OpenRA.Game/Graphics/TerrainSpriteLayer.cs +++ b/OpenRA.Game/Graphics/TerrainSpriteLayer.cs @@ -46,7 +46,7 @@ namespace OpenRA.Graphics rowStride = 6 * map.MapSize.X; vertices = new Vertex[rowStride * map.MapSize.Y]; - vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length); + vertexBuffer = Game.Renderer.Window.CreateVertexBuffer(vertices.Length); emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha); wr.PaletteInvalidated += UpdatePaletteIndices; diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs index 7f2cff361d..39f0b58318 100644 --- a/OpenRA.Game/Graphics/WorldRenderer.cs +++ b/OpenRA.Game/Graphics/WorldRenderer.cs @@ -179,7 +179,7 @@ namespace OpenRA.Graphics Game.Renderer.EnableScissor(bounds); if (enableDepthBuffer) - Game.Renderer.Device.EnableDepthBuffer(); + Game.Renderer.Window.EnableDepthBuffer(); terrainRenderer.Draw(this, Viewport); Game.Renderer.Flush(); @@ -203,7 +203,7 @@ namespace OpenRA.Graphics a.Trait.RenderShroud(renderShroud, this); if (enableDepthBuffer) - Game.Renderer.Device.DisableDepthBuffer(); + Game.Renderer.Window.DisableDepthBuffer(); Game.Renderer.DisableScissor(); diff --git a/OpenRA.Game/Renderer.cs b/OpenRA.Game/Renderer.cs index 25259e609e..1ed593c461 100644 --- a/OpenRA.Game/Renderer.cs +++ b/OpenRA.Game/Renderer.cs @@ -29,7 +29,7 @@ namespace OpenRA public RgbaSpriteRenderer RgbaSpriteRenderer { get; private set; } public IReadOnlyDictionary Fonts; - internal IPlatformWindow Device { get; private set; } + internal IPlatformWindow Window { get; private set; } internal int SheetSize { get; private set; } internal int TempBufferSize { get; private set; } @@ -51,20 +51,20 @@ namespace OpenRA { var resolution = GetResolution(graphicSettings); - Device = platform.CreateWindow(new Size(resolution.Width, resolution.Height), graphicSettings.Mode); + Window = platform.CreateWindow(new Size(resolution.Width, resolution.Height), graphicSettings.Mode); TempBufferSize = graphicSettings.BatchSize; SheetSize = graphicSettings.SheetSize; - WorldSpriteRenderer = new SpriteRenderer(this, Device.CreateShader("combined")); + WorldSpriteRenderer = new SpriteRenderer(this, Window.CreateShader("combined")); WorldRgbaSpriteRenderer = new RgbaSpriteRenderer(WorldSpriteRenderer); WorldRgbaColorRenderer = new RgbaColorRenderer(WorldSpriteRenderer); - WorldModelRenderer = new ModelRenderer(this, Device.CreateShader("model")); - SpriteRenderer = new SpriteRenderer(this, Device.CreateShader("combined")); + WorldModelRenderer = new ModelRenderer(this, Window.CreateShader("model")); + SpriteRenderer = new SpriteRenderer(this, Window.CreateShader("combined")); RgbaSpriteRenderer = new RgbaSpriteRenderer(SpriteRenderer); RgbaColorRenderer = new RgbaColorRenderer(SpriteRenderer); - tempBuffer = Device.CreateVertexBuffer(TempBufferSize); + tempBuffer = Window.CreateVertexBuffer(TempBufferSize); } static Size GetResolution(GraphicSettings graphicsSettings) @@ -87,10 +87,10 @@ namespace OpenRA fontSheetBuilder = new SheetBuilder(SheetType.BGRA, 512); Fonts = modData.Manifest.Fonts.ToDictionary(x => x.Key, x => new SpriteFont(x.Value.First, modData.DefaultFileSystem.Open(x.Value.First).ReadAllBytes(), - x.Value.Second, Device.WindowScale, fontSheetBuilder)).AsReadOnly(); + x.Value.Second, Window.WindowScale, fontSheetBuilder)).AsReadOnly(); } - Device.OnWindowScaleChanged += (before, after) => + Window.OnWindowScaleChanged += (before, after) => { foreach (var f in Fonts) f.Value.SetScale(after); @@ -113,7 +113,7 @@ namespace OpenRA public void BeginFrame(int2 scroll, float zoom) { - Device.Clear(); + Window.Clear(); SetViewportParams(scroll, zoom); } @@ -153,8 +153,8 @@ namespace OpenRA public void EndFrame(IInputHandler inputHandler) { Flush(); - Device.PumpInput(inputHandler); - Device.Present(); + Window.PumpInput(inputHandler); + Window.Present(); } public void DrawBatch(Vertex[] vertices, int numVertices, PrimitiveType type) @@ -168,7 +168,7 @@ namespace OpenRA where T : struct { vertices.Bind(); - Device.DrawPrimitives(type, firstVertex, numVertices); + Window.DrawPrimitives(type, firstVertex, numVertices); PerfHistory.Increment("batches", 1); } @@ -177,8 +177,8 @@ namespace OpenRA CurrentBatchRenderer = null; } - public Size Resolution { get { return Device.WindowSize; } } - public float WindowScale { get { return Device.WindowScale; } } + public Size Resolution { get { return Window.WindowSize; } } + public float WindowScale { get { return Window.WindowScale; } } public interface IBatchRenderer { void Flush(); } @@ -201,7 +201,7 @@ namespace OpenRA public IVertexBuffer CreateVertexBuffer(int length) { - return Device.CreateVertexBuffer(length); + return Window.CreateVertexBuffer(length); } public void EnableScissor(Rectangle rect) @@ -211,7 +211,7 @@ namespace OpenRA rect.Intersect(scissorState.Peek()); Flush(); - Device.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height); + Window.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height); scissorState.Push(rect); } @@ -224,43 +224,43 @@ namespace OpenRA if (scissorState.Any()) { var rect = scissorState.Peek(); - Device.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height); + Window.EnableScissor(rect.Left, rect.Top, rect.Width, rect.Height); } else - Device.DisableScissor(); + Window.DisableScissor(); } public void EnableDepthBuffer() { Flush(); - Device.EnableDepthBuffer(); + Window.EnableDepthBuffer(); } public void DisableDepthBuffer() { Flush(); - Device.DisableDepthBuffer(); + Window.DisableDepthBuffer(); } public void ClearDepthBuffer() { Flush(); - Device.ClearDepthBuffer(); + Window.ClearDepthBuffer(); } public void GrabWindowMouseFocus() { - Device.GrabWindowMouseFocus(); + Window.GrabWindowMouseFocus(); } public void ReleaseWindowMouseFocus() { - Device.ReleaseWindowMouseFocus(); + Window.ReleaseWindowMouseFocus(); } public void Dispose() { - Device.Dispose(); + Window.Dispose(); WorldModelRenderer.Dispose(); tempBuffer.Dispose(); if (fontSheetBuilder != null) @@ -272,17 +272,17 @@ namespace OpenRA public string GetClipboardText() { - return Device.GetClipboardText(); + return Window.GetClipboardText(); } public bool SetClipboardText(string text) { - return Device.SetClipboardText(text); + return Window.SetClipboardText(text); } public string GLVersion { - get { return Device.GLVersion; } + get { return Window.GLVersion; } } } }