Changeset 2214 for trunk/packages/vizservers

Timestamp:

Apr 20, 2011 1:26:19 PM (13 years ago)

Author:

ldelgass

Message:

Compile fixes for vtkvis

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.cpp (modified) (3 diffs)
• RpVtkRendererCmd.cpp (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -10 +10 @@
 #include <cassert>
 
+#include <vtkMath.h>
 #include <vtkCamera.h>
 #include <vtkCoordinate.h>
@@ -1638 +1639 @@
 {
     vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
-    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkPerspectiveTransform>::New();
+    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
     double mat3[3][3];
     vtkMath::QuaternionToMatrix3x3(quat, mat3);
     vtkSmartPointer<vtkMatrix4x4> mat4 = vtkSmartPointer<vtkMatrix4x4>::New();
     for (int r = 0; r < 3; r++) {
-        memcpy(mat4[r], mat3[r], sizeof(double)*3);
+        memcpy((*mat4)[r], mat3[r], sizeof(double)*3);
     }
     trans->Translate(+_cameraFocalPoint[0], +_cameraFocalPoint[1], +_cameraFocalPoint[2]);
@@ -2224 +2225 @@
     TRACE("Parallel Scale: %g, Cam pos: %g %g %g, focal pt: %g %g %g, view up: %g %g %g, Clipping range: %g %g",
           camera->GetParallelScale(),
-          camera->GetPosition()[0],
+          camera->GetPosition()[0],
           camera->GetPosition()[1],
           camera->GetPosition()[2], 

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -251 +251 @@
     }
 
-    g_renderer->setCameraOrientation(pos, focalPt, viewUp);
+    g_renderer->setSceneOrientation(quat);
     return TCL_OK;
 }