Changeset 3958 for branches/blt4/packages/vizservers/nanovis/nanovis.cpp

Timestamp:

Sep 24, 2013, 4:41:59 PM (11 years ago)

Author:

gah

Message:

sync with trunk

File:

• branches/blt4/packages/vizservers/nanovis/nanovis.cpp (modified) (12 diffs)

branches/blt4/packages/vizservers/nanovis/nanovis.cpp

@@ -504 +504 @@
     }
 #endif
-    // FIXME: should use ARB programs or (preferably) a GLSL profile for portability
+    // FIXME: should use GLSL for portability
+#ifdef USE_ARB_PROGRAMS
+    if (!GLEW_ARB_vertex_program ||
+        !GLEW_ARB_fragment_program) {
+        ERROR("ARB_vertex_program and ARB_fragment_program extensions are required");
+        return false;
+    }
+#else
     if (!GLEW_NV_vertex_program3 ||
         !GLEW_NV_fragment_program2) {
@@ -510 +517 @@
         return false;
     }
+#endif
 
     if (!FilePath::getInstance()->setPath(path)) {
@@ -611 +619 @@
 }
 
+/**
+ * \brief Called when new volumes are added to update ranges
+ */
 void
 NanoVis::setVolumeRanges()
@@ -636 +647 @@
 }
 
+/**
+ * \brief Called when new heightmaps are added to update ranges
+ */
 void
 NanoVis::setHeightmapRanges()
@@ -668 +682 @@
 NanoVis::collectBounds(bool onlyVisible)
 {
-    if (Flow::updatePending) {
-        mapFlows();
-    }
-
     sceneBounds.makeEmpty();
 
@@ -698 +708 @@
     }
 
-    {
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        Flow *flow = itr->second;
+
         BBox bbox;
-        getFlowBounds(bbox.min, bbox.max, onlyVisible);
+        flow->getBounds(bbox.min, bbox.max, onlyVisible);
         sceneBounds.extend(bbox);
     }
@@ -714 +727 @@
     }
 
+#if 0
     if (!onlyVisible || grid->isVisible()) {
         BBox bbox;
@@ -719 +733 @@
         sceneBounds.extend(bbox);
     }
+#endif
 
     if (sceneBounds.isEmpty()) {
@@ -802 +817 @@
 }
 
+/**
+ * \brief Called when new flows are added to update ranges
+ */
 bool
-NanoVis::mapFlows()
+NanoVis::setFlowRanges()
 {
     TRACE("Enter");
@@ -817 +835 @@
          itr != flowTable.end(); ++itr) {
         Flow *flow = itr->second;
-        double min, max;
         if (!flow->isDataLoaded()) {
             continue;
         }
-        Rappture::Unirect3d *data = flow->data();
-        min = data->magMin();
-        max = data->magMax();
-        if (min < Flow::magMin) {
-            Flow::magMin = min;
+        double range[2];
+        flow->getVectorRange(range);
+        if (range[0] < Flow::magMin) {
+            Flow::magMin = range[0];
         } 
-        if (max > Flow::magMax) {
-            Flow::magMax = max;
+        if (range[1] > Flow::magMax) {
+            Flow::magMax = range[1];
         }
     }
@@ -846 +862 @@
             flow->initializeParticles();
         }
-        if (!flow->scaleVectorField()) {
-            return false;
-        }
     }
 
     Flow::updatePending = false;
     return true;
-}
-
-void
-NanoVis::getFlowBounds(Vector3f& min,
-                       Vector3f& max,
-                       bool onlyVisible)
-{
-    TRACE("Enter");
-
-    BBox allBounds;
-    for (FlowHashmap::iterator itr = flowTable.begin();
-         itr != flowTable.end(); ++itr) {
-        BBox bbox;
-        itr->second->getBounds(bbox.min, bbox.max, onlyVisible);
-        allBounds.extend(bbox);
-    }
-
-    min = allBounds.min;
-    max = allBounds.max;
 }
 
@@ -918 +912 @@
 
     if (Flow::updatePending) {
-        mapFlows();
+        setFlowRanges();
     }
     if (HeightMap::updatePending) {