Changeset 2332 for trunk/packages

Timestamp:

Aug 5, 2011 9:20:18 AM (13 years ago)

Author:

ldelgass

Message:

• Don't enable backface culling if object is not opaque
• Add edge visibility,color,linewidth for Glyphs
• Add control for 2 sided lighting in renderer
• Remove cached scalar range/bounds from DataSet?, VTK already caches this
• Add DataSet? methods for setting active scalars/vectors, and getting range of vector magnitudes, a vector component, or a named field. This is beginning work needed to allow selecting fields to use in filters and color mapping.

Location:

trunk/packages/vizservers/vtkvis

Files:

• ColorMap.cpp (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)
• RpGlyphs.cpp (modified) (2 diffs)
• RpMolecule.cpp (modified) (3 diffs)
• RpStreamlines.cpp (modified) (4 diffs)
• RpStreamlines.h (modified) (1 diff)
• RpVtkDataSet.cpp (modified) (10 diffs)
• RpVtkDataSet.h (modified) (2 diffs)
• RpVtkGraphicsObject.h (modified) (7 diffs)
• RpVtkRenderer.cpp (modified) (4 diffs)
• RpVtkRenderer.h (modified) (2 diffs)
• RpVtkRendererCmd.cpp (modified) (5 diffs)
• protocol.txt (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/ColorMap.cpp

@@ -248 +248 @@
  * \brief Perform linear interpolation of two color control points
  */
-void ColorMap::lerp(double *result, const ControlPoint& cp1, const ControlPoint& cp2, double value)
+void ColorMap::lerp(double *result, 
+                    const ControlPoint& cp1,
+                    const ControlPoint& cp2, 
+                    double value)
 {
     double factor = (value - cp1.value) / (cp2.value - cp1.value);
@@ -259 +262 @@
  * \brief Perform linear interpolation of two opacity control points
  */
-void ColorMap::lerp(double *result, const OpacityControlPoint& cp1, const OpacityControlPoint& cp2, double value)
+void ColorMap::lerp(double *result, 
+                    const OpacityControlPoint& cp1,
+                    const OpacityControlPoint& cp2,
+                    double value)
 {
     double factor = (value - cp1.value) / (cp2.value - cp1.value);

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -23 +23 @@
 MKDIR_P         = @MKDIR_P@
 
-GL_LIB_SPEC     = -lGL
+GL_LIB_SPEC     = -lGL -lm
 
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
@@ -51 +51 @@
 USE_OFFSCREEN_RENDERING = yes
 
-EXTRA_CFLAGS    = -Wall -Wno-deprecated #vtk uses deprecated strstream header (instead of sstream)
+#vtk uses deprecated strstream header (instead of sstream)
+EXTRA_CFLAGS    = -Wall -Wno-deprecated
 DEFINES         =
 ifdef DEBUG

trunk/packages/vizservers/vtkvis/RpGlyphs.cpp

@@ -31 +31 @@
     _scaleFactor(1.0)
 {
+    _backfaceCulling = true;
 }
 
@@ -175 +176 @@
     initProp();
 
-    getActor()->GetProperty()->BackfaceCullingOn();
-
     getActor()->SetMapper(_pdMapper);
     _pdMapper->Update();

trunk/packages/vizservers/vtkvis/RpMolecule.cpp

@@ -29 +29 @@
     _atomScaling(NO_ATOM_SCALING)
 {
+    _backfaceCulling = true;
 }
 
@@ -48 +49 @@
     if (_atomProp == NULL) {
         _atomProp = vtkSmartPointer<vtkActor>::New();
-        _atomProp->GetProperty()->BackfaceCullingOn();
+        if (_backfaceCulling && _opacity == 1.0)
+            _atomProp->GetProperty()->BackfaceCullingOn();
         _atomProp->GetProperty()->EdgeVisibilityOff();
         _atomProp->GetProperty()->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
@@ -59 +61 @@
     if (_bondProp == NULL) {
         _bondProp = vtkSmartPointer<vtkActor>::New();
-        _bondProp->GetProperty()->BackfaceCullingOn();
+        if (_backfaceCulling && _opacity == 1.0)
+            _bondProp->GetProperty()->BackfaceCullingOn();
         _bondProp->GetProperty()->EdgeVisibilityOff();
         _bondProp->GetProperty()->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);

trunk/packages/vizservers/vtkvis/RpStreamlines.cpp

@@ -32 +32 @@
     _seedVisible(true)
 {
+    _backfaceCulling = true;
     _seedColor[0] = 1.0f;
     _seedColor[1] = 1.0f;
@@ -61 +62 @@
             break;
         case TUBES:
-            _linesActor->GetProperty()->BackfaceCullingOn();
+            if (_backfaceCulling && _opacity == 1.0)
+                _linesActor->GetProperty()->BackfaceCullingOn();
             _linesActor->GetProperty()->SetRepresentationToSurface();
             _linesActor->GetProperty()->EdgeVisibilityOff();
@@ -437 +439 @@
         tubeFilter->SetRadius(radius);
         _pdMapper->SetInputConnection(_lineFilter->GetOutputPort());
-        _linesActor->GetProperty()->BackfaceCullingOn();
+        if (_backfaceCulling && _opacity == 1.0)
+            _linesActor->GetProperty()->BackfaceCullingOn();
         _linesActor->GetProperty()->SetRepresentationToSurface();
         _linesActor->GetProperty()->LightingOn();
@@ -506 +509 @@
 
 /**
+ * \brief Set opacity of this object
+ */
+void Streamlines::setOpacity(double opacity)
+{
+    _opacity = opacity;
+    if (_linesActor != NULL) {
+        _linesActor->GetProperty()->SetOpacity(_opacity);
+        if (_opacity < 1.0)
+            _linesActor->GetProperty()->BackfaceCullingOff();
+        else if (_backfaceCulling && _lineType == TUBES)
+            _linesActor->GetProperty()->BackfaceCullingOn();
+    }
+    if (_seedActor != NULL) {
+        _seedActor->GetProperty()->SetOpacity(_opacity);
+    }
+}
+
+/**
  * \brief Turn on/off rendering of this Streamlines
  */

trunk/packages/vizservers/vtkvis/RpStreamlines.h

@@ -45 +45 @@
 
     virtual void setLighting(bool state);
-    
+
+    virtual void setOpacity(double opacity);
+
     virtual void setVisibility(bool state);
 

trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -17 +17 @@
 #include <vtkProperty.h>
 #include <vtkPointData.h>
+#include <vtkCellData.h>
 #include <vtkLookupTable.h>
 
@@ -28 +29 @@
     _visible(true)
 {
-    _dataRange[0] = 0;
-    _dataRange[1] = 1;
-    for (int i = 0; i < 6; i++) {
-        _bounds[i] = 0;
-    }
 }
 
@@ -123 +119 @@
     _dataSet->SetPipelineInformation(NULL);
 
-    _dataSet->GetScalarRange(_dataRange);
-    _dataSet->GetBounds(_bounds);
-
     TRACE("DataSet class: %s", _dataSet->GetClassName());
-    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+#ifdef WANT_TRACE
+    double dataRange[2];
+    getDataRange(dataRange);
+    double bounds[6];
+    getBounds(bounds);
+#endif
+    TRACE("Scalar Range: %.12e, %.12e", dataRange[0], dataRange[1]);
     TRACE("DataSet bounds: %g %g %g %g %g %g",
-          _bounds[0], _bounds[1],
-          _bounds[2], _bounds[3],
-          _bounds[4], _bounds[5]);
+          bounds[0], bounds[1],
+          bounds[2], bounds[3],
+          bounds[4], bounds[5]);
     return true;
 }
@@ -144 +143 @@
     _dataSet = ds;
     _dataSet->SetPipelineInformation(NULL);
-    _dataSet->GetScalarRange(_dataRange);
-    _dataSet->GetBounds(_bounds);
 
     TRACE("DataSet class: %s", _dataSet->GetClassName());
-    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+#ifdef WANT_TRACE
+    double dataRange[2];
+    getDataRange(dataRange);
+    double bounds[6];
+    getBounds(bounds);
+#endif
+    TRACE("Scalar Range: %.12e, %.12e", dataRange[0], dataRange[1]);
     TRACE("DataSet bounds: %g %g %g %g %g %g",
-          _bounds[0], _bounds[1],
-          _bounds[2], _bounds[3],
-          _bounds[4], _bounds[5]);
+          bounds[0], bounds[1],
+          bounds[2], bounds[3],
+          bounds[4], bounds[5]);
     return true;
 }
@@ -184 +187 @@
         return NULL;
     }
-    _dataSet->GetScalarRange(_dataRange);
-    _dataSet->GetBounds(_bounds);
 
     TRACE("DataSet class: %s", _dataSet->GetClassName());
-    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+#ifdef WANT_TRACE
+    double dataRange[2];
+    getDataRange(dataRange);
+    double bounds[6];
+    getBounds(bounds);
+#endif    
+    TRACE("Scalar Range: %.12e, %.12e", dataRange[0], dataRange[1]);
+    TRACE("DataSet bounds: %g %g %g %g %g %g",
+          bounds[0], bounds[1],
+          bounds[2], bounds[3],
+          bounds[4], bounds[5]);
     return _dataSet;
 }
@@ -197 +208 @@
 bool DataSet::is2D() const
 {
-    return (_bounds[4] == 0. && _bounds[4] == _bounds[5]);
+    double bounds[6];
+    getBounds(bounds);
+    return (bounds[4] == 0. && bounds[4] == bounds[5]);
 }
 
@@ -219 +232 @@
  * \brief Get the underlying VTK DataSet subclass class name
  */
-const char *DataSet::getVtkType()
+const char *DataSet::getVtkType() const
 {
     return _dataSet->GetClassName();
@@ -225 +238 @@
 
 /**
+ * \brief Set the ative scalar array to the named field
+ */
+bool DataSet::setActiveScalar(const char *name)
+{
+    bool found = false;
+    if (_dataSet != NULL) {
+        if (_dataSet->GetPointData() != NULL) {
+            if (_dataSet->GetPointData()->SetActiveScalars(name))
+                found = true;
+        }
+        if (_dataSet->GetCellData() != NULL) {
+            if (_dataSet->GetCellData()->SetActiveScalars(name))
+                found = true;
+        }
+    }
+    return found;
+}
+
+/**
+ * \brief Set the ative vector array to the named field
+ */
+bool DataSet::setActiveVector(const char *name)
+{
+    bool found = false;
+    if (_dataSet != NULL) {
+        if (_dataSet->GetPointData() != NULL) {
+            if (_dataSet->GetPointData()->SetActiveVectors(name))
+                found = true;
+        }
+        if (_dataSet->GetCellData() != NULL) {
+            if (_dataSet->GetCellData()->SetActiveVectors(name))
+                found = true;
+        }
+    }
+    return found;
+}
+
+/**
  * \brief Get the range of scalar values in the DataSet
  */
-void DataSet::getDataRange(double minmax[2])
-{
-    memcpy(minmax, _dataRange, sizeof(double)*2);
+void DataSet::getDataRange(double minmax[2]) const
+{
+    _dataSet->GetScalarRange(minmax);
+}
+
+/**
+ * \brief Get the range of scalar values (or vector magnitudes) for
+ * the named field in the DataSet
+ */
+void DataSet::getDataRange(double minmax[2], const char *fieldName) const
+{
+    if (_dataSet == NULL)
+        return;
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetArray(fieldName) != NULL) {
+        _dataSet->GetPointData()->GetArray(fieldName)->GetRange(minmax, -1);
+    } else if (_dataSet->GetCellData() != NULL &&
+        _dataSet->GetCellData()->GetArray(fieldName) != NULL) {
+        _dataSet->GetCellData()->GetArray(fieldName)->GetRange(minmax, -1);
+    } else if (_dataSet->GetFieldData() != NULL &&
+        _dataSet->GetFieldData()->GetArray(fieldName) != NULL) {
+        _dataSet->GetFieldData()->GetArray(fieldName)->GetRange(minmax, -1);
+    }
+}
+
+/**
+ * \brief Get the range of vector magnitudes in the DataSet
+ */
+void DataSet::getVectorMagnitudeRange(double minmax[2]) const
+{
+    if (_dataSet == NULL) 
+        return;
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetVectors() != NULL) {
+        _dataSet->GetPointData()->GetVectors()->GetRange(minmax, -1);
+    } else if (_dataSet->GetCellData() != NULL &&
+               _dataSet->GetCellData()->GetVectors() != NULL) {
+        _dataSet->GetCellData()->GetVectors()->GetRange(minmax, -1);
+    }
+}
+
+/**
+ * \brief Get the range of a vector component in the DataSet
+ */
+void DataSet::getVectorComponentRange(double minmax[2], int component) const
+{
+    if (_dataSet == NULL)
+        return;
+    if (_dataSet->GetPointData() != NULL ||
+        _dataSet->GetPointData()->GetVectors() != NULL) {
+        _dataSet->GetPointData()->GetVectors()->GetRange(minmax, component);
+    } else if (_dataSet->GetCellData() != NULL &&
+               _dataSet->GetCellData()->GetVectors() != NULL) {
+        _dataSet->GetCellData()->GetVectors()->GetRange(minmax, component);
+    }
 }
 
@@ -235 +338 @@
  * \brief Get the bounds the DataSet
  */
-void DataSet::getBounds(double bounds[6])
-{
-    memcpy(bounds, _bounds, sizeof(double)*6);
+void DataSet::getBounds(double bounds[6]) const
+{
+    _dataSet->GetBounds(bounds);
 }
 
@@ -247 +350 @@
  * \return the value of the nearest point or 0 if no scalar data available
  */
-double DataSet::getDataValue(double x, double y, double z)
+double DataSet::getDataValue(double x, double y, double z) const
 {
     if (_dataSet == NULL)

trunk/packages/vizservers/vtkvis/RpVtkDataSet.h

@@ -43 +43 @@
     vtkDataSet *getVtkDataSet();
 
-    const char *getVtkType();
+    const char *getVtkType() const;
 
-    void getDataRange(double minmax[2]);
+    bool setActiveScalar(const char *name);
 
-    void getBounds(double bounds[6]);
+    bool setActiveVector(const char *name);
 
-    double getDataValue(double x, double y, double z);
+    void getDataRange(double minmax[2]) const;
+
+    void getDataRange(double minmax[2], const char *fieldName) const;
+
+    void getVectorMagnitudeRange(double minmax[2]) const;
+
+    void getVectorComponentRange(double minmax[2], int component) const;
+
+    void getBounds(double bounds[6]) const;
+
+    double getDataValue(double x, double y, double z) const;
 
     void setVisibility(bool state);
@@ -60 +70 @@
     std::string _name;
     vtkSmartPointer<vtkDataSet> _dataSet;
-    double _dataRange[2];
-    double _bounds[6];
     bool _visible;
 };

trunk/packages/vizservers/vtkvis/RpVtkGraphicsObject.h

@@ -26 +26 @@
 
 #include "RpVtkDataSet.h"
+#include "Trace.h"
 
 namespace Rappture {
@@ -39 +40 @@
         _opacity(1.0),
         _edgeWidth(1.0f),
-        _lighting(true)
+        _lighting(true),
+        _backfaceCulling(false)
     {
         _color[0] = 1.0f;
@@ -229 +231 @@
         if (getActor() != NULL) {
             getActor()->GetProperty()->SetOpacity(opacity);
+            if (_backfaceCulling && _opacity < 1.0) {
+                getActor()->GetProperty()->BackfaceCullingOff();
+                TRACE("Backface culling off");
+            } else if (_backfaceCulling && _opacity == 1.0) {
+                getActor()->GetProperty()->BackfaceCullingOn();
+                TRACE("Backface culling on");
+            }
         } else if (getAssembly() != NULL) {
             vtkProp3DCollection *props = getAssembly()->GetParts();
@@ -236 +245 @@
                 if (vtkActor::SafeDownCast(prop) != NULL) {
                     vtkActor::SafeDownCast(prop)->GetProperty()->SetOpacity(opacity);
+                    if (_backfaceCulling && _opacity < 1.0) {
+                        vtkActor::SafeDownCast(prop)->GetProperty()->BackfaceCullingOff();
+                        TRACE("Backface culling off");
+                    } else if (_backfaceCulling && _opacity == 1.0) {
+                        vtkActor::SafeDownCast(prop)->GetProperty()->BackfaceCullingOn();
+                        TRACE("Backface culling on");
+                    }
                 }
             }
@@ -557 +573 @@
 
     /**
+     * \brief Toggle backface culling of prop
+     */
+    virtual void setBackfaceCulling(bool state)
+    {
+        _backfaceCulling = state;
+        if (state && _opacity < 1.0)
+            return;
+        if (getActor() != NULL) {
+            getActor()->GetProperty()->SetBackfaceCulling((state ? 1 : 0));
+         } else if (getAssembly() != NULL) {
+            vtkProp3DCollection *props = getAssembly()->GetParts();
+            vtkProp3D *prop;
+            props->InitTraversal();
+            while ((prop = props->GetNextProp3D()) != NULL) {
+                if (vtkActor::SafeDownCast(prop) != NULL) {
+                    vtkActor::SafeDownCast(prop)->GetProperty()->SetBackfaceCulling((state ? 1 : 0));
+                }
+            }
+        }
+    }
+
+    /**
      * \brief Subclasses need to implement setting clipping planes in their mappers
      */
@@ -575 +613 @@
             if (!_lighting)
                 property->LightingOff();
+            if (_backfaceCulling && _opacity == 1.0) {
+                property->BackfaceCullingOn();
+            }
         }
     }
@@ -590 +631 @@
     float _edgeWidth;
     bool _lighting;
+    bool _backfaceCulling;
 
     vtkSmartPointer<vtkProp> _prop;

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -2069 +2069 @@
 
 /**
- * \brief Set opacity of Glyphs for the given DataSet
- */
-void Renderer::setGlyphsOpacity(const DataSetId& id, double opacity)
+ * \brief Set the visibility of polygon edges for the specified DataSet
+ */
+void Renderer::setGlyphsEdgeVisibility(const DataSetId& id, bool state)
 {
     GlyphsHashmap::iterator itr;
@@ -2089 +2089 @@
 
     do {
+        itr->second->setEdgeVisibility(state);
+    } while (doAll && ++itr != _glyphs.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set the RGB polygon edge color for the specified DataSet
+ */
+void Renderer::setGlyphsEdgeColor(const DataSetId& id, float color[3])
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setEdgeColor(color);
+    } while (doAll && ++itr != _glyphs.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set the polygon edge width for the specified DataSet (may be a no-op)
+ *
+ * If the OpenGL implementation/hardware does not support wide lines, 
+ * this function may not have an effect.
+ */
+void Renderer::setGlyphsEdgeWidth(const DataSetId& id, float edgeWidth)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setEdgeWidth(edgeWidth);
+    } while (doAll && ++itr != _glyphs.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Turn Glyphs lighting on/off for the specified DataSet
+ */
+void Renderer::setGlyphsLighting(const DataSetId& id, bool state)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setLighting(state);
+    } while (doAll && ++itr != _glyphs.end());
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set opacity of Glyphs for the given DataSet
+ */
+void Renderer::setGlyphsOpacity(const DataSetId& id, double opacity)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
         itr->second->setOpacity(opacity);
     } while (doAll && ++itr != _glyphs.end());
@@ -2146 +2256 @@
     } while (doAll && ++itr != _glyphs.end());
 
-    _needsRedraw = true;
-}
-
-/**
- * \brief Turn Glyphs lighting on/off for the specified DataSet
- */
-void Renderer::setGlyphsLighting(const DataSetId& id, bool state)
-{
-    GlyphsHashmap::iterator itr;
-
-    bool doAll = false;
-
-    if (id.compare("all") == 0) {
-        itr = _glyphs.begin();
-        doAll = true;
-    } else {
-        itr = _glyphs.find(id);
-    }
-    if (itr == _glyphs.end()) {
-        ERROR("Glyphs not found: %s", id.c_str());
-        return;
-    }
-
-    do {
-        itr->second->setLighting(state);
-    } while (doAll && ++itr != _glyphs.end());
     _needsRedraw = true;
 }
@@ -6368 +6452 @@
 
 /**
+ * \brief Control the use of two sided lighting
+ */
+void Renderer::setUseTwoSidedLighting(bool state)
+{
+    _renderer->SetTwoSidedLighting(state ? 1 : 0);
+    _needsRedraw = true;
+}
+
+/**
  * \brief Control the use of the depth peeling algorithm for transparency
  */

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -172 +172 @@
     void setClipPlane(Axis axis, double ratio, int direction);
 
+    void setUseTwoSidedLighting(bool state);
+
     void setUseDepthPeeling(bool state);
 
@@ -281 +283 @@
 
     Glyphs *getGlyphs(const DataSetId& id);
+
+    void setGlyphsEdgeVisibility(const DataSetId& id, bool state);
+
+    void setGlyphsEdgeColor(const DataSetId& id, float color[3]);
+
+    void setGlyphsEdgeWidth(const DataSetId& id, float edgeWidth);
 
     void setGlyphsLighting(const DataSetId& id, bool state);

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -1351 +1351 @@
 
 static int
+GlyphsEdgeVisibilityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGlyphsEdgeVisibility(name, state);
+    } else {
+        g_renderer->setGlyphsEdgeVisibility("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 GlyphsLightingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -1363 +1380 @@
     } else {
         g_renderer->setGlyphsLighting("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+GlyphsLineColorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    float color[3];
+    if (GetFloatFromObj(interp, objv[2], &color[0]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[3], &color[1]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGlyphsEdgeColor(name, color);
+    } else {
+        g_renderer->setGlyphsEdgeColor("all", color);
+    }
+    return TCL_OK;
+}
+
+static int
+GlyphsLineWidthOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    float width;
+    if (GetFloatFromObj(interp, objv[2], &width) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGlyphsEdgeWidth(name, width);
+    } else {
+        g_renderer->setGlyphsEdgeWidth("all", width);
     }
     return TCL_OK;
@@ -1479 +1532 @@
     {"colormap",  1, GlyphsColorMapOp, 3, 4, "colorMapName ?dataSetNme?"},
     {"delete",    1, GlyphsDeleteOp, 2, 3, "?dataSetName?"},
-    {"lighting",  1, GlyphsLightingOp, 3, 4, "bool ?dataSetName?"},
+    {"edges",     1, GlyphsEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
+    {"lighting",  3, GlyphsLightingOp, 3, 4, "bool ?dataSetName?"},
+    {"linecolor", 5, GlyphsLineColorOp, 5, 6, "r g b ?dataSetName?"},
+    {"linewidth", 5, GlyphsLineWidthOp, 3, 4, "width ?dataSetName?"},
     {"opacity",   1, GlyphsOpacityOp, 3, 4, "value ?dataSetName?"},
     {"scale",     2, GlyphsScaleOp, 3, 4, "scaleFactor ?dataSetName?"},
@@ -2957 +3013 @@
 
 static int
+RendererTwoSidedLightingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                           Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    g_renderer->setUseTwoSidedLighting(state);
+    return TCL_OK;
+}
+
+static int
 RendererRenderOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -2965 +3033 @@
 
 static Rappture::CmdSpec rendererOps[] = {
-    {"clipplane", 1, RendererClipPlaneOp, 5, 5, "axis ratio direction"},
-    {"depthpeel", 1, RendererDepthPeelingOp, 3, 3, "bool"},
-    {"render",    1, RendererRenderOp, 2, 2, ""}
+    {"clipplane",  1, RendererClipPlaneOp, 5, 5, "axis ratio direction"},
+    {"depthpeel",  1, RendererDepthPeelingOp, 3, 3, "bool"},
+    {"light2side", 1, RendererTwoSidedLightingOp, 3, 3, "bool"},
+    {"render",     1, RendererRenderOp, 2, 2, ""}
 };
 static int nRendererOps = NumCmdSpecs(rendererOps);

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -15 +15 @@
 renderer depthpeel <bool>
          Set use of depth peeling algorithm for transparency
+renderer light2side <bool>
+         Toggle use of two-sided lighting (controls if backfaces are lit with a
+         flipped normal)
 renderer render
          Force a new image to be rendered - use for advancing animation
@@ -112 +115 @@
 glyphs colormap <colorMapName> <?dataSetName?>
 glyphs delete <?dataSetName?>
+glyphs edges <bool> <?datasetName?>
 glyphs lighting <bool> <?datasetName?>
+glyphs linecolor <r> <g> <b> <?datasetName?>
+glyphs linewidth <val> <?datasetName?>
 glyphs opacity <val> <?datasetName?>
 glyphs scale <scaleFactor> <?datasetName?>