#5773: Add complement TextureProjection::getShiftScaleRotation(), to …

…avoid having to access the inner TextureMatrix.
codereader · Oct 9, 2021 · d1ce07f · d1ce07f
1 parent 35be717
commit d1ce07f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/radiantcore/brush/Face.cpp b/radiantcore/brush/Face.cpp
@@ -465,7 +465,7 @@ void Face::SetTexdef(const TextureProjection& projection)
 
 ShiftScaleRotation Face::getShiftScaleRotation() const
 {
-    auto ssr = _texdef.getTextureMatrix().getShiftScaleRotation();
+    auto ssr = _texdef.getShiftScaleRotation();
 
     // These values are going to show up in the Surface Inspector, so
     // we need to make some adjustments:

diff --git a/radiantcore/brush/TextureProjection.cpp b/radiantcore/brush/TextureProjection.cpp
@@ -66,6 +66,11 @@ void TextureProjection::setTransformFromMatrix4(const Matrix4& transform)
     setTransform(getTextureMatrixFromMatrix4(transform));
 }
 
+ShiftScaleRotation TextureProjection::getShiftScaleRotation() const
+{
+    return _matrix.getShiftScaleRotation();
+}
+
 void TextureProjection::setFromShiftScaleRotate(const ShiftScaleRotation& ssr)
 {
     _matrix = TextureMatrix(ssr);

diff --git a/radiantcore/brush/TextureProjection.h b/radiantcore/brush/TextureProjection.h
@@ -41,6 +41,8 @@ class TextureProjection final
     TextureProjection& operator=(const TextureProjection& other);
 
     void setTransform(const Matrix3& transform);
+
+    ShiftScaleRotation getShiftScaleRotation() const;
     void setFromShiftScaleRotate(const ShiftScaleRotation& ssr);
 
     Matrix3 getMatrix() const;