Changeset 5485 for nanovis/branches/1.2/nanovis.cpp

Timestamp:

May 9, 2015 2:03:06 PM (9 years ago)

Author:

ldelgass

Message:

backport: remove getFlowBounds

File:

• nanovis/branches/1.2/nanovis.cpp (modified) (2 diffs)

nanovis/branches/1.2/nanovis.cpp

@@ -873 +873 @@
     }
 
-    BBox bbox;
-    getFlowBounds(bbox.min, bbox.max, onlyVisible);
-    sceneBounds.extend(bbox);
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        Flow *flow = itr->second;
+
+        BBox bbox;
+        flow->getBounds(bbox.min, bbox.max, onlyVisible);
+        sceneBounds.extend(bbox);
+    }
 
 #if 0
@@ -1043 +1048 @@
     Flow::updatePending = false;
     return true;
-}
-
-void
-NanoVis::getFlowBounds(Vector3f& min,
-                       Vector3f& max,
-                       bool onlyVisible)
-{
-    TRACE("Enter");
-
-    min.set(FLT_MAX, FLT_MAX, FLT_MAX);
-    max.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
-
-    for (FlowHashmap::iterator itr = flowTable.begin();
-         itr != flowTable.end(); ++itr) {
-        itr->second->getBounds(min, max, onlyVisible);
-    }
 }