Changeset 1264Tweet

Timestamp:

Apr 21, 2012, 9:45:09 PM (11 years ago)

Author:

sam

Message:

math: allow to easily create a 4x4 matrix from a 3x3 matrix, and so on.

File:

• trunk/src/lol/math/vector.h (modified) (2 diffs)

trunk/src/lol/math/vector.h

@@ -1435 +1435 @@
         v2((T)0, (T)0, val) {}
 
+    explicit inline Mat3(Mat2<T> mat)
+      : v0(mat[0], (T)0),
+        v1(mat[1], (T)0),
+        v2((T)0, (T)0, (T)0) {}
+
+    explicit inline Mat3(Mat2<T> mat, T val)
+      : v0(Vec3<T>(mat[0], (T)0)),
+        v1(Vec3<T>(mat[1], (T)0)),
+        v2((T)0, (T)0, val) {}
+
     explicit inline Mat3(Mat4<T> const &mat)
       : v0(mat[0].xyz),
@@ -1520 +1530 @@
         v1((T)0, val, (T)0, (T)0),
         v2((T)0, (T)0, val, (T)0),
+        v3((T)0, (T)0, (T)0, val) {}
+
+    explicit inline Mat4(Mat2<T> mat)
+      : v0(mat[0], (T)0, (T)0),
+        v1(mat[1], (T)0, (T)0),
+        v2((T)0, (T)0, (T)0, (T)0),
+        v3((T)0, (T)0, (T)0, (T)0) {}
+
+    explicit inline Mat4(Mat2<T> mat, T val1, T val2)
+      : v0(mat[0], (T)0, (T)0),
+        v1(mat[1], (T)0, (T)0),
+        v2((T)0, (T)0, val1, (T)0),
+        v3((T)0, (T)0, (T)0, val2) {}
+
+    explicit inline Mat4(Mat3<T> mat)
+      : v0(mat[0], (T)0),
+        v1(mat[1], (T)0),
+        v2(mat[2], (T)0),
+        v3((T)0, (T)0, (T)0, (T)0) {}
+
+    explicit inline Mat4(Mat3<T> mat, T val)
+      : v0(mat[0], (T)0),
+        v1(mat[1], (T)0),
+        v2(mat[2], (T)0),
         v3((T)0, (T)0, (T)0, val) {}