Remove unused Quaternion::createForMatrix()

This method was only used in a single test (which has now been changed to use createForY() instead, although for some reason this requires a negated angle).
codereader · Mar 22, 2021 · 8d489b1 · 8d489b1
1 parent 044920c
commit 8d489b1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 67 deletions.
diff --git a/libs/math/CMakeLists.txt b/libs/math/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(math
-            AABB.cpp Frustum.cpp Matrix4.cpp Plane3.cpp Quaternion.cpp)
+            AABB.cpp Frustum.cpp Matrix4.cpp Plane3.cpp)
diff --git a/libs/math/Quaternion.cpp b/libs/math/Quaternion.cpp
diff --git a/libs/math/Quaternion.h b/libs/math/Quaternion.h
@@ -61,11 +61,6 @@ class Quaternion :
 	static Quaternion createForY(double angle);
 	static Quaternion createForZ(double angle);
 
-	/**
-	 * Retrieves the quaternion from the given matrix.
-	 */
-	static Quaternion createForMatrix(const Matrix4& matrix4);
-
 	/**
 	 * Returns this quaternion multiplied by the other one.
 	 */

diff --git a/test/Brush.cpp b/test/Brush.cpp
@@ -10,6 +10,15 @@
 namespace test
 {
 
+// Fuzzy equality assertion for Plane3
+void expectNear(const Plane3& p1, const Plane3& p2, double epsilon)
+{
+    EXPECT_NEAR(p1.normal().x(), p2.normal().x(), epsilon);
+    EXPECT_NEAR(p1.normal().y(), p2.normal().y(), epsilon);
+    EXPECT_NEAR(p1.normal().z(), p2.normal().z(), epsilon);
+    EXPECT_NEAR(p1.dist(), p2.dist(), epsilon);
+}
+
 class BrushTest: public RadiantTest
 {
 protected:
@@ -115,14 +124,18 @@ TEST_F(BrushTest, FacePlaneRotateWithMatrix)
                 Plane3 orig = face.getPlane3();
 
                 // Transform the plane with a rotation matrix
-                Matrix4 rot = Matrix4::getRotation(Vector3(0, 1, 0), 2);
+                const double ANGLE = 2.0;
+                Matrix4 rot = Matrix4::getRotation(Vector3(0, 1, 0), ANGLE);
 
-                Node_getTransformable(_brushNode)->setRotation(Quaternion::createForMatrix(rot));
+                Node_getTransformable(_brushNode)->setRotation(
+                    Quaternion::createForY(-ANGLE)
+                );
                 Node_getTransformable(_brushNode)->freezeTransform();
 
+                double EPSILON = 0.001;
                 EXPECT_NE(face.getPlane3(), orig);
-                EXPECT_EQ(face.getPlane3(), orig.transformed(rot));
-                EXPECT_NEAR(face.getPlane3().normal().getLength(), 1, 0.001);
+                expectNear(face.getPlane3(), orig.transformed(rot), EPSILON);
+                EXPECT_NEAR(face.getPlane3().normal().getLength(), 1, EPSILON);
 
                 return true;
             }

diff --git a/test/math/Quaternion.cpp b/test/math/Quaternion.cpp
@@ -40,8 +40,6 @@ TEST(MathTest, QuaternionForZRotation)
 
     expectNear(zRot, Quaternion(0, 0, sin(angle.asRadians() / 2),
                                 cos(angle.asRadians() / 2)));
-    expectNear(zRot,
-               Quaternion::createForMatrix(Matrix4::getRotationAboutZ(angle)));
 }
 
 TEST(MathTest, QuaternionMultiplication)