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

Move Viewport inside WorldRenderer.

Browse Source
This commit is contained in:
Paul Chote
2013-09-27 18:21:05 +12:00
parent fe8c80aca6
commit 936bf98496
3 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -66,8 +66,6 @@ namespace OpenRA.Graphics
}
}
float cursorFrame = 0f;
public static int TicksSinceLastMove = 0;
public static int2 LastMousePos;
@@ -111,30 +109,6 @@ namespace OpenRA.Graphics
scrollPosition = new int2(scrollLimits.Location) + new int2(scrollLimits.Size)/2;
}
public void DrawRegions(WorldRenderer wr, IInputHandler inputHandler)
{
Game.Renderer.BeginFrame(scrollPosition, Zoom);
if (wr != null)
wr.Draw();
using (new PerfSample("render_widgets"))
{
Ui.Draw();
var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default";
CursorProvider.DrawCursor(Game.Renderer, cursorName, Viewport.LastMousePos, (int)cursorFrame);
}
using (new PerfSample("render_flip"))
{
Game.Renderer.EndFrame(inputHandler);
}
}
public void Tick()
{
cursorFrame += 0.5f;
}
// Convert from viewport coords to cell coords (not px)
public CPos ViewToWorld(MouseInput mi) { return ViewToWorld(mi.Location); }
public CPos ViewToWorld(int2 loc)