Changeset 664 for trunk/test/matrix.cppTweet

Timestamp:

Feb 18, 2011, 1:09:28 AM (12 years ago)

Author:

sam

Message:

Get rid of float3, float4, int3 etc. in favour of GLSL types.

File:

• trunk/test/matrix.cpp (modified) (4 diffs)

trunk/test/matrix.cpp

@@ -33 +33 @@
     void setUp()
     {
-        identity = float4x4(1.0f);
-        triangular = float4x4(float4(1.0f, 0.0f, 0.0f, 0.0f),
-                              float4(7.0f, 2.0f, 0.0f, 0.0f),
-                              float4(1.0f, 5.0f, 3.0f, 0.0f),
-                              float4(8.0f, 9.0f, 2.0f, 4.0f));
-        invertible = float4x4(float4( 1.0f,  1.0f,  2.0f, -1.0f),
-                              float4(-2.0f, -1.0f, -2.0f,  2.0f),
-                              float4( 4.0f,  2.0f,  5.0f, -4.0f),
-                              float4( 5.0f, -3.0f, -7.0f, -6.0f));
+        identity = mat4(1.0f);
+        triangular = mat4(vec4(1.0f, 0.0f, 0.0f, 0.0f),
+                          vec4(7.0f, 2.0f, 0.0f, 0.0f),
+                          vec4(1.0f, 5.0f, 3.0f, 0.0f),
+                          vec4(8.0f, 9.0f, 2.0f, 4.0f));
+        invertible = mat4(vec4( 1.0f,  1.0f,  2.0f, -1.0f),
+                          vec4(-2.0f, -1.0f, -2.0f,  2.0f),
+                          vec4( 4.0f,  2.0f,  5.0f, -4.0f),
+                          vec4( 5.0f, -3.0f, -7.0f, -6.0f));
     }
 
@@ -56 +56 @@
     void test_mat_mul()
     {
-        float4x4 m0 = identity;
-        float4x4 m1 = identity;
-        float4x4 m2 = m0 * m1;
+        mat4 m0 = identity;
+        mat4 m1 = identity;
+        mat4 m2 = m0 * m1;
 
         CPPUNIT_ASSERT(m2[0][0] == 1.0f);
@@ -83 +83 @@
     void test_mat_inv()
     {
-        float4x4 m0 = invertible;
-        float4x4 m1 = m0.invert();
+        mat4 m0 = invertible;
+        mat4 m1 = m0.invert();
 
-        float4x4 m2 = m0 * m1;
+        mat4 m2 = m0 * m1;
 
         CPPUNIT_ASSERT(m2[0][0] == 1.0f);
@@ -110 +110 @@
 
 private:
-    float4x4 triangular, identity, invertible;
+    mat4 triangular, identity, invertible;
 };