Changeset 6183 for vtkvis/branches/1.8/Math.h

Timestamp:

Mar 22, 2016 11:07:59 PM (8 years ago)

Author:

ldelgass

Message:

merge r5966:5968 from trunk

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• Math.h (modified) (2 diffs)

vtkvis/branches/1.8/Math.h

@@ -80 +80 @@
     f *= 2;
 
-    mat[0][0] = xx*f + s;
-    mat[1][0] = (xy + wz)*f;
-    mat[2][0] = (xz - wy)*f;
-
-    mat[0][1] = (xy - wz)*f;
-    mat[1][1] = yy*f + s;
-    mat[2][1] = (yz + wx)*f;
-
-    mat[0][2] = (xz + wy)*f;
-    mat[1][2] = (yz - wx)*f;
-    mat[2][2] = zz*f + s;
+    mat.SetElement(0, 0, xx*f + s);
+    mat.SetElement(1, 0, (xy + wz)*f);
+    mat.SetElement(2, 0, (xz - wy)*f);
+
+    mat.SetElement(0, 1, (xy - wz)*f);
+    mat.SetElement(1, 1, yy*f + s);
+    mat.SetElement(2, 1, (yz + wx)*f);
+
+    mat.SetElement(0, 2, (xz + wy)*f);
+    mat.SetElement(1, 2, (yz - wx)*f);
+    mat.SetElement(2, 2, zz*f + s);
 }
 
@@ -121 +121 @@
     f *= 2;
 
-    mat[0][0] = xx*f + s;
-    mat[0][1] = (xy + wz)*f;
-    mat[0][2] = (xz - wy)*f;
-
-    mat[1][0] = (xy - wz)*f;
-    mat[1][1] = yy*f + s;
-    mat[1][2] = (yz + wx)*f;
-
-    mat[2][0] = (xz + wy)*f;
-    mat[2][1] = (yz - wx)*f;
-    mat[2][2] = zz*f + s;
+    mat.SetElement(0, 0, xx*f + s);
+    mat.SetElement(0, 1, (xy + wz)*f);
+    mat.SetElement(0, 2, (xz - wy)*f);
+
+    mat.SetElement(1, 0, (xy - wz)*f);
+    mat.SetElement(1, 1, yy*f + s);
+    mat.SetElement(1, 2, (yz + wx)*f);
+
+    mat.SetElement(2, 0, (xz + wy)*f);
+    mat.SetElement(2, 1, (yz - wx)*f);
+    mat.SetElement(2, 2, zz*f + s);
 }