Leahnaya/HexManiacAdvance
1
0
Fork 0
mirror of https://github.com/haven1433/HexManiacAdvance.git synced 2026-10-01 20:56:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
haven1433
2022-11-04 10:51:55 -05:00
parent 0bcaccea82
commit 4934b336ea
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/HexManiac.Core/ViewModels/Map/MapEditorViewModel.cs
View File

@@ -501,7 +501,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
#region Primary Interaction (left-click)
private PrimaryInteractionType interactionType;
public void PrimaryDown(double x, double y, int clickCount) {
public void PrimaryDown(double x, double y, PrimaryInteractionStart click) {
PrimaryMap.BlockEditor.ShowTiles = false;
PrimaryMap.BorderEditor.ShowBorderPanel = false;
var map = MapUnderCursor(x, y);
@@ -512,7 +512,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
var ev = map.EventUnderCursor(x, y);
if (ev != null) {
EventDown(x, y, ev, clickCount);
EventDown(x, y, ev, click);
return;
} else {
primaryMap.DeselectEvent();
@@ -521,7 +521,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
}
ShowHeaderPanel = false;
DrawDown(x, y, clickCount);
DrawDown(x, y, click);
}
public void PrimaryMove(double x, double y) {
@@ -536,10 +536,10 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
}
Point drawSource;
private void DrawDown(double x, double y, int clickCount) {
private void DrawDown(double x, double y, PrimaryInteractionStart click) {
interactionType = PrimaryInteractionType.Draw;
var map = MapUnderCursor(x, y);
if (clickCount == 2) {
if (click == PrimaryInteractionStart.DoubleClick) {
if (drawBlockIndex < 0 && collisionIndex < 0) {
// nothing to paint
interactionType = PrimaryInteractionType.None;
@@ -580,19 +580,19 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
primaryMap.RedrawEvents(); // editing blocks in a map can draw over events, we need to redraw events now that we have new blocks
}
private void EventDown(double x, double y, IEventViewModel ev, int clickCount) {
private void EventDown(double x, double y, IEventViewModel ev, PrimaryInteractionStart click) {
SelectedEvent = ev;
if (SelectedEvent is WarpEventViewModel warp && clickCount == 2) {
if (SelectedEvent is WarpEventViewModel warp && click == PrimaryInteractionStart.DoubleClick) {
NavigateTo(warp.Bank, warp.Map);
Tutorials.Complete(Tutorial.DoubleClick_FollowWarp);
} else if (clickCount == 2 && SelectedEvent is ObjectEventViewModel obj) {
} else if (click == PrimaryInteractionStart.DoubleClick && SelectedEvent is ObjectEventViewModel obj) {
viewPort.Goto.Execute(obj.ScriptAddress);
Tutorials.Complete(Tutorial.DoubleClickEvent_SeeScript);
} else if (clickCount == 2 && SelectedEvent is ScriptEventViewModel script) {
} else if (click == PrimaryInteractionStart.DoubleClick && SelectedEvent is ScriptEventViewModel script) {
viewPort.Goto.Execute(script.ScriptAddress);
Tutorials.Complete(Tutorial.DoubleClickEvent_SeeScript);
} else if (
clickCount == 2 &&
click == PrimaryInteractionStart.DoubleClick &&
SelectedEvent is SignpostEventViewModel signpost &&
signpost.ShowPointer &&
signpost.Pointer >= 0 &&
@@ -1336,6 +1336,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Map {
public enum EventCreationType { None, Object, Warp, Script, Signpost, Fly }
public enum PrimaryInteractionStart { None, Click, DoubleClick, ControlClick }
public enum PrimaryInteractionType { None, Draw, Event }
public record TileSelection(int[]Tiles, int Width);

2
src/HexManiac.WPF/Controls/MapTab.xaml.cs
View File

@@ -121,7 +121,7 @@ namespace HavenSoft.HexManiac.WPF.Controls {
element.CaptureMouse();
if (e.LeftButton == MouseButtonState.Pressed) {
withinMapInteraction = MouseButton.Left;
vm.PrimaryDown(p.X, p.Y, e.ClickCount);
vm.PrimaryDown(p.X, p.Y, e.ClickCount == 2 ? PrimaryInteractionStart.DoubleClick : PrimaryInteractionStart.Click);
} else if (e.MiddleButton == MouseButtonState.Pressed) {
withinMapInteraction = MouseButton.Middle;
vm.DragDown(p.X, p.Y);