Changeset 3695 for trunk/packages

Timestamp:

Jun 16, 2013 9:47:15 PM (11 years ago)

Author:

ldelgass

Message:

Add protocol for setting glyphs tesselation quality

Location:

trunk/packages/vizservers/vtkvis

Files:

• Arrow.cpp (modified) (1 diff)
• Cone.cpp (modified) (1 diff)
• Disk.cpp (modified) (1 diff)
• Glyphs.cpp (modified) (9 diffs)
• Polygon.cpp (modified) (1 diff)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)
• RendererGraphicsObjs.cpp (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/Arrow.cpp

@@ -40 +40 @@
 
     vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
+    normalFilter->SetFeatureAngle(90.);
     normalFilter->SetInputConnection(_arrow->GetOutputPort());
-    normalFilter->AutoOrientNormalsOff();
 
     _pdMapper->SetInputConnection(_arrow->GetOutputPort());

trunk/packages/vizservers/vtkvis/Cone.cpp

@@ -40 +40 @@
 
     vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
+    normalFilter->SetFeatureAngle(90.);
     normalFilter->SetInputConnection(_cone->GetOutputPort());
-    normalFilter->AutoOrientNormalsOff();
 
     _pdMapper->SetInputConnection(_cone->GetOutputPort());

trunk/packages/vizservers/vtkvis/Disk.cpp

@@ -41 +41 @@
     vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
     normalFilter->SetInputConnection(_disk->GetOutputPort());
-    normalFilter->AutoOrientNormalsOff();
 
     _pdMapper->SetInputConnection(normalFilter->GetOutputPort());

trunk/packages/vizservers/vtkvis/Glyphs.cpp

@@ -27 +27 @@
 #include <vtkPolyDataMapper.h>
 #include <vtkTransformPolyDataFilter.h>
+#include <vtkPolyDataNormals.h>
 
 #include "Glyphs.h"
@@ -104 +105 @@
     // by the SourceTransform, so the lighting would be wrong
 
+    bool needsNormals = false;
+    double featureAngle = 90.;
+
     switch (_glyphShape) {
     case LINE:
@@ -113 +117 @@
         arrow->SetTipResolution(8);
         arrow->SetShaftResolution(8);
+        needsNormals = true;
     }
         break;
@@ -119 +124 @@
         vtkSmartPointer<vtkConeSource> cone = vtkConeSource::SafeDownCast(_glyphSource);
         cone->SetResolution(8);
+        needsNormals = true;
     }
         break;
@@ -138 +144 @@
         _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
         vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToDodecahedron();
+        needsNormals = true;
+        featureAngle = 30.;
         break;
     case ICOSAHEDRON:
         _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
         vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToIcosahedron();
+        needsNormals = true;
+        featureAngle = 30.;
         break;
     case OCTAHEDRON:
         _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
         vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToOctahedron();
+        needsNormals = true;
+        featureAngle = 30.;
         break;
     case POINT:
@@ -165 +177 @@
         _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
         vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToTetrahedron();
+        needsNormals = true;
+        featureAngle = 30.;
         break;
     default:
@@ -179 +193 @@
     }
 
-    if (_glyphMapper != NULL) {
+    if (needsNormals && _glyphMapper != NULL) {
+        vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
+        normalFilter->SetFeatureAngle(featureAngle);
+        normalFilter->SetInputConnection(_glyphSource->GetOutputPort());
+        _glyphMapper->SetSourceConnection(normalFilter->GetOutputPort());
+    } else if (_glyphMapper != NULL) {
         _glyphMapper->SetSourceConnection(_glyphSource->GetOutputPort());
     }
-
-    //setQuality(0.8);
 }
 
@@ -191 +208 @@
     case ARROW: {
         vtkSmartPointer<vtkArrowSource> arrow = vtkArrowSource::SafeDownCast(_glyphSource);
-        int res = (int)(quality * 25);
-        if (res < 5) res = 5;
+        int res = (int)(quality * 8.);
+        if (res < 3) res = 3;
         arrow->SetTipResolution(res);
         arrow->SetShaftResolution(res);
@@ -199 +216 @@
     case CONE: {
         vtkSmartPointer<vtkConeSource> cone = vtkConeSource::SafeDownCast(_glyphSource);
-        int res = (int)(quality * 25);
-        if (res < 5) res = 5;
+        int res = (int)(quality * 8.);
+        if (res < 3) res = 3;
         cone->SetResolution(res);
+    }
+        break;
+    case CYLINDER: {
+        vtkSmartPointer<vtkCylinderSource> csource = 
+            vtkCylinderSource::SafeDownCast(_glyphSource->GetInputAlgorithm(0, 0));
+        if (csource == NULL) {
+            ERROR("Can't get cylinder glyph source");
+            return;
+        }
+        int res = (int)(quality * 8.);
+        if (res < 3) res = 3;
+        csource->SetResolution(res);
     }
         break;
     case SPHERE: {
         vtkSmartPointer<vtkSphereSource> sphere = vtkSphereSource::SafeDownCast(_glyphSource);
-        int res = (int)(quality * 50);
-        if (res < 5) res = 5;
-        sphere->SetThetaResolution(res);
-        sphere->SetPhiResolution(res);
-    }
-        break;
-    case CYLINDER: {
-        assert(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource) != NULL);
-        assert(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInputConnection(0, 0) != NULL);
-        vtkSmartPointer<vtkCylinderSource> csource = vtkCylinderSource::SafeDownCast(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInputConnection(0, 0));
-        int res = (int)(quality * 25);
-        if (res < 5) res = 5;
-        csource->SetResolution(res);
+        int thetaRes = (int)(quality * 14.);
+        int phiRes = thetaRes;
+        if (thetaRes < 4) thetaRes = 4;
+        if (phiRes < 3) phiRes = 3;
+
+        sphere->SetThetaResolution(thetaRes);
+        sphere->SetPhiResolution(phiRes);
     }
         break;
     default:
         break;
+    }
+    if (_glyphMapper != NULL) {
+        _glyphMapper->Modified();
+        _glyphMapper->Update();
     }
 }

trunk/packages/vizservers/vtkvis/Polygon.cpp

@@ -41 +41 @@
     vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
     normalFilter->SetInputConnection(_polygon->GetOutputPort());
-    normalFilter->AutoOrientNormalsOff();
 
     _pdMapper->SetInputConnection(_polygon->GetOutputPort());

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -679 +679 @@
     void setGlyphsOrientMode(const DataSetId& id, bool state, const char *name);
 
+    void setGlyphsQuality(const DataSetId& id, double quality);
+
     void setGlyphsColorMode(const DataSetId& id,
                             Glyphs::ColorMode mode,

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -5666 +5666 @@
 
 static int
+GlyphsQualityOp(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 (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGlyphsQuality(name, quality);
+    } else {
+        g_renderer->setGlyphsQuality("all", quality);
+    }
+    return TCL_OK;
+}
+
+static int
 GlyphsScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -5825 +5842 @@
     {"pos",          2, GlyphsPositionOp, 5, 6, "x y z ?dataSetName?"},
     {"ptsize",       2, GlyphsPointSizeOp, 3, 4, "size ?dataSetName?"},
+    {"quality",      1, GlyphsQualityOp, 3, 4, "val ?dataSetName?"},
     {"scale",        2, GlyphsScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"shape",        2, GlyphsShapeOp, 3, 4, "shapeVal ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -1618 +1618 @@
 
 /**
+ * \brief Set glyph shape resolution
+ */
+void Renderer::setGlyphsQuality(const DataSetId& id, double quality)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        if (itr == _glyphs.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setQuality(quality);
+    } while (doAll && ++itr != _glyphs.end());
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+}
+
+/**
  * \brief Set the shape of Glyphs for the given DataSet
  */
@@ -2298 +2328 @@
 }
 
-
 /**
  * \brief Set bond cylinder resolution
@@ -2328 +2357 @@
     _needsRedraw = true;
 }
-
 
 /**