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

Refactor existing hodgepodge of hardcoded mouse/keyboard events into DefaultInputController.

Browse Source
This commit is contained in:
Paul Chote
2010-07-25 18:12:02 +12:00
parent 2248320af7
commit eac49ca641
10 changed files with 115 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ namespace OpenRA.Graphics
public int Width { get { return (int)screenSize.X; } }
public int Height { get { return (int)screenSize.Y; } }
int2 mousePos;
float cursorFrame = 0f;
public void Scroll(float2 delta)
@@ -61,9 +60,9 @@ namespace OpenRA.Graphics
Widget.DoDraw(world);
Timer.Time( "widgets: {0}" );
var cursorName = Widget.RootWidget.GetCursorOuter(mousePos) ?? "default";
var cursorName = Widget.RootWidget.GetCursorOuter(Widget.LastMousePos) ?? "default";
var c = new Cursor(cursorName);
c.Draw((int)cursorFrame, mousePos + Location);
c.Draw((int)cursorFrame, Widget.LastMousePos + Location);
Timer.Time( "cursors: {0}" );
renderer.RgbaSpriteRenderer.Flush();
@@ -79,14 +78,6 @@ namespace OpenRA.Graphics
cursorFrame += 0.5f;
}
public void DispatchMouseInput(World world, MouseInput mi)
{
if (mi.Event == MouseInputEvent.Move)
mousePos = mi.Location;
Widget.HandleInput(world, mi);
}
public float2 ViewToWorld(MouseInput mi)
{
return (1f / Game.CellSize) * (new float2(mi.Location.X, mi.Location.Y) + Location);