Changeset 4612 for nanovis/branches/1.1/FlowParticles.cpp

Timestamp:

Aug 2, 2014, 11:06:20 AM (10 years ago)

Author:

ldelgass

Message:

merge r3597 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• FlowParticles.cpp (modified) (3 diffs)

nanovis/branches/1.1/FlowParticles.cpp

@@ -16 +16 @@
 #include "nanovis.h"        // For NMESH
 #include "FlowParticles.h"
-#include "FlowCmd.h"
+#include "Flow.h"
 #include "Trace.h"
 
@@ -48 +48 @@
     TRACE("Particles '%s' axis: %d pos: %g rel pos: %g",
           _name.c_str(), _sv.position.axis, _sv.position.value,
-          FlowCmd::getRelativePosition(&_sv.position));
+          Flow::getRelativePosition(&_sv.position));
 
-    _renderer->setPos(FlowCmd::getRelativePosition(&_sv.position));
+    _renderer->setPos(Flow::getRelativePosition(&_sv.position));
     _renderer->setAxis(_sv.position.axis);
     assert(_renderer->active());
@@ -59 +59 @@
 FlowParticles::configure() 
 {
-    _renderer->setPos(FlowCmd::getRelativePosition(&_sv.position));
+    _renderer->setPos(Flow::getRelativePosition(&_sv.position));
     _renderer->setColor(Vector4f(_sv.color.r,
                                  _sv.color.g,