Changeset 13041 for OpenSceneGraph/trunk/src/osg/MatrixDecomposition.cpp

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/MatrixDecomposition.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/src/osg/MatrixDecomposition.cpp

@@ -46 +46 @@
     enum QuatPart {X, Y, Z, W};
     typedef double _HMatrix[4][4];
-    typedef Quat HVect;   // Homogeneous 3D vector 
+    typedef Quat HVect;   // Homogeneous 3D vector
     typedef struct
     {
         osg::Vec4d t;     // Translation Component;
         Quat q;           // Essential Rotation
-        Quat  u;          //Stretch rotation      
-        HVect k;          //Sign of determinant 
-        double f;          // Sign of determinant 
+        Quat  u;          //Stretch rotation
+        HVect k;          //Sign of determinant
+        double f;          // Sign of determinant
     } _affineParts;
 
@@ -344 +344 @@
         int i, j;
 
-        mat_tpose(Mk,=,M,3); 
+        mat_tpose(Mk,=,M,3);
         M_one = norm_one(Mk);  M_inf = norm_inf(Mk);
 
@@ -353 +353 @@
             if (det==0.0)
             {
-                do_rank2(Mk, MadjTk, Mk); 
+                do_rank2(Mk, MadjTk, Mk);
                 break;
             }
 
-            MadjT_one = norm_one(MadjTk); 
+            MadjT_one = norm_one(MadjTk);
             MadjT_inf = norm_inf(MadjTk);
 
@@ -363 +363 @@
             g1 = gamma*0.5;
             g2 = 0.5/(gamma*det);
-            matrixCopy(Ek,=,Mk,3); 
-            matBinop(Mk,=,g1*Mk,+,g2*MadjTk,3);        
+            matrixCopy(Ek,=,Mk,3);
+            matBinop(Mk,=,g1*Mk,+,g2*MadjTk,3);
             mat_copy(Ek,-=,Mk,3);
             E_one = norm_one(Ek);
-            M_one = norm_one(Mk);  
+            M_one = norm_one(Mk);
             M_inf = norm_inf(Mk);
 
@@ -375 +375 @@
         mat_mult(Mk, M, S);  mat_pad(S);
 
-        for (i=0; i<3; i++) 
+        for (i=0; i<3; i++)
             for (j=i; j<3; j++)
                 S[i][j] = S[j][i] = 0.5*(S[i][j]+S[j][i]);
@@ -457 +457 @@
 
         if (ka[X]==ka[Y]) {
-            if (ka[X]==ka[Z]) 
-                turn = W; 
+            if (ka[X]==ka[Z])
+                turn = W;
             else turn = Z;
         }
         else {
-            if (ka[X]==ka[Z]) 
-                turn = Y; 
-            else if (ka[Y]==ka[Z]) 
+            if (ka[X]==ka[Z])
+                turn = Y;
+            else if (ka[Y]==ka[Z])
                 turn = X;
         }
@@ -490 +490 @@
 
             if (mag[0]>mag[1]) {
-                if (mag[0]>mag[2]) 
-                    win = 0; 
+                if (mag[0]>mag[2])
+                    win = 0;
                 else win = 2;
             }
             else {
-                if (mag[1]>mag[2]) win = 1; 
+                if (mag[1]>mag[2]) win = 1;
                 else win = 2;
             }
@@ -509 +509 @@
             p = Qt_Mul(p, Qt_(0.0,0.0,-qp.z/t,qp.w/t));
             p = Qt_Mul(qtoz, Qt_Conj(p));
-        } 
+        }
         else {
             double qa[4], pa[4];
@@ -525 +525 @@
 
             /* Find two largest components, indices in hi and lo */
-            if (qa[0]>qa[1]) lo = 0; 
+            if (qa[0]>qa[1]) lo = 0;
             else lo = 1;
 
-            if (qa[2]>qa[3]) hi = 2; 
+            if (qa[2]>qa[3]) hi = 2;
             else hi = 3;
 
@@ -538 +538 @@
                     hi ^= lo; lo ^= hi; hi ^= lo;
                 }
-            } 
+            }
             else {
                 if (qa[hi^1]>qa[lo]) lo = hi^1;
@@ -550 +550 @@
                     {int i; for (i=0; i<4; i++) pa[i] = sgn(neg[i], 0.5);}
                     cycle(ka,par);
-                } 
+                }
                 else {/*big*/ pa[hi] = sgn(neg[hi],1.0);}
             } else {
                 if (two>big) { /*two*/
-                    pa[hi] = sgn(neg[hi],SQRTHALF); 
+                    pa[hi] = sgn(neg[hi],SQRTHALF);
                     pa[lo] = sgn(neg[lo], SQRTHALF);
                     if (lo>hi) {
@@ -560 +560 @@
                     }
                     if (hi==W) {
-                        hi = "\001\002\000"[lo]; 
+                        hi = "\001\002\000"[lo];
                         lo = 3-hi-lo;
                     }
                     swap(ka,hi,lo);
-                } 
-                else {/*big*/ 
+                }
+                else {/*big*/
                     pa[hi] = sgn(neg[hi],1.0);
                 }
@@ -610 +610 @@
 
     double mul = 1.0;
-    if (parts.t[MatrixDecomposition::W] != 0.0) 
+    if (parts.t[MatrixDecomposition::W] != 0.0)
         mul = 1.0 / parts.t[MatrixDecomposition::W];
 
@@ -620 +620 @@
 
     mul = 1.0;
-    if (parts.k.w != 0.0) 
+    if (parts.k.w != 0.0)
         mul = 1.0 / parts.k.w;
 
@@ -664 +664 @@
 
     double mul = 1.0;
-    if (parts.t[MatrixDecomposition::W] != 0.0) 
+    if (parts.t[MatrixDecomposition::W] != 0.0)
         mul = 1.0 / parts.t[MatrixDecomposition::W];
 
@@ -674 +674 @@
 
     mul = 1.0;
-    if (parts.k.w != 0.0) 
+    if (parts.k.w != 0.0)
         mul = 1.0 / parts.k.w;