Skip to content

Commit

Permalink
Removed node merging for stable version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Quboid
Quboid committed Mar 23, 2023
1 parent 0f4724f commit 3244e2d
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 59 deletions.
28 changes: 14 additions & 14 deletions MoveIt/GUI/UIToolOptionPanel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class UIToolOptionPanel : UIPanel
public UIMultiStateButton PO_button;
public UIMultiStateButton grid;
public UIMultiStateButton underground;
public UIMultiStateButton mergeNodes;
//public UIMultiStateButton mergeNodes;

public UIPanel m_filtersPanel, m_filtersPanelList;
public UIPanel m_moreToolsPanel;
Expand Down Expand Up @@ -523,7 +523,7 @@ void OnDoubleClickNetworkFilter(UIComponent c, UIMouseEventParameter p)
m_viewOptions = AddUIComponent<UIPanel>();
m_viewOptions.atlas = UIUtils.GetAtlas("Ingame");
m_viewOptions.backgroundSprite = "InfoPanelBack";
m_viewOptions.size = new Vector2(44f, 116f);
m_viewOptions.size = new Vector2(44f, 80f);// 116f);

m_viewOptions.absolutePosition = new Vector3(GetUIView().GetScreenResolution().x - m_viewOptions.width, absolutePosition.y - m_viewOptions.height - 8f);

Expand Down Expand Up @@ -560,20 +560,20 @@ void OnDoubleClickNetworkFilter(UIComponent c, UIMouseEventParameter p)
};


mergeNodes = m_viewOptions.AddUIComponent<UIMultiStateButton>();
mergeNodes.atlas = GetIconsAtlas();
mergeNodes.name = "MoveIt_MergeNodesView";
mergeNodes.tooltip = Str.baseUI_MergeNodesTooltip;
//mergeNodes = m_viewOptions.AddUIComponent<UIMultiStateButton>();
//mergeNodes.atlas = GetIconsAtlas();
//mergeNodes.name = "MoveIt_MergeNodesView";
//mergeNodes.tooltip = Str.baseUI_MergeNodesTooltip;

SetViewOptionsProperties(mergeNodes, "NodeMerge");
//SetViewOptionsProperties(mergeNodes, "NodeMerge");

mergeNodes.relativePosition = new Vector3(4f, 76f);
mergeNodes.activeStateIndex = Settings.autoMergeNodes ? 1 : 0;
//mergeNodes.relativePosition = new Vector3(4f, 76f);
//mergeNodes.activeStateIndex = Settings.autoMergeNodes ? 1 : 0;

mergeNodes.eventClicked += (c, p) =>
{
MoveItTool.instance.MergeNodes = (mergeNodes.activeStateIndex == 1);
};
//mergeNodes.eventClicked += (c, p) =>
//{
// MoveItTool.instance.MergeNodes = (mergeNodes.activeStateIndex == 1);
//};


if (MoveItTool.PO.Enabled)
Expand All @@ -585,7 +585,7 @@ void OnDoubleClickNetworkFilter(UIComponent c, UIMouseEventParameter p)

SetViewOptionsProperties(PO_button, "PO");

PO_button.relativePosition = new Vector3(4f, 112f);
PO_button.relativePosition = new Vector3(4f, 76f);// 112f);
PO_button.activeStateIndex = 0;

PO_button.eventClicked += (c, p) =>
Expand Down
26 changes: 13 additions & 13 deletions MoveIt/GUI/XMLWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,19 @@ protected void AddSortingPanel(float yPos)
openFolder.size = new Vector2(150f, 30f);
openFolder.relativePosition = new Vector3(8, 8);

if (!IsExport)
{
mergeNodes = UIUtils.CreateCheckBox(sortPanel);
mergeNodes.name = "MoveIt_MergeNodesCheckBox";
mergeNodes.text = "Autoconnect Nodes";
mergeNodes.relativePosition = new Vector3(openFolder.relativePosition.x + openFolder.size.x + 12, 15);
mergeNodes.isChecked = MoveItTool.instance.MergeNodes;

mergeNodes.eventCheckChanged += (s, e) => {
UIToolOptionPanel.instance.mergeNodes.activeStateIndex = (e ? 1 : 0);
MoveItTool.instance.MergeNodes = e;
};
}
//if (!IsExport)
//{
// mergeNodes = UIUtils.CreateCheckBox(sortPanel);
// mergeNodes.name = "MoveIt_MergeNodesCheckBox";
// mergeNodes.text = "Autoconnect Nodes";
// mergeNodes.relativePosition = new Vector3(openFolder.relativePosition.x + openFolder.size.x + 12, 15);
// mergeNodes.isChecked = MoveItTool.instance.MergeNodes;

// mergeNodes.eventCheckChanged += (s, e) => {
// UIToolOptionPanel.instance.mergeNodes.activeStateIndex = (e ? 1 : 0);
// MoveItTool.instance.MergeNodes = e;
// };
//}

sortOrderBtn = UIUtils.CreateButton(sortPanel);
sortOrderBtn.name = "MoveIt_SortOrderButton";
Expand Down
26 changes: 13 additions & 13 deletions MoveIt/MIT_Keyboard.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ protected override void OnToolGUI(Event e)
UIToolOptionPanel.instance.underground.activeStateIndex = 1;
}
}
else if (OptionsKeymapping.mergeNodes.IsPressed(e))
{
if (MergeNodes)
{
MergeNodes = false;
UIToolOptionPanel.instance.mergeNodes.activeStateIndex = 0;
}
else
{
MergeNodes = true;
UIToolOptionPanel.instance.mergeNodes.activeStateIndex = 1;
}
}
//else if (OptionsKeymapping.mergeNodes.IsPressed(e))
//{
// if (MergeNodes)
// {
// MergeNodes = false;
// UIToolOptionPanel.instance.mergeNodes.activeStateIndex = 0;
// }
// else
// {
// MergeNodes = true;
// UIToolOptionPanel.instance.mergeNodes.activeStateIndex = 1;
// }
//}
else if (OptionsKeymapping.viewDebug.IsPressed(e))
{
Settings.showDebugPanel.value = !Settings.showDebugPanel;
Expand Down
28 changes: 14 additions & 14 deletions MoveIt/MoveItTool.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,23 +199,23 @@ internal static bool QuickTunnelView
}
}

private bool _mergeNodes = Settings.autoMergeNodes;
private bool _mergeNodes = false;// Settings.autoMergeNodes;
internal bool MergeNodes
{
get => _mergeNodes;
set
{
if (_mergeNodes != value)
{
_mergeNodes = value;
Settings.autoMergeNodes.value = value;
if (ActionQueue.instance.current is CloneActionBase a)
{
a.m_nodeMergeData = new List<NodeMergeClone>();
a.m_snapNode = null;
}
}
}
//set
//{
// if (_mergeNodes != value)
// {
// _mergeNodes = value;
// Settings.autoMergeNodes.value = value;
// if (ActionQueue.instance.current is CloneActionBase a)
// {
// a.m_nodeMergeData = new List<NodeMergeClone>();
// a.m_snapNode = null;
// }
// }
//}
}

internal UIMoveItButton m_button;
Expand Down
6 changes: 3 additions & 3 deletions MoveIt/OptionsKeymapping.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private void Awake()
AddKeymapping(Str.key_Bulldoze, bulldoze);
AddKeymapping(Str.key_ToggleGridView, viewGrid);
AddKeymapping(Str.key_ToggleUndergroundView, viewUnderground);
AddKeymapping(Str.key_ToggleNodeMerging, mergeNodes);
//AddKeymapping(Str.key_ToggleNodeMerging, mergeNodes);
AddKeymapping(Str.key_ToggleDebugPanel, viewDebug);
AddKeymapping(Str.key_StepOver, stepOverKey);
AddKeymapping(Str.key_ShowSelectors, viewSelectors);
Expand Down Expand Up @@ -103,7 +103,7 @@ public class OptionsKeymapping : UICustomControl

public static readonly SavedInputKey viewGrid = new SavedInputKey("viewGrid", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.None, false, false, false), true);
public static readonly SavedInputKey viewUnderground = new SavedInputKey("viewUnderground", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.None, false, false, false), true);
public static readonly SavedInputKey mergeNodes = new SavedInputKey("mergeNodes", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.None, false, false, false), true);
//public static readonly SavedInputKey mergeNodes = new SavedInputKey("mergeNodes", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.None, false, false, false), true);
public static readonly SavedInputKey viewDebug = new SavedInputKey("viewDebug", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.None, false, false, false), true);
public static readonly SavedInputKey viewSelectors = new SavedInputKey("viewSelectors", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.None, false, false, false), true);
public static readonly SavedInputKey quickUnderground = new SavedInputKey("quickUnderground", Settings.settingsFileName, SavedInputKey.Encode(KeyCode.U, false, false, false), true);
Expand Down Expand Up @@ -143,7 +143,7 @@ public class OptionsKeymapping : UICustomControl
public static SavedInputKey[] InToolKeysAlways => new SavedInputKey[] {
deselectAll, // after de-selecting, then there is no selection and that can cause confusion. therefore we put de-select all here.
undo, redo,
viewGrid, viewUnderground, mergeNodes, viewDebug, viewSelectors, quickUnderground,
viewGrid, viewUnderground, /*mergeNodes, */viewDebug, viewSelectors, quickUnderground,
activatePO,
stepOverKey,
};
Expand Down
4 changes: 2 additions & 2 deletions MoveIt/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[assembly: AssemblyTitle("MoveIt")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Quboid")]
[assembly: AssemblyProduct("MoveIt")]
[assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyTrademark("")]
Expand All @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.10.1.*")]
[assembly: AssemblyVersion("2.10.3.*")]
//[assembly: AssemblyFileVersion("1.0.0.0")]

0 comments on commit 3244e2d

Please sign in to comment.