Changeset 3492 for trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

Timestamp:

Mar 13, 2013, 9:57:03 AM (12 years ago)

Author:

ldelgass

Message:

Fix camera reset for nanovis. Includes refactoring of vector/matrix classes
in nanovis to consolidate into vrmath library. Also add preliminary canonical
view control to clients for testing.

File:

• trunk/packages/vizservers/nanovis/VolumeRenderer.cpp (modified) (11 diffs)

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -23 +23 @@
 #include <tcl.h>
 
+#include <vrmath/Vector3f.h>
+#include <vrmath/Matrix4x4d.h>
+
 #include "nanovis.h"
 #include "VolumeRenderer.h"
+#include "Plane.h"
 #include "ConvexPolygon.h"
 #include "NvStdVertexShader.h"
 #include "Trace.h"
+
+using namespace vrmath;
 
 VolumeRenderer::VolumeRenderer()
@@ -142 +148 @@
 
         //volume start location
-        Vector3 volPos = volPtr->location();
-        Vector3 volScaling = volPtr->getPhysicalScaling();
+        Vector3f volPos = volPtr->location();
+        Vector3f volScaling = volPtr->getPhysicalScaling();
 
         TRACE("VOL POS: %g %g %g",
@@ -154 +160 @@
         double z0 = 0;
 
-        Mat4x4 model_view_no_trans, model_view_trans;
-        Mat4x4 model_view_no_trans_inverse, model_view_trans_inverse;
+        Matrix4x4d model_view_no_trans, model_view_trans;
+        Matrix4x4d model_view_no_trans_inverse, model_view_trans_inverse;
 
         //initialize volume plane with world coordinates
-        Plane volume_planes[6];
+        nv::Plane volume_planes[6];
         volume_planes[0].setCoeffs( 1,  0,  0, -x0);
         volume_planes[1].setCoeffs(-1,  0,  0,  x0+1);
@@ -172 +178 @@
         glEnable(GL_DEPTH_TEST);
 
-        GLfloat mv_no_trans[16];
-        glGetFloatv(GL_MODELVIEW_MATRIX, mv_no_trans);
-
-        model_view_no_trans = Mat4x4(mv_no_trans);
+        GLdouble mv_no_trans[16];
+        glGetDoublev(GL_MODELVIEW_MATRIX, mv_no_trans);
+
+        model_view_no_trans = Matrix4x4d(mv_no_trans);
         model_view_no_trans_inverse = model_view_no_trans.inverse();
 
@@ -185 +191 @@
         glScalef(volScaling.x, volScaling.y, volScaling.z);
 
-        GLfloat mv_trans[16];
-        glGetFloatv(GL_MODELVIEW_MATRIX, mv_trans);
-
-        model_view_trans = Mat4x4(mv_trans);
+        GLdouble mv_trans[16];
+        glGetDoublev(GL_MODELVIEW_MATRIX, mv_trans);
+
+        model_view_trans = Matrix4x4d(mv_trans);
         model_view_trans_inverse = model_view_trans.inverse();
+
+        model_view_trans.print();
 
         //draw volume bounding box with translation (the correct location in
@@ -234 +242 @@
               zNear, zFar, eyeMinX, eyeMaxX, eyeMinY, eyeMaxY, z_step, n_actual_slices);
 
-        Vector4 vert1, vert2, vert3, vert4;
+        Vector4f vert1, vert2, vert3, vert4;
 
         // Render cutplanes first with depth test enabled.  They will mark the
@@ -250 +258 @@
             switch (axis) {
             case 1:
-                vert1 = Vector4(offset, 0, 0, 1);
-                vert2 = Vector4(offset, 1, 0, 1);
-                vert3 = Vector4(offset, 1, 1, 1);
-                vert4 = Vector4(offset, 0, 1, 1);
+                vert1 = Vector4f(offset, 0, 0, 1);
+                vert2 = Vector4f(offset, 1, 0, 1);
+                vert3 = Vector4f(offset, 1, 1, 1);
+                vert4 = Vector4f(offset, 0, 1, 1);
                 break;
             case 2:
-                vert1 = Vector4(0, offset, 0, 1);
-                vert2 = Vector4(1, offset, 0, 1);
-                vert3 = Vector4(1, offset, 1, 1);
-                vert4 = Vector4(0, offset, 1, 1);
+                vert1 = Vector4f(0, offset, 0, 1);
+                vert2 = Vector4f(1, offset, 0, 1);
+                vert3 = Vector4f(1, offset, 1, 1);
+                vert4 = Vector4f(0, offset, 1, 1);
                 break;
             case 3:
             default:
-                vert1 = Vector4(0, 0, offset, 1);
-                vert2 = Vector4(1, 0, offset, 1);
-                vert3 = Vector4(1, 1, offset, 1);
-                vert4 = Vector4(0, 1, offset, 1);
+                vert1 = Vector4f(0, 0, offset, 1);
+                vert2 = Vector4f(1, 0, offset, 1);
+                vert3 = Vector4f(1, 1, offset, 1);
+                vert4 = Vector4f(0, 1, offset, 1);
                 break;
             }
 
-            Vector4 texcoord1 = vert1;
-            Vector4 texcoord2 = vert2;
-            Vector4 texcoord3 = vert3;
-            Vector4 texcoord4 = vert4;
+            Vector4f texcoord1 = vert1;
+            Vector4f texcoord2 = vert2;
+            Vector4f texcoord3 = vert3;
+            Vector4f texcoord4 = vert4;
 
             _cutplaneShader->bind();
@@ -310 +318 @@
         // Initialize view-aligned quads with eye space bounds of
         // volume
-        vert1 = Vector4(eyeMinX, eyeMinY, -0.5, 1);
-        vert2 = Vector4(eyeMaxX, eyeMinY, -0.5, 1);
-        vert3 = Vector4(eyeMaxX, eyeMaxY, -0.5, 1);
-        vert4 = Vector4(eyeMinX, eyeMaxY, -0.5, 1);
+        vert1 = Vector4f(eyeMinX, eyeMinY, -0.5, 1);
+        vert2 = Vector4f(eyeMaxX, eyeMinY, -0.5, 1);
+        vert3 = Vector4f(eyeMaxX, eyeMaxY, -0.5, 1);
+        vert4 = Vector4f(eyeMinX, eyeMaxY, -0.5, 1);
 
         size_t counter = 0;
@@ -389 +397 @@
         volPtr = volumes[volume_index];
 
-        Vector3 volScaling = volPtr->getPhysicalScaling();
+        Vector3f volScaling = volPtr->getPhysicalScaling();
 
         glPushMatrix();
@@ -510 +518 @@
 }
 
-void VolumeRenderer::getEyeSpaceBounds(const Mat4x4& mv,
+void VolumeRenderer::getEyeSpaceBounds(const Matrix4x4d& mv,
                                        double& xMin, double& xMax,
                                        double& yMin, double& yMax,
@@ -542 +550 @@
 
     for (int i = 0; i < 8; i++) {
-        Vector4 eyeVert = mv.transform(Vector4(vertex[i][0],
-                                               vertex[i][1],
-                                               vertex[i][2],
-                                               vertex[i][3]));
+        Vector4f eyeVert = mv.transform(Vector4f(vertex[i][0],
+                                                 vertex[i][1],
+                                                 vertex[i][2],
+                                                 vertex[i][3]));
         if (eyeVert.x < xMin) xMin = eyeVert.x;
         if (eyeVert.x > xMax) xMax = eyeVert.x;