#5773: Remove IFace::getTexDefMatrix(), is superseded by IFace::getPr…

…ojectionMatrix()
codereader · Oct 8, 2021 · 8e9b2d5 · 8e9b2d5
1 parent 2e09e48
commit 8e9b2d5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/include/ibrush.h b/include/ibrush.h
@@ -178,16 +178,6 @@ class IFace
 
 	virtual const Plane3& getPlane3() const = 0;
 
-	/**
-	 * Returns the 3x3 texture matrix for this face, containing shift, scale and rotation.
-	 *
-	 * xx, yx, xy and yy hold the scale and rotation
-	 * tx and ty hold the shift
-     * 
-     * OBSOLETE
-	 */
-	virtual Matrix4 getTexDefMatrix() const = 0;
-
 	/**
 	 * The matrix used to project world coordinates to U/V space, after the winding vertices
      * have been transformed to this face's axis base system.

diff --git a/radiantcore/brush/BrushNode.cpp b/radiantcore/brush/BrushNode.cpp
@@ -90,13 +90,13 @@ std::string BrushNode::getFingerprint()
         hash.addString(face->getShader());
 
         // Texture Matrix
-        auto texdef = face->getTexDefMatrix();
+        auto texdef = face->getProjectionMatrix();
         hash.addDouble(texdef.xx(), SignificantDigits);
         hash.addDouble(texdef.yx(), SignificantDigits);
-        hash.addDouble(texdef.tx(), SignificantDigits);
+        hash.addDouble(texdef.zx(), SignificantDigits);
         hash.addDouble(texdef.xy(), SignificantDigits);
         hash.addDouble(texdef.yy(), SignificantDigits);
-        hash.addDouble(texdef.ty(), SignificantDigits);
+        hash.addDouble(texdef.zy(), SignificantDigits);
     }
 
     return hash;

diff --git a/radiantcore/brush/Face.cpp b/radiantcore/brush/Face.cpp
@@ -746,11 +746,6 @@ const FacePlane& Face::getPlane() const {
     return m_plane;
 }
 
-Matrix4 Face::getTexDefMatrix() const
-{
-    return _texdef.matrix.getTransform();
-}
-
 SurfaceShader& Face::getFaceShader() {
     return _shader;
 }

diff --git a/radiantcore/brush/Face.h b/radiantcore/brush/Face.h
@@ -201,8 +201,6 @@ class Face :
 	FacePlane& getPlane();
 	const FacePlane& getPlane() const;
 
-	Matrix4 getTexDefMatrix() const;
-
 	Matrix3 getProjectionMatrix() const override;
 	void setProjectionMatrix(const Matrix3& projection) override;