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

Add a basic actor properties panel to the editor.

Browse Source
This commit is contained in:
David Wilson
2018-11-24 09:54:47 +00:00
committed by Paul Chote
parent 9b4db3468b
commit 22bece2dc9
8 changed files with 440 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.Widgets
readonly EditorViewportControllerWidget editorWidget;
readonly EditorActorLayer editorLayer;
readonly Dictionary<int, ResourceType> resources;
public EditorActorPreview SelectedActor;
int2 worldPixel;
public EditorDefaultBrush(EditorViewportControllerWidget editorWidget, WorldRenderer wr)
@@ -60,9 +61,10 @@ namespace OpenRA.Mods.Common.Widgets
public bool HandleMouseInput(MouseInput mi)
{
// Exclusively uses mouse wheel and right mouse buttons, but nothing else
// Exclusively uses mouse wheel and both mouse buttons, but nothing else
// Mouse move events are important for tooltips, so we always allow these through
if ((mi.Button != MouseButton.Right && mi.Event != MouseInputEvent.Move && mi.Event != MouseInputEvent.Scroll) ||
if ((mi.Button != MouseButton.Left && mi.Button != MouseButton.Right
&& mi.Event != MouseInputEvent.Move && mi.Event != MouseInputEvent.Scroll) ||
mi.Event == MouseInputEvent.Down)
return false;
@@ -84,11 +86,17 @@ namespace OpenRA.Mods.Common.Widgets
if (mi.Event == MouseInputEvent.Move)
return false;
if (mi.Button == MouseButton.Left)
{
editorWidget.SetTooltip(null);
SelectedActor = underCursor;
}
if (mi.Button == MouseButton.Right)
{
editorWidget.SetTooltip(null);
if (underCursor != null)
if (underCursor != null && underCursor != SelectedActor)
editorLayer.Remove(underCursor);
if (mapResources.Contains(cell) && mapResources[cell].Type != 0)