Changeset 3844 for branches/1.3/packages/vizservers/vtkvis/Volume.cpp

Timestamp:

Jul 26, 2013, 6:00:09 PM (11 years ago)

Author:

ldelgass

Message:

Sync with trunk. Branch now differs only from trunk by r3722 (branch is version
1.3, trunk is version 1.4)

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/Volume.cpp (modified) (4 diffs)

branches/1.3/packages/vizservers/vtkvis/Volume.cpp

@@ -83 +83 @@
     double spacing[3];
     getSpacing(spacing);
+    TRACE("Spacing: %g %g %g", spacing[0], spacing[1], spacing[2]);
     return (spacing[0] + spacing[1] + spacing[2]) * 0.333;
 }
@@ -120 +121 @@
 #endif
         vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
+    } else if (_dataSet->isCloud()) {
+        // 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;
+        TRACE("Generating volume with dims (%d,%d,%d) from point cloud",
+              dims[0], dims[1], dims[2]);
+        splatter->SetSampleDimensions(dims);
+        splatter->Update();
+        TRACE("Done generating volume");
+#ifdef USE_GPU_RAYCAST_MAPPER
+        _volumeMapper = vtkSmartPointer<vtkGPUVolumeRayCastMapper>::New();
+        vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->AutoAdjustSampleDistancesOff();
+#else
+        _volumeMapper = vtkSmartPointer<vtkVolumeTextureMapper3D>::New();
+#endif
+        _volumeMapper->SetInputConnection(splatter->GetOutputPort());
+        vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
     } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) {
+        // Unstructured grid with cells (not a cloud)
         vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::SafeDownCast(ds);
         // DataSet is unstructured grid
@@ -144 +169 @@
 #endif
             filter->TetrahedraOnlyOn();
+            TRACE("Decomposing grid to tets");
+            filter->Update();
+            TRACE("Decomposing done");
             _volumeMapper->SetInputConnection(filter->GetOutputPort());
         }
@@ -149 +177 @@
         vtkUnstructuredGridVolumeMapper::SafeDownCast(_volumeMapper)->
             SetBlendModeToComposite();
-    } else if (_dataSet->isCloud()) {
-        // 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;
-        TRACE("Generating volume with dims (%d,%d,%d) from point cloud",
-              dims[0], dims[1], dims[2]);
-        splatter->SetSampleDimensions(dims);
-#ifdef USE_GPU_RAYCAST_MAPPER
-        _volumeMapper = vtkSmartPointer<vtkGPUVolumeRayCastMapper>::New();
-        vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->AutoAdjustSampleDistancesOff();
-#else
-        _volumeMapper = vtkSmartPointer<vtkVolumeTextureMapper3D>::New();
-#endif
-        _volumeMapper->SetInputConnection(splatter->GetOutputPort());
-        vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
     } else {
         ERROR("Unsupported DataSet type: %s", _dataSet->getVtkType());