Changeset 1272Tweet

Timestamp:

Apr 22, 2012, 3:04:00 PM (11 years ago)

Author:

sam

Message:

math: new mat3::scale() and mat4::scale() methods.

Location:

trunk/src

Files:

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

trunk/src/lol/math/vector.h

@@ -1454 +1454 @@
 
     /* Helpers for transformation matrices */
+    static Mat3<T> scale(T x, T y, T z);
+    static Mat3<T> scale(Vec3<T> v);
     static Mat3<T> rotate(T angle, T x, T y, T z);
     static Mat3<T> rotate(T angle, Vec3<T> v);
@@ -1562 +1564 @@
     static Mat4<T> translate(T x, T y, T z);
     static Mat4<T> translate(Vec3<T> v);
+
+    static inline Mat4<T> scale(T x, T y, T z)
+    {
+        return Mat4<T>(Mat3<T>::scale(x, y, z), (T)1);
+    }
+
+    static inline Mat4<T> scale(Vec3<T> v)
+    {
+        return Mat4<T>(Mat3<T>::scale(v), (T)1);
+    }
 
     static inline Mat4<T> translate(Mat4<T> const &mat, Vec3<T> v)

trunk/src/math/vector.cpp

@@ -307 +307 @@
 #endif
 
+template<> mat3 mat3::scale(float x, float y, float z)
+{
+    mat3 ret(1.0f);
+
+    ret[0][0] = x;
+    ret[1][1] = y;
+    ret[2][2] = z;
+
+    return ret;
+}
+
+template<> mat3 mat3::scale(vec3 v)
+{
+    return scale(v.x, v.y, v.z);
+}
+
 template<> mat4 mat4::translate(float x, float y, float z)
 {