diff --git a/OpenRA.Game/Graphics/ModelRenderer.cs b/OpenRA.Game/Graphics/ModelRenderer.cs index 20b5a777db..5761ca4f26 100644 --- a/OpenRA.Game/Graphics/ModelRenderer.cs +++ b/OpenRA.Game/Graphics/ModelRenderer.cs @@ -64,10 +64,10 @@ namespace OpenRA.Graphics shader.SetTexture("Palette", palette); } - public void SetViewportParams(Size screen, float zoom, int2 scroll) + public void SetViewportParams(Size screen, int2 scroll) { var a = 2f / renderer.SheetSize; - var view = new float[] + var view = new[] { a, 0, 0, 0, 0, -a, 0, 0, diff --git a/OpenRA.Game/Graphics/SpriteRenderer.cs b/OpenRA.Game/Graphics/SpriteRenderer.cs index 1193f449c8..620b4dfd79 100644 --- a/OpenRA.Game/Graphics/SpriteRenderer.cs +++ b/OpenRA.Game/Graphics/SpriteRenderer.cs @@ -155,17 +155,17 @@ namespace OpenRA.Graphics shader.SetTexture("Palette", palette); } - public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll) + public void SetViewportParams(Size screen, float depthScale, float depthOffset, int2 scroll) { shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y); shader.SetVec("r1", - zoom * 2f / screen.Width, - zoom * 2f / screen.Height, - -depthScale * zoom / screen.Height); + 2f / screen.Width, + 2f / screen.Height, + -depthScale / screen.Height); shader.SetVec("r2", -1, -1, 1 - depthOffset); // Texture index is sampled as a float, so convert to pixels then scale - shader.SetVec("DepthTextureScale", 128 * depthScale * zoom / screen.Height); + shader.SetVec("DepthTextureScale", 128 * depthScale / screen.Height); } public void SetDepthPreviewEnabled(bool enabled) diff --git a/OpenRA.Game/Renderer.cs b/OpenRA.Game/Renderer.cs index 70a1c8e103..d41cc9e600 100644 --- a/OpenRA.Game/Renderer.cs +++ b/OpenRA.Game/Renderer.cs @@ -161,7 +161,7 @@ namespace OpenRA var bufferSize = new Size((int)(surfaceBufferSize.Width / scale), (int)(surfaceBufferSize.Height / scale)); if (lastBufferSize != bufferSize) { - SpriteRenderer.SetViewportParams(bufferSize, 0f, 0f, 1f, int2.Zero); + SpriteRenderer.SetViewportParams(bufferSize, 0f, 0f, int2.Zero); lastBufferSize = bufferSize; } } @@ -194,8 +194,8 @@ namespace OpenRA if (worldBufferSize != lastWorldBufferSize || lastWorldViewport != worldViewport) { var depthScale = worldBufferSize.Height / (worldBufferSize.Height + depthMargin); - WorldSpriteRenderer.SetViewportParams(worldBufferSize, depthScale, depthScale / 2, 1f, worldViewport.Location); - WorldModelRenderer.SetViewportParams(worldBufferSize, 1f, worldViewport.Location); + WorldSpriteRenderer.SetViewportParams(worldBufferSize, depthScale, depthScale / 2, worldViewport.Location); + WorldModelRenderer.SetViewportParams(worldBufferSize, worldViewport.Location); lastWorldViewport = worldViewport; lastWorldBufferSize = worldBufferSize;