Changeset 4904 for nanovis/branches/1.1/Flow.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/Flow.cpp (modified) (8 diffs)

nanovis/branches/1.1/Flow.cpp

@@ -9 +9 @@
  *   Leif Delgass <ldelgass@purdue.edu>
  */
+
+#include <float.h>
 
 #include <tcl.h>
@@ -31 +33 @@
 using namespace vrmath;
 
+bool Flow::updatePending = false;
+
 Flow::Flow(Tcl_Interp *interp, const char *name) :
     _interp(interp),
@@ -81 +85 @@
         return;
 
-#if 0  // Using volume bounds instead of these
-    if (isDataLoaded()) {
-        Vector3f umin, umax;
-        Rappture::Unirect3d *unirect = data();
-        unirect->getWorldSpaceBounds(umin, umax);
-        if (min.x > umin.x) {
-            min.x = umin.x;
-        }
-        if (max.x < umax.x) {
-            max.x = umax.x;
-        }
-        if (min.y > umin.y) {
-            min.y = umin.y;
-        }
-        if (max.y < umax.y) {
-            max.y = umax.y;
-        }
-        if (min.z > umin.z) {
-            min.z = umin.z;
-        }
-        if (max.z < umax.z) {
-            max.z = umax.z;
-        }
-    }
-#endif
     for (BoxHashmap::iterator itr = _boxTable.begin();
          itr != _boxTable.end(); ++itr) {
@@ -155 +134 @@
 }
 
-float
-Flow::getRelativePosition() 
-{
-    return getRelativePosition(&_sv.slicePos);
-}
-
 void
 Flow::resetParticles()
@@ -314 +287 @@
 
     Vector3f scale = volume->getPhysicalScaling();
-    Vector3f location = _volume->location();
+    Vector3f pos = _volume->getPosition();
 
     if (NanoVis::licRenderer != NULL) {
         NanoVis::licRenderer->
             setVectorField(_volume->textureID(),
-                           location,
+                           pos,
                            scale.x,
                            scale.y,
                            scale.z,
                            _volume->wAxis.max());
-        setCurrentPosition();
-        setAxis();
-        setActive();
+        NanoVis::licRenderer->setSliceAxis(_sv.slicePos.axis);
+        NanoVis::licRenderer->setSlicePosition(_sv.slicePos.value);
+        NanoVis::licRenderer->visible(_sv.sliceVisible);
     }
 
@@ -332 +305 @@
         NanoVis::velocityArrowsSlice->
             setVectorField(_volume->textureID(),
-                           location,
+                           pos,
                            scale.x,
                            scale.y,
                            scale.z,
                            _volume->wAxis.max());
-        NanoVis::velocityArrowsSlice->axis(_sv.slicePos.axis);
-        NanoVis::velocityArrowsSlice->slicePos(_sv.slicePos.value);
-        NanoVis::velocityArrowsSlice->enabled(_sv.showArrows);
+        NanoVis::velocityArrowsSlice->setSliceAxis(_sv.slicePos.axis);
+        NanoVis::velocityArrowsSlice->setSlicePosition(_sv.slicePos.value);
+        NanoVis::velocityArrowsSlice->visible(_sv.showArrows);
     }
 
@@ -345 +318 @@
          itr != _particlesTable.end(); ++itr) {
         itr->second->setVectorField(_volume,
-                                    location,
+                                    pos,
                                     scale.x,
                                     scale.y,
@@ -433 +406 @@
 
     Vector3f volScaling = volume->getPhysicalScaling();
-    Vector3f loc(volScaling);
-    loc *= -0.5;
-    volume->location(loc);
+    Vector3f pos(volScaling);
+    pos *= -0.5;
+    volume->setPosition(pos);
 
     Volume::updatePending = true;