#5773: Remove TexDef adapter methods - the client code in Face::setTe…

…xdef is no longer used either

radiantcore/brush/Face.cpp

@@ -468,19 +468,6 @@ void Face::SetTexdef(const TextureProjection& projection)
     texdefChanged();
 }
 
-void Face::setTexdef(const TexDef& texDef)
-{
-    TextureProjection projection;
-
-    // Construct the BPTexDef out of the TexDef
-    projection.setFromShiftScaleRotate(texDef.toShiftScaleRotation());
-
-    // The bprimitive texdef needs to be scaled using our current texture dims
-    projection.getTextureMatrix().addScale(_shader.getWidth(), _shader.getHeight());
-
-    SetTexdef(projection);
-}
-
 ShiftScaleRotation Face::getShiftScaleRotation() const
 {
     auto ssr = _texdef.getTextureMatrix().getShiftScaleRotation();

radiantcore/brush/Face.h

@@ -139,10 +139,6 @@ class Face :
 	void GetTexdef(TextureProjection& projection) const;
 	void SetTexdef(const TextureProjection& projection);
 
-    // Applies the given shift/scale/rotation values to this face's texture projection
-    // The incoming values are measured in pixels and will be scaled internally.
-    void setTexdef(const TexDef& texDef);
-
     // Constructs the texture projection matrix from the given (world) vertex and texture coords.
     // Three vertices and their UV coordinates are enough to construct the texdef.
     void setTexDefFromPoints(const Vector3 points[3], const Vector2 uvs[3]);

radiantcore/brush/TexDef.cpp

@@ -104,22 +104,3 @@ void TexDef::normalise(double width, double height)
 	_def.shift[0] = float_mod(_def.shift[0], width);
 	_def.shift[1] = float_mod(_def.shift[1], height);
 }
-
-ShiftScaleRotation TexDef::toShiftScaleRotation() const
-{
-	ShiftScaleRotation result;
-
-	result.shift[0] = _def.shift[0];
-	result.shift[1] = _def.shift[1];
-	result.rotate = _def.rotate;
-	result.scale[0] = _def.scale[0];
-	result.scale[1] = _def.scale[1];
-
-	return result;
-}
-
-TexDef TexDef::CreateFromShiftScaleRotation(const ShiftScaleRotation& scr)
-{
-	return TexDef(scr);
-}
-

radiantcore/brush/TexDef.h

@@ -33,13 +33,6 @@ class TexDef final
 	// This function normalises shift values to the smallest positive congruent values.
 	void normalise(double width, double height);
 
-	// Converts this instance's values to a ShiftScaleRotation structure
-	// Since TexDef is using the same format to store its values internally
-	// this is equivalent to a few simple assignment or copy operations.
-	ShiftScaleRotation toShiftScaleRotation() const;
-
-	static TexDef CreateFromShiftScaleRotation(const ShiftScaleRotation& scr);
-
 	friend std::ostream& operator<<(std::ostream& st, const TexDef& texdef);
 };