Changeset 5835 for vtkvis/trunk/Volume.cpp

Timestamp:

Aug 21, 2015, 2:54:55 PM (9 years ago)

Author:

ldelgass

Message:

Require VTK >= 6.0.0

File:

• vtkvis/trunk/Volume.cpp (modified) (3 diffs)

vtkvis/trunk/Volume.cpp

@@ -121 +121 @@
         _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();
@@ -134 +130 @@
         // 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;
@@ -215 +207 @@
         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();
             TRACE("Decomposing grid to tets");