Changeset 651Tweet

Timestamp:

Feb 16, 2011, 7:04:05 PM (10 years ago)

Author:

sam

Message:

Make the float4x4 constructor fill only the matrix's diagonal. Thus
the float4x4::identity() method is no longer necessary.

Location:

trunk

Files:

• src/matrix.h (modified) (1 diff)
• test/matrix.cpp (modified) (1 diff)

trunk/src/matrix.h

@@ -179 +179 @@
 {
     inline Mat4() { }
-    inline Mat4(T val) { for (int i = 0; i < 4; i++) v[i] = val; }
+    inline Mat4(T val)
+    {
+        for (int j = 0; j < 4; j++)
+            for (int i = 0; i < 4; i++)
+                v[i][j] = (i == j) ? val : 0;
+    }
     inline Mat4(Vec4<T> v0, Vec4<T> v1, Vec4<T> v2, Vec4<T> v3)
-        { v[0] = v0; v[1] = v1; v[2] = v2; v[3] = v3; }
+    {
+        v[0] = v0; v[1] = v1; v[2] = v2; v[3] = v3;
+    }
 
     inline Vec4<T>& operator[](int n) { return v[n]; }
     inline Vec4<T> const& operator[](int n) const { return v[n]; }
-
-    static inline Mat4<T> identity()
-    {
-        Mat4<T> ret;
-        for (int j = 0; j < 4; j++)
-            for (int i = 0; i < 4; i++)
-                ret[i][j] = i == j;
-        return ret;
-    }
 
     T det() const;

trunk/test/matrix.cpp

@@ -33 +33 @@
     void setUp()
     {
-        identity = float4x4::identity();
+        identity = float4x4(1.0f);
         triangular = float4x4(float4(1.0f, 0.0f, 0.0f, 0.0f),
                               float4(7.0f, 2.0f, 0.0f, 0.0f),