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

Merge pull request #9258 from Mailaender/editor-mousewheel

Browse Source 
Added stepless mouse wheel actor rotation to the editor
This commit is contained in:
Pavel Penev
2015-09-09 17:33:52 +03:00
parent 9e6c664f30 154225d9ee
commit 14defdea6c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/EditorBrushes/EditorDefaultBrush.cs
View File

@@ -53,9 +53,9 @@ namespace OpenRA.Mods.Common.Widgets
public bool HandleMouseInput(MouseInput mi) public bool HandleMouseInput(MouseInput mi)
{ {
// Exclusively uses left and right mouse buttons, but nothing else // Exclusively uses mouse wheel and right mouse buttons, but nothing else
// Mouse move events are important for tooltips, so we always allow these through // Mouse move events are important for tooltips, so we always allow these through
if (mi.Button != MouseButton.Left && mi.Button != MouseButton.Right && mi.Event != MouseInputEvent.Move) if (mi.Button != MouseButton.Right && mi.Event != MouseInputEvent.Move && mi.Event != MouseInputEvent.Scroll)
return false; return false;
var cell = worldRenderer.Viewport.ViewToWorld(mi.Location); var cell = worldRenderer.Viewport.ViewToWorld(mi.Location);
@@ -88,22 +88,22 @@ namespace OpenRA.Mods.Common.Widgets
if (mapResources.Contains(cell) && mapResources[cell].Type != 0) if (mapResources.Contains(cell) && mapResources[cell].Type != 0)
mapResources[cell] = new ResourceTile(); mapResources[cell] = new ResourceTile();
} }
else if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down) else if (mi.Event == MouseInputEvent.Scroll)
{ {
if (underCursor != null) if (underCursor != null)
{ {
// Test case / demonstration of how to edit an existing actor // Test case / demonstration of how to edit an existing actor
var facing = underCursor.Init<FacingInit>(); var facing = underCursor.Init<FacingInit>();
if (facing != null) if (facing != null)
underCursor.ReplaceInit(new FacingInit((facing.Value(world) + 32) % 256)); underCursor.ReplaceInit(new FacingInit((facing.Value(world) + mi.ScrollDelta) % 256));
else if (underCursor.Info.Traits.WithInterface<UsesInit<FacingInit>>().Any()) else if (underCursor.Info.Traits.WithInterface<UsesInit<FacingInit>>().Any())
underCursor.ReplaceInit(new FacingInit(32)); underCursor.ReplaceInit(new FacingInit(mi.ScrollDelta));
var turret = underCursor.Init<TurretFacingInit>(); var turret = underCursor.Init<TurretFacingInit>();
if (turret != null) if (turret != null)
underCursor.ReplaceInit(new TurretFacingInit((turret.Value(world) + 32) % 256)); underCursor.ReplaceInit(new TurretFacingInit((turret.Value(world) + mi.ScrollDelta) % 256));
else if (underCursor.Info.Traits.WithInterface<UsesInit<TurretFacingInit>>().Any()) else if (underCursor.Info.Traits.WithInterface<UsesInit<TurretFacingInit>>().Any())
underCursor.ReplaceInit(new TurretFacingInit(32)); underCursor.ReplaceInit(new TurretFacingInit(mi.ScrollDelta));
} }
} }