Changeset 6183

Timestamp:

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

Author:

ldelgass

Message:

merge r5966:5968 from trunk

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• Math.h (modified) (2 diffs)
• Renderer.cpp (modified) (1 diff)
• Volume.cpp (modified) (1 diff)

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);
 }
 

vtkvis/branches/1.8/Renderer.cpp

@@ -2544 +2544 @@
     double d = camera->GetDistance();
     double vu[3];
-    vu[0] = mat[1][0];
-    vu[1] = mat[1][1];
-    vu[2] = mat[1][2];
+    vu[0] = mat.GetElement(1, 0);
+    vu[1] = mat.GetElement(1, 1);
+    vu[2] = mat.GetElement(1, 2);
     double trans[3];
-    trans[0] = mat[0][3];
-    trans[1] = mat[1][3];
-    trans[2] = mat[2][3];
-    mat[0][3] = 0;
-    mat[1][3] = 0;
-    mat[2][3] = 0;
-    double vpn[3] = {mat[2][0], mat[2][1], mat[2][2]};
+    trans[0] = mat.GetElement(0, 3);
+    trans[1] = mat.GetElement(1, 3);
+    trans[2] = mat.GetElement(2, 3);
+    mat.SetElement(0, 3, 0.0);
+    mat.SetElement(1, 3, 0.0);
+    mat.SetElement(2, 3, 0.0);
+    double vpn[3] = {mat.GetElement(2, 0), mat.GetElement(2, 1), mat.GetElement(2, 2)};
     double pos[3];
     // With translation removed, we have an orthogonal matrix, 

vtkvis/branches/1.8/Volume.cpp

@@ -14 +14 @@
 #include <vtkVolumeProperty.h>
 #include <vtkGPUVolumeRayCastMapper.h>
+#ifndef USE_GPU_RAYCAST_MAPPER
 #include <vtkVolumeTextureMapper3D.h>
+#endif
 #include <vtkRectilinearGrid.h>
 #include <vtkStructuredGrid.h>