Matrix4::getScale() implemented by Eigen

codereader · Apr 1, 2021 · d8f7bb3 · d8f7bb3
1 parent 4be09ef
commit d8f7bb3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/libs/math/Matrix4.cpp b/libs/math/Matrix4.cpp
@@ -215,17 +215,6 @@ Matrix4 Matrix4::getRotationForEulerXYZDegrees(const Vector3& euler)
 	return getRotationForEulerXYZ(euler_degrees_to_radians(euler));
 }
 
-// Get a scale matrix
-Matrix4 Matrix4::getScale(const Vector3& scale)
-{
-    return Matrix4::byColumns(
-        scale[0], 0, 0, 0,
-        0, scale[1], 0, 0,
-        0, 0, scale[2], 0,
-        0, 0, 0,        1
-    );
-}
-
 // Add a scale component
 void Matrix4::scaleBy(const Vector3& scale)
 {

diff --git a/libs/math/Matrix4.h b/libs/math/Matrix4.h
@@ -126,14 +126,13 @@ class alignas(16) Matrix4
      */
     static Matrix4 getRotationForEulerXYZDegrees(const Vector3& euler);
 
-    /**
-     * \brief
-     * Get a matrix representing the given scale in 3D space.
-     *
-     * \param scale
-     * Vector3 representing the scale.
-     */
-    static Matrix4 getScale(const Vector3& scale);
+    /// Get a matrix representing the given scale in 3D space.
+    static Matrix4 getScale(const Vector3& scale)
+    {
+        return Matrix4(
+            Transform(Eigen::Scaling(scale.x(), scale.y(), scale.z()))
+        );
+    }
 
     /**
      * \brief

diff --git a/test/math/Matrix4.cpp b/test/math/Matrix4.cpp
@@ -124,6 +124,18 @@ TEST(MathTest, ConstructTranslationMatrix)
     EXPECT_EQ(tm.translation(), TRANS);
 }
 
+TEST(MathTest, ConstructScaleMatrix)
+{
+    const Vector3 SCALE(0.75, 1.25, 960);
+    Matrix4 sm = Matrix4::getScale(SCALE);
+
+    EXPECT_EQ(sm, Matrix4::byRows(SCALE.x(), 0, 0, 0,
+                                  0, SCALE.y(), 0, 0,
+                                  0, 0, SCALE.z(), 0,
+                                  0, 0, 0, 1));
+    EXPECT_EQ(sm.getScale(), SCALE);
+}
+
 TEST(MathTest, AccessMatrixColumnVectors)
 {
     Matrix4 m = Matrix4::byRows(1, 4, 8, -5,