Changeset 3189 for trunk/packages/vizservers/vtkvis/RpVolume.cpp

Timestamp:

Nov 15, 2012 6:18:44 PM (11 years ago)

Author:

ldelgass

Message:

Adopt API changes for upcoming VTK 6.0

File:

• trunk/packages/vizservers/vtkvis/RpVolume.cpp (modified) (4 diffs)

trunk/packages/vizservers/vtkvis/RpVolume.cpp

@@ -8 +8 @@
 #include <cassert>
 
+#include <vtkVersion.h>
+#if (VTK_MAJOR_VERSION >= 6)
+#define USE_VTK6
+#endif
 #include <vtkDataSet.h>
 #include <vtkPointData.h>
@@ -109 +113 @@
         _volumeMapper = vtkSmartPointer<vtkVolumeTextureMapper3D>::New();
 #endif
+#ifdef USE_VTK6
+#ifdef USE_GPU_RAYCAST_MAPPER
+        vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->SetInputData(ds);
+#else
+        vtkVolumeTextureMapper3D::SafeDownCast(_volumeMapper)->SetInputData(ds);
+#endif
+#else
         _volumeMapper->SetInput(ds);
+#endif
         vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
     } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) {
@@ -120 +132 @@
         if (ugrid->GetCellType(0) == VTK_TETRA &&
             ugrid->IsHomogeneous()) {
+#ifdef USE_VTK6
+            vtkProjectedTetrahedraMapper::SafeDownCast(_volumeMapper)->SetInputData(ds);
+#else
             _volumeMapper->SetInput(ds);
+#endif
         } else {
             // Decompose to tetrahedra
             vtkSmartPointer<vtkDataSetTriangleFilter> filter = 
                 vtkSmartPointer<vtkDataSetTriangleFilter>::New();
+#ifdef USE_VTK6
+            filter->SetInputData(ugrid);
+#else
             filter->SetInput(ugrid);
+#endif
             filter->TetrahedraOnlyOn();
             _volumeMapper->SetInputConnection(filter->GetOutputPort());
@@ -138 +158 @@
         // DataSet is a 3D point cloud
         vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
+#ifdef USE_VTK6
+        splatter->SetInputData(ds);
+#else
         splatter->SetInput(ds);
+#endif
         int dims[3];
         dims[0] = dims[1] = dims[2] = 64;