Changeset 3866 for trunk/packages/vizservers

Timestamp:

Aug 15, 2013 2:41:12 PM (11 years ago)

Author:

ldelgass

Message:

Handle rectilinear/structured grids in vtk volume rendering using splat
resampling (for now).

File:

• trunk/packages/vizservers/vtkvis/Volume.cpp (modified) (5 diffs)

trunk/packages/vizservers/vtkvis/Volume.cpp

@@ -14 +14 @@
 #include <vtkGPUVolumeRayCastMapper.h>
 #include <vtkVolumeTextureMapper3D.h>
+#include <vtkRectilinearGrid.h>
+#include <vtkStructuredGrid.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkPolyData.h>
@@ -121 +123 @@
 #endif
         vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
-    } else if (_dataSet->isCloud()) {
-        // DataSet is a 3D point cloud
+    } else if (_dataSet->isCloud() ||
+               vtkUnstructuredGrid::SafeDownCast(ds) == NULL) {
+        // DataSet is a 3D point cloud, rectilinear grid or structured grid
         vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
 #ifdef USE_VTK6
@@ -131 +134 @@
         int dims[3];
         dims[0] = dims[1] = dims[2] = 64;
-        TRACE("Generating volume with dims (%d,%d,%d) from point cloud",
-              dims[0], dims[1], dims[2]);
+        if (vtkStructuredGrid::SafeDownCast(ds) != NULL) {
+            vtkStructuredGrid::SafeDownCast(ds)->GetDimensions(dims);
+        } else if (vtkRectilinearGrid::SafeDownCast(ds) != NULL) {
+            vtkRectilinearGrid::SafeDownCast(ds)->GetDimensions(dims);
+        }
+        TRACE("Generating volume with dims (%d,%d,%d) from %d points",
+              dims[0], dims[1], dims[2], ds->GetNumberOfPoints());
         splatter->SetSampleDimensions(dims);
         splatter->Update();
@@ -144 +152 @@
         _volumeMapper->SetInputConnection(splatter->GetOutputPort());
         vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
-    } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) {
+    } else {
         // Unstructured grid with cells (not a cloud)
         vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::SafeDownCast(ds);
+        assert(ugrid != NULL);
         // DataSet is unstructured grid
         // Only works if cells are all tetrahedra
@@ -177 +186 @@
         vtkUnstructuredGridVolumeMapper::SafeDownCast(_volumeMapper)->
             SetBlendModeToComposite();
-    } else {
-        ERROR("Unsupported DataSet type: %s", _dataSet->getVtkType());
-        _dataSet = NULL;
-        return;
     }