#5767: Start unifying the algorithms by moving the texture tool node …

…processor to selection::algorithm namespace, into Texturing.h/.cpp
codereader · Oct 1, 2021 · d3aa245 · d3aa245
1 parent 834dab9
commit d3aa245
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 21 deletions.
diff --git a/radiantcore/CMakeLists.txt b/radiantcore/CMakeLists.txt
@@ -235,6 +235,7 @@ add_library(radiantcore MODULE
             selection/algorithm/Planes.cpp
             selection/algorithm/Primitives.cpp
             selection/algorithm/Shader.cpp
+            selection/algorithm/Texturing.cpp
             selection/algorithm/Transformation.cpp
             selection/clipboard/Clipboard.cpp
             selection/group/SelectionGroupInfoFileModule.cpp

diff --git a/radiantcore/selection/algorithm/Texturing.cpp b/radiantcore/selection/algorithm/Texturing.cpp
@@ -0,0 +1,37 @@
+#include "Texturing.h"
+
+namespace selection
+{
+
+namespace algorithm
+{
+
+TextureFlipper::TextureFlipper(const Vector2& flipCenter, int axis)
+{
+    auto flipMatrix = Matrix3::getIdentity();
+
+    if (axis == 0)
+    {
+        flipMatrix.xx() = -1;
+    }
+    else // axis == 1
+    {
+        flipMatrix.yy() = -1;
+    }
+
+    _transform = Matrix3::getTranslation(-flipCenter);
+    _transform.premultiplyBy(flipMatrix);
+    _transform.premultiplyBy(Matrix3::getTranslation(+flipCenter));
+}
+
+bool TextureFlipper::operator()(const textool::INode::Ptr& node)
+{
+    node->beginTransformation();
+    node->transform(_transform);
+    node->commitTransformation();
+    return true;
+}
+
+}
+
+}
diff --git a/radiantcore/selection/algorithm/Texturing.h b/radiantcore/selection/algorithm/Texturing.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "itexturetoolmodel.h"
+#include "math/Matrix3.h"
+
+namespace selection
+{
+
+namespace algorithm
+{
+
+// Flips all the visited node about the given axis and the given flip center point (in UV space)
+class TextureFlipper
+{
+private:
+    Matrix3 _transform;
+
+public:
+    TextureFlipper(const Vector2& flipCenter, int axis);
+
+    // Function operator, makes this class suitable to pass to e.g. ITextureToolSelectionSystem.foreachSelected()
+    bool operator()(const textool::INode::Ptr& node);
+};
+
+}
+
+}
diff --git a/radiantcore/selection/textool/TextureToolSelectionSystem.cpp b/radiantcore/selection/textool/TextureToolSelectionSystem.cpp
@@ -9,6 +9,7 @@
 #include "selection/SelectionPool.h"
 #include "string/case_conv.h"
 #include "math/Matrix3.h"
+#include "selection/algorithm/Texturing.h"
 
 namespace textool
 {
@@ -697,30 +698,11 @@ void TextureToolSelectionSystem::flipSelected(int axis)
 
     // Move center to origin, flip around the specified axis, and move back
     Vector2 flipCenter(selectionBounds.origin.x(), selectionBounds.origin.y());
-    auto flipMatrix = Matrix3::getIdentity();
-
-    if (axis == 0)
-    {
-        flipMatrix.xx() = -1;
-    }
-    else // axis == 1
-    {
-        flipMatrix.yy() = -1;
-    }
-
-    auto flipTransformation = Matrix3::getTranslation(-flipCenter);
-    flipTransformation.premultiplyBy(flipMatrix);
-    flipTransformation.premultiplyBy(Matrix3::getTranslation(+flipCenter));
 
     UndoableCommand cmd("flipSelectedTexcoords " + string::to_string(axis));
 
-    foreachSelectedNode([&](const INode::Ptr& node)
-    {
-        node->beginTransformation();
-        node->transform(flipTransformation);
-        node->commitTransformation();
-        return true;
-    });
+    selection::algorithm::TextureFlipper flipper(flipCenter, axis);
+    foreachSelectedNode(flipper);
 
     radiant::TextureChangedMessage::Send();
 }

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -648,6 +648,7 @@
     <ClCompile Include="..\..\radiantcore\selection\algorithm\Planes.cpp" />
     <ClCompile Include="..\..\radiantcore\selection\algorithm\Primitives.cpp" />
     <ClCompile Include="..\..\radiantcore\selection\algorithm\Shader.cpp" />
+    <ClCompile Include="..\..\radiantcore\selection\algorithm\Texturing.cpp" />
     <ClCompile Include="..\..\radiantcore\selection\algorithm\Transformation.cpp" />
     <ClCompile Include="..\..\radiantcore\selection\clipboard\Clipboard.cpp" />
     <ClCompile Include="..\..\radiantcore\selection\group\SelectionGroupInfoFileModule.cpp" />
@@ -1003,6 +1004,7 @@
     <ClInclude Include="..\..\radiantcore\selection\algorithm\Primitives.h" />
     <ClInclude Include="..\..\radiantcore\selection\algorithm\SelectionPolicies.h" />
     <ClInclude Include="..\..\radiantcore\selection\algorithm\Shader.h" />
+    <ClInclude Include="..\..\radiantcore\selection\algorithm\Texturing.h" />
     <ClInclude Include="..\..\radiantcore\selection\algorithm\Transformation.h" />
     <ClInclude Include="..\..\radiantcore\selection\BasicSelectable.h" />
     <ClInclude Include="..\..\radiantcore\selection\BestSelector.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -1108,6 +1108,9 @@
     <ClCompile Include="..\..\radiantcore\selection\textool\ColourSchemeManager.cpp">
       <Filter>src\selection\textool</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\selection\algorithm\Texturing.cpp">
+      <Filter>src\selection\algorithm</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -2253,5 +2256,8 @@
     <ClInclude Include="..\..\radiantcore\selection\textool\SelectableVertex.h">
       <Filter>src\selection\textool</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\selection\algorithm\Texturing.h">
+      <Filter>src\selection\algorithm</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>