#5740: Patch textures rotate around their center now

radiantcore/patch/Patch.cpp

@@ -901,20 +901,7 @@ void Patch::scaleTexture(float s, float t)
 
 void Patch::rotateTexture(float angle)
 {
-  undoSave();
-
-  const double s = sin(degrees_to_radians(angle));
-  const double c = cos(degrees_to_radians(angle));
-
-  for(PatchControlIter i = _ctrl.begin(); i != _ctrl.end(); ++i)
-  {
-    const double x = i->texcoord[0];
-    const double y = i->texcoord[1];
-    i->texcoord[0] = (x * c) - (y * s);
-    i->texcoord[1] = (y * c) + (x * s);
-  }
-
-  controlPointsChanged();
+    selection::algorithm::TextureRotator::RotatePatch(*this, degrees_to_radians(angle));
 }
 
 void Patch::fitTexture(float s, float t)

radiantcore/patch/Patch.h

@@ -268,7 +268,7 @@ class Patch :
 	// This is the same as above, but with undoSave() for use in command sequences
 	void translateTexture(float s, float t) override;
 	void scaleTexture(float s, float t) override;
-	void rotateTexture(float angle) override;
+	void rotateTexture(float angle) override; // angle in degrees
 	void fitTexture(float repeatS, float repeatT) override; // call with s=1 t=1 for FIT
 
 	/* uses longest parallel chord to calculate texture coords for each row/col

radiantcore/selection/algorithm/Texturing.cpp

@@ -9,6 +9,18 @@ namespace selection
 namespace algorithm
 {
 
+namespace
+{
+
+inline void applyTransform(const textool::INode::Ptr& node, const Matrix3& transform)
+{
+    node->beginTransformation();
+    node->transform(transform);
+    node->commitTransformation();
+}
+
+}
+
 TextureNodeManipulator::operator std::function<bool(const textool::INode::Ptr& node)>()
 {
     return [this](const textool::INode::Ptr& node)
@@ -43,9 +55,7 @@ TextureFlipper::TextureFlipper(const Vector2& flipCenter, int axis)
 
 bool TextureFlipper::processNode(const textool::INode::Ptr& node)
 {
-    node->beginTransformation();
-    node->transform(_transform);
-    node->commitTransformation();
+    applyTransform(node, _transform);
     return true;
 }
 
@@ -67,6 +77,34 @@ void TextureFlipper::FlipFace(IFace& face, int flipAxis)
     FlipNode(std::make_shared<textool::FaceNode>(face), flipAxis);
 }
 
+// Rotation
+
+TextureRotator::TextureRotator(const Vector2& pivot, double angle)
+{
+    _transform = Matrix3::getTranslation(-pivot);
+    _transform.premultiplyBy(Matrix3::getRotation(angle));
+    _transform.premultiplyBy(Matrix3::getTranslation(pivot));
+}
+
+bool TextureRotator::processNode(const textool::INode::Ptr& node)
+{
+    applyTransform(node, _transform);
+    return true;
+}
+
+void TextureRotator::RotatePatch(IPatch& patch, double angle)
+{
+    RotateNode(std::make_shared<textool::PatchNode>(patch), angle);
+}
+
+void TextureRotator::RotateNode(const textool::INode::Ptr& node, double angle)
+{
+    const auto& bounds = node->localAABB();
+    TextureRotator rotator({ bounds.origin.x(), bounds.origin.y() }, angle);
+
+    rotator.processNode(node);
+}
+
 }
 
 }

radiantcore/selection/algorithm/Texturing.h

@@ -16,8 +16,7 @@ namespace algorithm
 class TextureNodeManipulator
 {
 protected:
-    TextureNodeManipulator()
-    {}
+    TextureNodeManipulator() = default;
 
 public:
     // Conversion operator, to be able to pass an instance reference directly to 
@@ -65,6 +64,24 @@ class TextureFlipper :
     static void FlipNode(const textool::INode::Ptr& node, int flipAxis);
 };
 
+class TextureRotator :
+    public TextureNodeManipulator
+{
+private:
+    Matrix3 _transform;
+
+public:
+    TextureRotator(const Vector2& pivot, double angle);
+
+    bool processNode(const textool::INode::Ptr& node) override;
+
+    // Directly rotate the texture of the given patch around its UV center
+    static void RotatePatch(IPatch& patch, double angle);
+
+private:
+    static void RotateNode(const textool::INode::Ptr& node, double angle);
+};
+
 }
 
 }

test/TextureManipulation.cpp

@@ -111,7 +111,7 @@ void performPatchRotateTest(bool clockwise)
 
     // Rotate each texture coordinate around the patch center with a manual transform
     auto transform = Matrix3::getTranslation({ -bounds.origin.x(), -bounds.origin.y() });
-    transform.premultiplyBy(Matrix3::getRotation(angle));
+    transform.premultiplyBy(Matrix3::getRotation(degrees_to_radians(clockwise ? angle : -angle)));
     transform.premultiplyBy(Matrix3::getTranslation({ bounds.origin.x(), bounds.origin.y() }));
 
     auto old = oldTexCoords.begin();