Changeset 1947Tweet

Timestamp:

Sep 24, 2012, 8:44:37 AM (11 years ago)

Author:

sam

Message:

math: add a uniform scaling matrix constructor.

Location:

trunk/src

Files:

• lol/math/vector.h (modified) (2 diffs)
• math/vector.cpp (modified) (1 diff)

trunk/src/lol/math/vector.h

@@ -1697 +1697 @@
 
     /* Helpers for transformation matrices */
+    static Mat3<T> scale(T x);
     static Mat3<T> scale(T x, T y, T z);
     static Mat3<T> scale(Vec3<T> v);
@@ -1832 +1833 @@
     static Mat4<T> translate(T x, T y, T z);
     static Mat4<T> translate(Vec3<T> v);
+
+    static inline Mat4<T> scale(T x)
+    {
+        return Mat4<T>(Mat3<T>::scale(x), (T)1);
+    }
 
     static inline Mat4<T> scale(T x, T y, T z)

trunk/src/math/vector.cpp

@@ -304 +304 @@
            << ", " << m[2][3] << ", " << m[3][3] << "))";
     return stream;
+}
+
+template<> mat3 mat3::scale(float x)
+{
+    mat3 ret(1.0f);
+
+    ret[0][0] = x;
+    ret[1][1] = x;
+    ret[2][2] = x;
+
+    return ret;
 }