#5547: Recalculate the texture tool view after normalisation

codereader · Oct 5, 2021 · 0b23fbc · 0b23fbc
1 parent b2efa1c
commit 0b23fbc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/install/user.xml b/install/user.xml
@@ -310,7 +310,7 @@
       <toggletoolbutton name="textoolvertexmode" action="TextureToolVertexSelectionMode" tooltip="Select Vertices" icon="modify_vertices.png"/>
       <separator/>
       <toolbutton name="mergeitems" action="TexToolMergeItems" tooltip="Merge Selection" icon="textool_merge.png"/>
-      <toolbutton name="normaliseitems" action="TexToolNormaliseItems" tooltip="Normalise" icon="textool_normalise.png"/>
+      <toolbutton name="normaliseitems" action="TexToolNormaliseItems; TextureToolResetView" tooltip="Normalise" icon="textool_normalise.png"/>
       <toolbutton name="texflips" action="TexToolFlipS" tooltip="Flip Selection Horiz (S-Axis)" icon="tex_flips.png"/>
       <toolbutton name="texflipt" action="TexToolFlipT" tooltip="Flip Selection Vertical (T-Axis)" icon="tex_flipt.png"/>
       <toolbutton name="selectrelated" action="TexToolSelectRelated" tooltip="Select Related Items" icon="textool_select_related.png"/>

diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -790,6 +790,12 @@ void TexTool::onMouseScroll(wxMouseEvent& ev)
     draw();
 }
 
+void TexTool::resetViewCmd(const cmd::ArgumentList& args)
+{
+    Instance().recalculateVisibleTexSpace();
+    Instance().queueDraw();
+}
+
 void TexTool::toggle(const cmd::ArgumentList& args)
 {
 	Instance().ToggleVisibility();
@@ -798,6 +804,7 @@ void TexTool::toggle(const cmd::ArgumentList& args)
 void TexTool::registerCommands()
 {
 	GlobalCommandSystem().addCommand("TextureTool", TexTool::toggle);
+	GlobalCommandSystem().addCommand("TextureToolResetView", TexTool::resetViewCmd);
 	GlobalEventManager().addRegistryToggle("TexToolToggleGrid", RKEY_GRID_STATE);
 
     GlobalEventManager().addToggle("TextureToolUseLightTheme", [](bool toggled)

diff --git a/radiant/textool/TexTool.h b/radiant/textool/TexTool.h
@@ -203,6 +203,7 @@ class TexTool :
     IInteractiveView& getInteractiveView() override;
 
 private:
+    static void resetViewCmd(const cmd::ArgumentList& args);
     void updateProjection();
     double getTextureAspectRatio();
     void onManipulatorModeChanged(selection::IManipulator::Type type);

diff --git a/radiantcore/selection/textool/TextureToolSelectionSystem.cpp b/radiantcore/selection/textool/TextureToolSelectionSystem.cpp
@@ -716,6 +716,12 @@ void TextureToolSelectionSystem::flipHorizontallyCmd(const cmd::ArgumentList& ar
 
 void TextureToolSelectionSystem::normaliseSelectionCmd(const cmd::ArgumentList& args)
 {
+    if (getSelectionMode() != SelectionMode::Surface)
+    {
+        rWarning() << "This command can only be executed in Surface manipulation mode" << std::endl;
+        return;
+    }
+
     // Calculate the center based on the selection
     selection::algorithm::TextureBoundsAccumulator accumulator;
     foreachSelectedNode(accumulator);