epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant zoom parameter.

Browse Source
This commit is contained in:
Paul Chote
2019-11-03 20:31:28 +00:00
committed by reaperrr
parent 327866ffc3
commit 8c41e6a3f7
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/ModelRenderer.cs
View File

@@ -64,10 +64,10 @@ namespace OpenRA.Graphics
shader.SetTexture("Palette", palette); 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 a = 2f / renderer.SheetSize;
var view = new float[] var view = new[]
{ {
a, 0, 0, 0, a, 0, 0, 0,
0, -a, 0, 0, 0, -a, 0, 0,

10
OpenRA.Game/Graphics/SpriteRenderer.cs
View File

@@ -155,17 +155,17 @@ namespace OpenRA.Graphics
shader.SetTexture("Palette", palette); 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("Scroll", scroll.X, scroll.Y, scroll.Y);
shader.SetVec("r1", shader.SetVec("r1",
zoom * 2f / screen.Width, 2f / screen.Width,
zoom * 2f / screen.Height, 2f / screen.Height,
-depthScale * zoom / screen.Height); -depthScale / screen.Height);
shader.SetVec("r2", -1, -1, 1 - depthOffset); shader.SetVec("r2", -1, -1, 1 - depthOffset);
// Texture index is sampled as a float, so convert to pixels then scale // 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) public void SetDepthPreviewEnabled(bool enabled)

6
OpenRA.Game/Renderer.cs
View File

@@ -161,7 +161,7 @@ namespace OpenRA
var bufferSize = new Size((int)(surfaceBufferSize.Width / scale), (int)(surfaceBufferSize.Height / scale)); var bufferSize = new Size((int)(surfaceBufferSize.Width / scale), (int)(surfaceBufferSize.Height / scale));
if (lastBufferSize != bufferSize) if (lastBufferSize != bufferSize)
{ {
SpriteRenderer.SetViewportParams(bufferSize, 0f, 0f, 1f, int2.Zero); SpriteRenderer.SetViewportParams(bufferSize, 0f, 0f, int2.Zero);
lastBufferSize = bufferSize; lastBufferSize = bufferSize;
} }
} }
@@ -194,8 +194,8 @@ namespace OpenRA
if (worldBufferSize != lastWorldBufferSize || lastWorldViewport != worldViewport) if (worldBufferSize != lastWorldBufferSize || lastWorldViewport != worldViewport)
{ {
var depthScale = worldBufferSize.Height / (worldBufferSize.Height + depthMargin); var depthScale = worldBufferSize.Height / (worldBufferSize.Height + depthMargin);
WorldSpriteRenderer.SetViewportParams(worldBufferSize, depthScale, depthScale / 2, 1f, worldViewport.Location); WorldSpriteRenderer.SetViewportParams(worldBufferSize, depthScale, depthScale / 2, worldViewport.Location);
WorldModelRenderer.SetViewportParams(worldBufferSize, 1f, worldViewport.Location); WorldModelRenderer.SetViewportParams(worldBufferSize, worldViewport.Location);
lastWorldViewport = worldViewport; lastWorldViewport = worldViewport;
lastWorldBufferSize = worldBufferSize; lastWorldBufferSize = worldBufferSize;