Changeset 4904 for nanovis/branches/1.1/FlowBox.cpp

Timestamp:

Dec 22, 2014 4:18:59 AM (9 years ago)

Author:

ldelgass

Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:

• nanovis/branches/1.1/FlowBox.cpp (modified) (2 diffs)

nanovis/branches/1.1/FlowBox.cpp

@@ -52 +52 @@
     bboxMax.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
 
-    Vector3f origin = vol->location();
+    Vector3f origin = vol->getPosition();
     Vector3f scale = vol->getPhysicalScaling();
 
@@ -131 +131 @@
     glPushMatrix();
 
-    Vector3f origin = vol->location();
+    Vector3f origin = vol->getPosition();
     glTranslatef(origin.x, origin.y, origin.z);