Remove Degrees from getRotationAboutX/Y

These methods are now using the same pattern as getRotationAboutZ, i.e. accepting a templated unit class which can be either math::Degrees or math::Radians.
codereader · Mar 21, 2021 · af810ea · af810ea
1 parent 5c81357
commit af810ea
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 34 deletions.
diff --git a/libs/math/Matrix4.h b/libs/math/Matrix4.h
@@ -101,13 +101,19 @@ class Matrix4
      */
     static Matrix4 getRotationQuantised(const Quaternion& quaternion);
 
-    /// Construct a rotation matrix about the X axis for an angle in degrees
-    static Matrix4 getRotationAboutXDegrees(double angle);
+    /// Construct a rotation matrix about the X axis for the given angle
+    template<typename Unit_T> static Matrix4 getRotationAboutX(Unit_T angle)
+    {
+        double radians = angle.asRadians();
+        return getRotationAboutXForSinCos(sin(radians), cos(radians));
+    }
 
-    /**
-     * Constructs a pure-rotation matrix about the y axis from an angle in degrees.
-     */
-    static Matrix4 getRotationAboutYDegrees(double angle);
+    /// Construct a rotation matrix about the Y axis for the given angle
+    template<typename Unit_T> static Matrix4 getRotationAboutY(Unit_T angle)
+    {
+        double radians = angle.asRadians();
+        return getRotationAboutYForSinCos(sin(radians), cos(radians));
+    }
 
     /// Construct a rotation matrix about the Z axis for a given angle
     template<typename Unit_T> static Matrix4 getRotationAboutZ(Unit_T angle)
@@ -540,18 +546,6 @@ inline Matrix4 Matrix4::getPremultipliedBy(const Matrix4& other) const
     return other.getMultipliedBy(*this);
 }
 
-inline Matrix4 Matrix4::getRotationAboutXDegrees(double angle)
-{
-    double radians = degrees_to_radians(angle);
-    return getRotationAboutXForSinCos(sin(radians), cos(radians));
-}
-
-inline Matrix4 Matrix4::getRotationAboutYDegrees(double angle)
-{
-    double radians = degrees_to_radians(angle);
-    return getRotationAboutYForSinCos(sin(radians), cos(radians));
-}
-
 inline Matrix4 Matrix4::getProjectionForFrustum(double left, double right, double bottom, double top, double nearval, double farval)
 {
     return Matrix4::byColumns(

diff --git a/radiantcore/selection/algorithm/Transformation.cpp b/radiantcore/selection/algorithm/Transformation.cpp
@@ -540,11 +540,19 @@ void rotateSelectionAboutAxis(axis_t axis, float deg)
 		switch(axis)
 		{
 		case 0:
-			rotateSelected(Quaternion::createForMatrix(Matrix4::getRotationAboutXDegrees(deg)));
-			break;
+            rotateSelected(
+                Quaternion::createForMatrix(
+                    Matrix4::getRotationAboutX(math::Degrees(deg))
+                )
+            );
+            break;
 		case 1:
-			rotateSelected(Quaternion::createForMatrix(Matrix4::getRotationAboutYDegrees(deg)));
-			break;
+            rotateSelected(
+                Quaternion::createForMatrix(
+                    Matrix4::getRotationAboutY(math::Degrees(deg))
+                )
+            );
+            break;
 		case 2:
             rotateSelected(
                 Quaternion::createForMatrix(

diff --git a/test/math/Matrix4.cpp b/test/math/Matrix4.cpp
@@ -137,12 +137,12 @@ TEST(MathTest, ConvertDegreesAndRadians)
 
 TEST(MathTest, MatrixRotationAboutXDegrees)
 {
-    double angle = 30.0;
-    double cosAngle = cos(degrees_to_radians(angle));
-    double sinAngle = sin(degrees_to_radians(angle));
+    math::Degrees angle(30.0);
+    double cosAngle = cos(angle.asRadians());
+    double sinAngle = sin(angle.asRadians());
 
     // Test X rotation
-    auto xRot = Matrix4::getRotationAboutXDegrees(angle);
+    auto xRot = Matrix4::getRotationAboutX(angle);
     expectNear(xRot, Matrix4::byRows(1, 0, 0, 0,
                                      0, cosAngle, -sinAngle, 0,
                                      0, sinAngle, cosAngle, 0,
@@ -151,12 +151,12 @@ TEST(MathTest, MatrixRotationAboutXDegrees)
 
 TEST(MathTest, MatrixRotationAboutYDegrees)
 {
-    double angle = 30.0;
-    double cosAngle = cos(degrees_to_radians(angle));
-    double sinAngle = sin(degrees_to_radians(angle));
+    math::Degrees angle(45.0);
+    double cosAngle = cos(angle.asRadians());
+    double sinAngle = sin(angle.asRadians());
 
     // Test Y rotation
-    auto yRot = Matrix4::getRotationAboutYDegrees(angle);
+    auto yRot = Matrix4::getRotationAboutY(angle);
     expectNear(yRot, Matrix4::byRows(cosAngle, 0, sinAngle, 0,
                                      0, 1, 0, 0,
                                      -sinAngle, 0, cosAngle, 0,
@@ -165,12 +165,12 @@ TEST(MathTest, MatrixRotationAboutYDegrees)
 
 TEST(MathTest, MatrixRotationAboutZDegrees)
 {
-    double angle = 30.0;
-    double cosAngle = cos(degrees_to_radians(angle));
-    double sinAngle = sin(degrees_to_radians(angle));
+    math::Degrees angle(60.0);
+    double cosAngle = cos(angle.asRadians());
+    double sinAngle = sin(angle.asRadians());
 
     // Test Z rotation
-    auto zRot = Matrix4::getRotationAboutZ(math::Degrees(angle));
+    auto zRot = Matrix4::getRotationAboutZ(angle);
     expectNear(zRot, Matrix4::byRows(cosAngle, -sinAngle, 0, 0,
                                      sinAngle, cosAngle, 0, 0,
                                      0, 0, 1, 0,