Changeset 4905 for nanovis/trunk

Timestamp:

Dec 22, 2014 2:22:29 PM (9 years ago)

Author:

ldelgass

Message:

Apply matrix changes from double to float version

File:

• nanovis/trunk/vrmath/Matrix4x4f.cpp (modified) (3 diffs)

nanovis/trunk/vrmath/Matrix4x4f.cpp

@@ -230 +230 @@
 void Matrix4x4f::multiply(const Matrix4x4f& m1, const Matrix4x4f& m2)
 {
-    float mat[16];
-    const float *mat1 = m1._data;
-    const float *mat2 = m2._data;
-
-    // 1 row
-    mat[0] = float(mat1[0] * mat2[0] + mat1[4] * mat2[1] + 
-                   mat1[8] * mat2[2] + mat1[12] * mat2[3]);
-    mat[4] = float(mat1[0] * mat2[4] + mat1[4] * mat2[5] + 
-                   mat1[8] * mat2[6] + mat1[12] * mat2[7]);
-    mat[8] = float(mat1[0] * mat2[8] + mat1[4] * mat2[9] + 
-                   mat1[8] * mat2[10] + mat1[12] * mat2[11]);
-    mat[12] = float(mat1[0] * mat2[12] + mat1[4] * mat2[13] + 
-                    mat1[8] * mat2[14] + mat1[12] * mat2[15]);
-
-    // 2 row
-    mat[1] = float(mat1[1] * mat2[0] + mat1[5] * mat2[1] + 
-                   mat1[9] * mat2[2] + mat1[13] * mat2[3]);
-    mat[5] = float(mat1[1] * mat2[4] + mat1[5] * mat2[5] + 
-                   mat1[9] * mat2[6] + mat1[13] * mat2[7]);
-    mat[9] = float(mat1[1] * mat2[8] + mat1[5] * mat2[9] + 
-                   mat1[9] * mat2[10] + mat1[13] * mat2[11]);
-    mat[13] = float(mat1[1] * mat2[12] + mat1[5] * mat2[13] + 
-                    mat1[9] * mat2[14] + mat1[13] * mat2[15]);
-
-    // 3 row
-    mat[2] = float(mat1[2] * mat2[0] + mat1[6] * mat2[1] + 
-                   mat1[10] * mat2[2] + mat1[14] * mat2[3]);
-    mat[6] = float(mat1[2] * mat2[4] + mat1[6] * mat2[5] + 
-                   mat1[10] * mat2[6] + mat1[14] * mat2[7]);
-    mat[10] = float(mat1[2] * mat2[8] + mat1[6] * mat2[9] + 
-                    mat1[10] * mat2[10] + mat1[14] * mat2[11]);
-    mat[14] = float(mat1[2] * mat2[12] + mat1[6] * mat2[13] + 
-                    mat1[10] * mat2[14] + mat1[14] * mat2[15]);
-
-    // 4 row
-    mat[3] = float(mat1[3] * mat2[0] + mat1[7] * mat2[1] + 
-                   mat1[11] * mat2[2] + mat1[15] * mat2[3]);
-    mat[7] = float(mat1[3] * mat2[4] + mat1[7] * mat2[5] + 
-                   mat1[11] * mat2[6] + mat1[15] * mat2[7]);
-    mat[11] = float(mat1[3] * mat2[8] + mat1[7] * mat2[9] + 
-                    mat1[11] * mat2[10] + mat1[15] * mat2[11]);
-    mat[15] = float(mat1[3] * mat2[12] + mat1[7] * mat2[13] + 
-                    mat1[11] * mat2[14] + mat1[15] * mat2[15]);
-
-    // set matrix
-    set(mat);
+    if (&m1 == this && &m2 != this) {
+        multiply(m2);
+    } else if (&m1 != this && &m2 != this) {
+        multiplyFast(m1, m2);
+    } else {
+        float mat[16];
+        const float *mat1 = m1._data;
+        const float *mat2 = m2._data;
+
+        // 1 row
+        mat[0] = float(mat1[0] * mat2[0] + mat1[4] * mat2[1] + 
+                       mat1[8] * mat2[2] + mat1[12] * mat2[3]);
+        mat[4] = float(mat1[0] * mat2[4] + mat1[4] * mat2[5] + 
+                       mat1[8] * mat2[6] + mat1[12] * mat2[7]);
+        mat[8] = float(mat1[0] * mat2[8] + mat1[4] * mat2[9] + 
+                       mat1[8] * mat2[10] + mat1[12] * mat2[11]);
+        mat[12] = float(mat1[0] * mat2[12] + mat1[4] * mat2[13] + 
+                        mat1[8] * mat2[14] + mat1[12] * mat2[15]);
+
+        // 2 row
+        mat[1] = float(mat1[1] * mat2[0] + mat1[5] * mat2[1] + 
+                       mat1[9] * mat2[2] + mat1[13] * mat2[3]);
+        mat[5] = float(mat1[1] * mat2[4] + mat1[5] * mat2[5] + 
+                       mat1[9] * mat2[6] + mat1[13] * mat2[7]);
+        mat[9] = float(mat1[1] * mat2[8] + mat1[5] * mat2[9] + 
+                       mat1[9] * mat2[10] + mat1[13] * mat2[11]);
+        mat[13] = float(mat1[1] * mat2[12] + mat1[5] * mat2[13] + 
+                        mat1[9] * mat2[14] + mat1[13] * mat2[15]);
+
+        // 3 row
+        mat[2] = float(mat1[2] * mat2[0] + mat1[6] * mat2[1] + 
+                       mat1[10] * mat2[2] + mat1[14] * mat2[3]);
+        mat[6] = float(mat1[2] * mat2[4] + mat1[6] * mat2[5] + 
+                       mat1[10] * mat2[6] + mat1[14] * mat2[7]);
+        mat[10] = float(mat1[2] * mat2[8] + mat1[6] * mat2[9] + 
+                        mat1[10] * mat2[10] + mat1[14] * mat2[11]);
+        mat[14] = float(mat1[2] * mat2[12] + mat1[6] * mat2[13] + 
+                        mat1[10] * mat2[14] + mat1[14] * mat2[15]);
+
+        // 4 row
+        mat[3] = float(mat1[3] * mat2[0] + mat1[7] * mat2[1] + 
+                       mat1[11] * mat2[2] + mat1[15] * mat2[3]);
+        mat[7] = float(mat1[3] * mat2[4] + mat1[7] * mat2[5] + 
+                       mat1[11] * mat2[6] + mat1[15] * mat2[7]);
+        mat[11] = float(mat1[3] * mat2[8] + mat1[7] * mat2[9] + 
+                        mat1[11] * mat2[10] + mat1[15] * mat2[11]);
+        mat[15] = float(mat1[3] * mat2[12] + mat1[7] * mat2[13] + 
+                        mat1[11] * mat2[14] + mat1[15] * mat2[15]);
+
+        // set matrix
+        set(mat);
+    }
 }
 
@@ -500 +506 @@
 void Matrix4x4f::invert(const Matrix4x4f& mat)
 {
-    float *data = (float *)mat._data;
-
-    float det =
-        data[12] * data[9] * data[6] * data[3]-
-        data[8] * data[13] * data[6] * data[3]-
-        data[12] * data[5] * data[10] * data[3]+
-        data[4] * data[13] * data[10] * data[3]+
-        data[8] * data[5] * data[14] * data[3]-
-        data[4] * data[9] * data[14] * data[3]-
-        data[12] * data[9] * data[2] * data[7]+
-        data[8] * data[13] * data[2] * data[7]+
-        data[12] * data[1] * data[10] * data[7]-
-        data[0] * data[13] * data[10] * data[7]-
-        data[8] * data[1] * data[14] * data[7]+
-        data[0] * data[9] * data[14] * data[7]+
-        data[12] * data[5] * data[2] * data[11]-
-        data[4] * data[13] * data[2] * data[11]-
-        data[12] * data[1] * data[6] * data[11]+
-        data[0] * data[13] * data[6] * data[11]+
-        data[4] * data[1] * data[14] * data[11]-
-        data[0] * data[5] * data[14] * data[11]-
-        data[8] * data[5] * data[2] * data[15]+
-        data[4] * data[9] * data[2] * data[15]+
-        data[8] * data[1] * data[6] * data[15]-
-        data[0] * data[9] * data[6] * data[15]-
-        data[4] * data[1] * data[10] * data[15]+
-        data[0] * data[5] * data[10] * data[15];
-
-    if ( det == 0.0f ) return;
-    det = 1 / det;
-
-    float dstData[16];
-
-    dstData[0] = (data[9]*data[14]*data[7] -
-                  data[13]*data[10]*data[7] +
-                  data[13]*data[6]*data[11] -
-                  data[5]*data[14]*data[11] -
-                  data[9]*data[6]*data[15] +
-                  data[5]*data[10]*data[15]) * det;
-
-    dstData[4] = (data[12]*data[10]*data[7] -
-                  data[8]*data[14]*data[7] -
-                  data[12]*data[6]*data[11] +
-                  data[4]*data[14]*data[11] +
-                  data[8]*data[6]*data[15] -
-                  data[4]*data[10]*data[15]) * det;
-
-    dstData[8] = (data[8]*data[13]*data[7] -
-                  data[12]*data[9]*data[7] +
-                  data[12]*data[5]*data[11] -
-                  data[4]*data[13]*data[11] -
-                  data[8]*data[5]*data[15] +
-                  data[4]*data[9]*data[15]) * det;
-
-    dstData[12] = (data[12]*data[9]*data[6] -
-                   data[8]*data[13]*data[6] -
-                   data[12]*data[5]*data[10] +
-                   data[4]*data[13]*data[10] +
-                   data[8]*data[5]*data[14] -
-                   data[4]*data[9]*data[14]) * det;
-
-    dstData[1] = (data[13]*data[10]*data[3] -
-                  data[9]*data[14]*data[3] -
-                  data[13]*data[2]*data[11] +
-                  data[1]*data[14]*data[11] +
-                  data[9]*data[2]*data[15] -
-                  data[1]*data[10]*data[15]) * det;
-
-    dstData[5] = (data[8]*data[14]*data[3] -
-                  data[12]*data[10]*data[3] +
-                  data[12]*data[2]*data[11] -
-                  data[0]*data[14]*data[11] -
-                  data[8]*data[2]*data[15] +
-                  data[0]*data[10]*data[15]) * det;
-
-    dstData[9] = (data[12]*data[9]*data[3] -
-                  data[8]*data[13]*data[3] -
-                  data[12]*data[1]*data[11] +
-                  data[0]*data[13]*data[11] +
-                  data[8]*data[1]*data[15] -
-                  data[0]*data[9]*data[15]) * det;
-
-    dstData[13] = (data[8]*data[13]*data[2] -
-                   data[12]*data[9]*data[2] +
-                   data[12]*data[1]*data[10] -
-                   data[0]*data[13]*data[10] -
-                   data[8]*data[1]*data[14] +
-                   data[0]*data[9]*data[14]) * det;
-
-    dstData[2] = (data[5]*data[14]*data[3] -
-                  data[13]*data[6]*data[3] +
-                  data[13]*data[2]*data[7] -
-                  data[1]*data[14]*data[7] -
-                  data[5]*data[2]*data[15] +
-                  data[1]*data[6]*data[15]) * det;
-
-    dstData[6] = (data[12]*data[6]*data[3] -
-                  data[4]*data[14]*data[3] -
-                  data[12]*data[2]*data[7] +
-                  data[0]*data[14]*data[7] +
-                  data[4]*data[2]*data[15] -
-                  data[0]*data[6]*data[15]) * det;
-
-    dstData[10] = (data[4]*data[13]*data[3] -
-                   data[12]*data[5]*data[3] +
-                   data[12]*data[1]*data[7] -
-                   data[0]*data[13]*data[7] -
-                   data[4]*data[1]*data[15] +
-                   data[0]*data[5]*data[15]) * det;
-
-    dstData[14] = (data[12]*data[5]*data[2] -
-                   data[4]*data[13]*data[2] -
-                   data[12]*data[1]*data[6] +
-                   data[0]*data[13]*data[6] +
-                   data[4]*data[1]*data[14] -
-                   data[0]*data[5]*data[14]) * det;
-
-    dstData[3] = (data[9]*data[6]*data[3] -
-                  data[5]*data[10]*data[3] -
-                  data[9]*data[2]*data[7] +
-                  data[1]*data[10]*data[7] +
-                  data[5]*data[2]*data[11] -
-                  data[1]*data[6]*data[11]) * det;
-
-    dstData[7] = (data[4]*data[10]*data[3] -
-                  data[8]*data[6]*data[3] +
-                  data[8]*data[2]*data[7] -
-                  data[0]*data[10]*data[7] -
-                  data[4]*data[2]*data[11] +
-                  data[0]*data[6]*data[11]) * det;
-
-    dstData[11] = (data[8]*data[5]*data[3] -
-                   data[4]*data[9]*data[3] -
-                   data[8]*data[1]*data[7] +
-                   data[0]*data[9]*data[7] +
-                   data[4]*data[1]*data[11] -
-                   data[0]*data[5]*data[11]) * det;
-
-    dstData[15] = (data[4]*data[9]*data[2] -
-                   data[8]*data[5]*data[2] +
-                   data[8]*data[1]*data[6] -
-                   data[0]*data[9]*data[6] -
-                   data[4]*data[1]*data[10] +
-                   data[0]*data[5]*data[10]) * det;
-
-    set(dstData);
+    if (&mat == this) {
+        invert();
+    } else {
+        invertFast(mat);
+    }
 }
 
@@ -846 +711 @@
 void Matrix4x4f::transpose(const Matrix4x4f& mat)
 {
-    float m[16];
-
-    m[0] = mat._data[0];
-    m[1] = mat._data[4];
-    m[2] = mat._data[8];
-    m[3] = mat._data[12];
-
-    m[4] = mat._data[1];
-    m[5] = mat._data[5];
-    m[6] = mat._data[9];
-    m[7] = mat._data[13];
-
-    m[8] = mat._data[2];
-    m[9] = mat._data[6];
-    m[10] = mat._data[10];
-    m[11] = mat._data[14];
-
-    m[12] = mat._data[3];
-    m[13] = mat._data[7];
-    m[14] = mat._data[11];
-    m[15] = mat._data[15];
-
-    set(m);
+    if (&mat == this) {
+        transpose();
+    } else {
+        transposeFast(mat);
+    }
 }