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

Merge pull request #5540 from RoosterDragon/begin-frame-cache-viewport

Browse Source 
Avoid redundancy in BeginFrame.
This commit is contained in:
Paul Chote
2014-06-12 18:15:47 +12:00
parent f6f366c4b3 a2ed4fd5f9
commit b8cdb224d1
11 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -73,6 +73,7 @@ Also thanks to:
* Teemu Nieminen (Temeez)
* Tim Mylemans (gecko)
* Tirili
* Tom Roostan (RoosterDragon)
* Tristan Keating (Kilkakon)
* Tristan Mühlbacher (MicroBit)
* Vladimir Komarov (VrKomarov)

4
OpenRA.Game/Game.cs
View File

@@ -141,12 +141,12 @@ namespace OpenRA
// worldRenderer is null during the initial install/download screen
if (worldRenderer != null)
{
Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
worldRenderer.Draw();
}
else
Renderer.BeginFrame(float2.Zero, 1f);
Renderer.BeginFrame(int2.Zero, 1f);
using (new PerfSample("render_widgets"))
{

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

@@ -103,9 +103,9 @@ namespace OpenRA.Graphics
}
}
public void SetViewportParams(Size screen, float zoom, float2 scroll)
public void SetViewportParams(Size screen, float zoom, int2 scroll)
{
shader.SetVec("Scroll", (int)scroll.X, (int)scroll.Y);
shader.SetVec("Scroll", scroll.X, scroll.Y);
shader.SetVec("r1", zoom*2f/screen.Width, -zoom*2f/screen.Height);
shader.SetVec("r2", -1, 1);
}

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

@@ -58,9 +58,9 @@ namespace OpenRA.Graphics
nv += 4;
}
public void SetViewportParams(Size screen, float zoom, float2 scroll)
public void SetViewportParams(Size screen, float zoom, int2 scroll)
{
shader.SetVec("Scroll", (int)scroll.X, (int)scroll.Y);
shader.SetVec("Scroll", scroll.X, scroll.Y);
shader.SetVec("r1", zoom*2f/screen.Width, -zoom*2f/screen.Height);
shader.SetVec("r2", -1, 1);
}

35
OpenRA.Game/Graphics/Renderer.cs
View File

@@ -65,17 +65,34 @@ namespace OpenRA.Graphics
internal IGraphicsDevice Device { get { return device; } }
public void BeginFrame(float2 scroll, float zoom)
Size? lastResolution;
int2? lastScroll;
float? lastZoom;
public void BeginFrame(int2 scroll, float zoom)
{
device.Clear();
WorldSpriteRenderer.SetViewportParams(Resolution, zoom, scroll);
WorldRgbaSpriteRenderer.SetViewportParams(Resolution, zoom, scroll);
SpriteRenderer.SetViewportParams(Resolution, 1f, float2.Zero);
RgbaSpriteRenderer.SetViewportParams(Resolution, 1f, float2.Zero);
WorldLineRenderer.SetViewportParams(Resolution, zoom, scroll);
WorldQuadRenderer.SetViewportParams(Resolution, zoom, scroll);
LineRenderer.SetViewportParams(Resolution, 1f, float2.Zero);
WorldVoxelRenderer.SetViewportParams(Resolution, zoom, scroll);
var resolutionChanged = lastResolution != Resolution;
if (resolutionChanged)
{
lastResolution = Resolution;
RgbaSpriteRenderer.SetViewportParams(Resolution, 1f, int2.Zero);
SpriteRenderer.SetViewportParams(Resolution, 1f, int2.Zero);
LineRenderer.SetViewportParams(Resolution, 1f, int2.Zero);
}
// If zoom evaluates as different due to floating point weirdness that's OK, setting the parameters again is harmless.
if (resolutionChanged || lastScroll != scroll || lastZoom != zoom)
{
lastScroll = scroll;
lastZoom = zoom;
WorldRgbaSpriteRenderer.SetViewportParams(Resolution, zoom, scroll);
WorldSpriteRenderer.SetViewportParams(Resolution, zoom, scroll);
WorldVoxelRenderer.SetViewportParams(Resolution, zoom, scroll);
WorldLineRenderer.SetViewportParams(Resolution, zoom, scroll);
WorldQuadRenderer.SetViewportParams(Resolution, zoom, scroll);
}
}
ITexture currentPaletteTexture;

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

@@ -120,9 +120,9 @@ namespace OpenRA.Graphics
shader.SetTexture("Palette", palette);
}
public void SetViewportParams(Size screen, float zoom, float2 scroll)
public void SetViewportParams(Size screen, float zoom, int2 scroll)
{
shader.SetVec("Scroll", (int)scroll.X, (int)scroll.Y);
shader.SetVec("Scroll", scroll.X, scroll.Y);
shader.SetVec("r1", zoom*2f/screen.Width, -zoom*2f/screen.Height);
shader.SetVec("r2", -1, 1);
}

2
OpenRA.Game/Graphics/VoxelRenderer.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Graphics
shader.SetTexture("Palette", palette);
}
public void SetViewportParams(Size screen, float zoom, float2 scroll)
public void SetViewportParams(Size screen, float zoom, int2 scroll)
{
var a = 2f / Renderer.SheetSize;
var view = new float[]

2
OpenRA.Mods.Cnc/CncLoadScreen.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Cnc
loadTimer.Restart();
loadTick = ++loadTick % 8;
r.BeginFrame(float2.Zero, 1f);
r.BeginFrame(int2.Zero, 1f);
r.RgbaSpriteRenderer.DrawSprite(gdiLogo, gdiPos);
r.RgbaSpriteRenderer.DrawSprite(nodLogo, nodPos);
r.RgbaSpriteRenderer.DrawSprite(evaLogo, evaPos);

2
OpenRA.Mods.RA/DefaultLoadScreen.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.RA
var text = messages.Random(Game.CosmeticRandom);
var textSize = r.Fonts["Bold"].Measure(text);
r.BeginFrame(float2.Zero, 1f);
r.BeginFrame(int2.Zero, 1f);
WidgetUtils.FillRectWithSprite(stripeRect, stripe);
r.RgbaSpriteRenderer.DrawSprite(logo, logoPos);
r.Fonts["Bold"].DrawText(text, new float2(r.Resolution.Width - textSize.X - 20, r.Resolution.Height - textSize.Y - 20), Color.White);

2
OpenRA.Mods.RA/ModChooserLoadScreen.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Cnc
if (r == null)
return;
r.BeginFrame(float2.Zero, 1f);
r.BeginFrame(int2.Zero, 1f);
WidgetUtils.FillRectWithSprite(bounds, sprite);
r.EndFrame(new NullInputHandler());
}

2
OpenRA.Mods.RA/NullLoadScreen.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA
return;
// Draw a black screen
Game.Renderer.BeginFrame(float2.Zero, 1f);
Game.Renderer.BeginFrame(int2.Zero, 1f);
Game.Renderer.EndFrame( new NullInputHandler() );
}