Changeset 2757 for trunk

Timestamp:

Jan 9, 2012, 1:27:10 AM (13 years ago)

Author:

ldelgass

Message:

Add volume quality command to adjust relative sampling distance (quality is in
[0,1] range and is used to adjust sample distance relative to volume spacing.
Also first pass at supporting point cloud input to volume renderer.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpCutplane.cpp (modified) (2 diffs)
• RpVolume.cpp (modified) (7 diffs)
• RpVolume.h (modified) (2 diffs)
• RpVtkRenderer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (7 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (1 diff)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpCutplane.cpp

@@ -221 +221 @@
             splatter->GetSampleDimensions(dims);
             TRACE("Sample dims: %d %d %d", dims[0], dims[1], dims[2]);
-            if (plane == DataSet::PLANE_ZY) {
+            if (plane == PLANE_ZY) {
                 dims[0] = 3;
-            } else if (plane == DataSet::PLANE_XZ) {
+            } else if (plane == PLANE_XZ) {
                 dims[1] = 3;
             } else {
@@ -255 +255 @@
             splatter->SetInput(pd);
             int dims[3];
-            splatter->GetSampleDimensions(dims);
-            TRACE("Sample dims: %d %d %d", dims[0], dims[1], dims[2]);
+            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);
             for (int i = 0; i < 3; i++) {
                 _cutter[i]->SetInputConnection(splatter->GetOutputPort());

trunk/packages/vizservers/vtkvis/RpVolume.cpp

@@ -20 +20 @@
 #include <vtkProjectedTetrahedraMapper.h>
 #include <vtkDataSetTriangleFilter.h>
+#include <vtkGaussianSplatter.h>
 
 #include "RpVolume.h"
@@ -54 +55 @@
 
 /**
+ * \brief Get the voxel dimensions (if the volume is not a
+ * uniform grid, unit spacing is returned)
+ */
+void Volume::getSpacing(double spacing[3])
+{
+    spacing[0] = spacing[1] = spacing[2] = 1.0;
+    if (_dataSet == NULL)
+        return;
+    vtkDataSet *ds = _dataSet->getVtkDataSet();
+    if (ds != NULL && vtkImageData::SafeDownCast(ds) != NULL) {
+        vtkImageData::SafeDownCast(ds)->GetSpacing(spacing);
+    } else if (ds != NULL && vtkVolumeMapper::SafeDownCast(_volumeMapper) != NULL) {
+        vtkImageData *imgData = vtkVolumeMapper::SafeDownCast(_volumeMapper)->GetInput();
+        if (imgData != NULL) {
+            imgData->GetSpacing(spacing);
+        }
+    }
+}
+
+/**
+ * \brief Get the average voxel dimension (if the volume is not a
+ * uniform grid, unit spacing is returned)
+ */
+double Volume::getAverageSpacing()
+{
+    double spacing[3];
+    getSpacing(spacing);
+    return (spacing[0] + spacing[1] + spacing[2]) * 0.333;
+}
+
+/**
  * \brief Internal method to set up pipeline after a state change
  */
@@ -62 +94 @@
 
     vtkDataSet *ds = _dataSet->getVtkDataSet();
+
+    if (_dataSet->is2D()) {
+        ERROR("Volume requires a 3D DataSet");
+        _dataSet = NULL;
+        return;
+    }
 
     if (vtkImageData::SafeDownCast(ds) != NULL) {
@@ -67 +105 @@
 #ifdef USE_GPU_RAYCAST_MAPPER
         _volumeMapper = vtkSmartPointer<vtkGPUVolumeRayCastMapper>::New();
+        vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->AutoAdjustSampleDistancesOff();
 #else
         _volumeMapper = vtkSmartPointer<vtkVolumeTextureMapper3D>::New();
 #endif
         _volumeMapper->SetInput(ds);
-        vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();        
+        vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
     } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) {
         vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::SafeDownCast(ds);
@@ -93 +132 @@
         vtkUnstructuredGridVolumeMapper::SafeDownCast(_volumeMapper)->
             SetBlendModeToComposite();
+    } else if (vtkPolyData::SafeDownCast(ds) != NULL &&
+               vtkPolyData::SafeDownCast(ds)->GetNumberOfLines() == 0 &&
+               vtkPolyData::SafeDownCast(ds)->GetNumberOfPolys() == 0 &&
+               vtkPolyData::SafeDownCast(ds)->GetNumberOfStrips() == 0 ) {
+        // DataSet is a 3D point cloud
+        vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
+        splatter->SetInput(ds);
+        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());
@@ -111 +170 @@
         setColorMap(ColorMap::getVolumeDefault());
     }
+
+    setSampleDistance(getAverageSpacing());
 
     getVolume()->SetMapper(_volumeMapper);
@@ -182 +243 @@
     }
 }
+
+/**
+ * \brief Set distance between samples along rays
+ */
+void Volume::setSampleDistance(float d)
+{
+    TRACE("Sample distance: %g", d);
+    if (_volumeMapper != NULL &&
+#ifdef USE_GPU_RAYCAST_MAPPER
+        vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper) != NULL) {
+        vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->SetSampleDistance(d);
+#else
+        vtkVolumeTextureMapper3D::SafeDownCast(_volumeMapper) != NULL) {
+        vtkVolumeTextureMapper3D::SafeDownCast(_volumeMapper)->SetSampleDistance(d);
+#endif
+    }
+}

trunk/packages/vizservers/vtkvis/RpVolume.h

@@ -43 +43 @@
     }
 
+    void getSpacing(double spacing[3]);
+
+    double getAverageSpacing();
+
     virtual void setOpacity(double opacity);
 
@@ -54 +58 @@
 
     virtual void updateRanges(Renderer *renderer);
+
+    void setSampleDistance(float d);
 
 private:

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -515 +515 @@
     void setStreamlinesSeedColor(const DataSetId& id, float color[3]);
 
+    // Volumes
+
+    void setVolumeSampleDistance(const DataSetId& id, double distance);
+
 private:
     static void printCameraInfo(vtkCamera *camera);

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -1652 +1652 @@
     {"ccolor",       2, CutplaneColorOp, 5, 6, "r g b ?dataSetName?"},
     {"colormap",     7, CutplaneColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
-    {"colormode",    7, CutplaneColorModeOp, 4, 5, "mode fieldName ?dataSetNme?"},
+    {"colormode",    7, CutplaneColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     {"delete",       1, CutplaneDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",        1, CutplaneEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
@@ -2521 +2521 @@
 
 static Rappture::CmdSpec glyphsOps[] = {
-    {"add",       1, GlyphsAddOp, 3, 4, "shape ?dataSetNme?"},
+    {"add",       1, GlyphsAddOp, 3, 4, "shape ?dataSetName?"},
     {"ccolor",    2, GlyphsColorOp, 5, 6, "r g b ?dataSetName?"},
-    {"colormap",  7, GlyphsColorMapOp, 3, 4, "colorMapName ?dataSetNme?"},
-    {"colormode", 7, GlyphsColorModeOp, 4, 5, "mode fieldName ?dataSetNme?"},
+    {"colormap",  7, GlyphsColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"colormode", 7, GlyphsColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     {"delete",    1, GlyphsDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",     1, GlyphsEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
@@ -2537 +2537 @@
     {"scale",     2, GlyphsScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"shape",     2, GlyphsShapeOp, 3, 4, "shapeVal ?dataSetName?"},
-    {"smode",     2, GlyphsScalingModeOp, 4, 5, "mode fieldName ?dataSetNme?"},
+    {"smode",     2, GlyphsScalingModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     {"visible",   1, GlyphsVisibleOp, 3, 4, "bool ?dataSetName?"},
     {"wireframe", 1, GlyphsWireframeOp, 3, 4, "bool ?dataSetName?"}
@@ -4315 +4315 @@
     {"add",       1, PseudoColorAddOp, 2, 3, "?dataSetName?"},
     {"ccolor",    2, PseudoColorColorOp, 5, 6, "r g b ?dataSetName?"},
-    {"colormap",  7, PseudoColorColorMapOp, 3, 4, "colorMapName ?dataSetNme?"},
-    {"colormode", 7, PseudoColorColorModeOp, 4, 5, "mode fieldName ?dataSetNme?"},
+    {"colormap",  7, PseudoColorColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"colormode", 7, PseudoColorColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     {"delete",    1, PseudoColorDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",     1, PseudoColorEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
@@ -5164 +5164 @@
     {"ccolor",    1, StreamlinesColorOp,          5, 6, "r g b ?dataSetName?"},
     {"colormap",  7, StreamlinesColorMapOp,       3, 4, "colorMapName ?dataSetName?"},
-    {"colormode", 7, StreamlinesColorModeOp,      4, 5, "mode fieldName ?dataSetNme?"},
+    {"colormode", 7, StreamlinesColorModeOp,      4, 5, "mode fieldName ?dataSetName?"},
     {"delete",    1, StreamlinesDeleteOp,         2, 3, "?dataSetName?"},
     {"edges",     1, StreamlinesEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
@@ -5317 +5317 @@
 
 static int
+VolumeSampleRateOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
+{
+    double quality;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &quality) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (quality < 0.0 || quality > 1.0) {
+        Tcl_AppendResult(interp, "bad volume quality value \"",
+                         Tcl_GetString(objv[2]),
+                         "\": should be in the range [0,1]", (char*)NULL);
+        return TCL_ERROR;
+    }
+    double distance;
+    double maxFactor = 4.0;
+    if (quality >= 0.5) {
+        distance = 1.0 / ((quality - 0.5) * (maxFactor - 1.0) * 2.0 + 1.0);
+    } else {
+        distance = ((0.5 - quality) * (maxFactor - 1.0) * 2.0 + 1.0);
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setVolumeSampleDistance(name, distance);
+    } else {
+        g_renderer->setVolumeSampleDistance("all", distance);
+    }
+    return TCL_OK;
+}
+
+static int
 VolumeScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -5429 +5459 @@
 
 static Rappture::CmdSpec volumeOps[] = {
-    {"add",      1, VolumeAddOp,      2, 3, "?dataSetName?"},
-    {"colormap", 1, VolumeColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
-    {"delete",   1, VolumeDeleteOp,   2, 3, "?dataSetName?"},
-    {"lighting", 1, VolumeLightingOp, 3, 4, "bool ?dataSetName?"},
-    {"opacity",  2, VolumeOpacityOp,  3, 4, "val ?dataSetName?"},
-    {"orient",   2, VolumeOrientOp,   6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",      1, VolumePositionOp, 5, 6, "x y z ?dataSetName?"},
-    {"scale",    2, VolumeScaleOp,    5, 6, "sx sy sz ?dataSetName?"},
-    {"shading",  2, VolumeShadingOp,  4, 6, "oper val ?dataSetName?"},
-    {"visible",  1, VolumeVisibleOp,  3, 4, "bool ?dataSetName?"}
+    {"add",      1, VolumeAddOp,        2, 3, "?dataSetName?"},
+    {"colormap", 1, VolumeColorMapOp,   3, 4, "colorMapName ?dataSetName?"},
+    {"delete",   1, VolumeDeleteOp,     2, 3, "?dataSetName?"},
+    {"lighting", 1, VolumeLightingOp,   3, 4, "bool ?dataSetName?"},
+    {"opacity",  2, VolumeOpacityOp,    3, 4, "val ?dataSetName?"},
+    {"orient",   2, VolumeOrientOp,     6, 7, "qw qx qy qz ?dataSetName?"},
+    {"pos",      1, VolumePositionOp,   5, 6, "x y z ?dataSetName?"},
+    {"quality",  1, VolumeSampleRateOp, 3, 4, "val ?dataSetName?"},
+    {"scale",    2, VolumeScaleOp,      5, 6, "sx sy sz ?dataSetName?"},
+    {"shading",  2, VolumeShadingOp,    4, 6, "oper val ?dataSetName?"},
+    {"visible",  1, VolumeVisibleOp,    3, 4, "bool ?dataSetName?"}
 };
 static int nVolumeOps = NumCmdSpecs(volumeOps);

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -1709 +1709 @@
     _needsRedraw = true;
 }
+
+/**
+ * \brief Set the sample rate for the volume shader
+ *
+ * Smaller values will give better rendering at the cost
+ * of slower rendering
+ */
+void Renderer::setVolumeSampleDistance(const DataSetId& id, double distance)
+{
+    VolumeHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _volumes.begin();
+        doAll = true;
+    } else {
+        itr = _volumes.find(id);
+    }
+    if (itr == _volumes.end()) {
+        ERROR("Volume not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        distance *= itr->second->getAverageSpacing();
+        itr->second->setSampleDistance((float)distance);
+    } while (doAll && ++itr != _volumes.end());
+
+    _needsRedraw = true;
+}

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -366 +366 @@
 volume orient <qw> <qx> <qy> <qz> <?dataSetName?>
 volume pos <x> <y> <z> <?dataSetName?>
+volume quality <val> <?datasetName?>
+       val = [0,1]
 volume scale <sx> <sy> <sz> <?dataSetName?>
 volume shading ambient <coeff> <?datasetName?>