Changeset 5723 for nanovis/branches/1.2

Timestamp:

Jun 18, 2015, 2:32:37 PM (9 years ago)

Author:

ldelgass

Message:

Sync with nanovis trunk: merge r5722 and remove global bounds vars.

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Flow.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (5 diffs)
• nanovis.h (modified) (1 diff)

nanovis/branches/1.2/Flow.cpp

@@ -406 +406 @@
     volume->setPosition(pos);
 
-    Volume::updatePending = true;
     return volume;
 }
@@ -427 +426 @@
     _volume->specularLevel(_sv.specular);
     _volume->specularExponent(_sv.specularExp);
-    _volume->visible(_sv.showVolume);
-
-    Volume::updatePending = true;
-}
+}

nanovis/branches/1.2/nanovis.cpp

@@ -84 +84 @@
 NanoVis::HeightMapHashmap NanoVis::heightMapTable;
 
-float NanoVis::xMin = FLT_MAX;
-float NanoVis::xMax = -FLT_MAX;
-float NanoVis::yMin = FLT_MAX;
-float NanoVis::yMax = -FLT_MAX;
-float NanoVis::zMin = FLT_MAX;
-float NanoVis::zMax = -FLT_MAX;
 BBox NanoVis::sceneBounds;
 
@@ -811 +805 @@
     }
     delete volume;
+    Volume::updatePending = true;
 }
 
@@ -849 +844 @@
         delete itr->second;
         flowTable.erase(itr);
+        Flow::updatePending = true;
     }
 }
@@ -876 +872 @@
     TRACE("Enter");
 
-    /* 
-     * Step 1. Get the overall min and max magnitudes of all the 
-     *         flow vectors.
-     */
+    double xMin, xMax, yMin, yMax, zMin, zMax;
+    xMin = yMin = zMin = DBL_MAX;
+    xMax = yMax = zMax = -DBL_MAX;
     Flow::magMin = DBL_MAX;
     Flow::magMax = -DBL_MAX;
-
     for (FlowHashmap::iterator itr = flowTable.begin();
          itr != flowTable.end(); ++itr) {
@@ -929 +923 @@
     TRACE("magMin=%g magMax=%g", Flow::magMin, Flow::magMax);
 
-    /* 
-     * Step 2. Generate the vector field from each data set. 
-     */
     for (FlowHashmap::iterator itr = flowTable.begin();
          itr != flowTable.end(); ++itr) {

nanovis/branches/1.2/nanovis.h

@@ -146 +146 @@
     static HeightMapHashmap heightMapTable;
 
-    static float xMin, xMax, yMin, yMax, zMin, zMax;
     static vrmath::BBox sceneBounds;