Ignore:
Timestamp:
Aug 2, 2014, 2:06:20 PM (5 years ago)
Author:
ldelgass
Message:

merge r3597 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/FlowParticles.cpp

    r3567 r4612  
    1616#include "nanovis.h"        // For NMESH
    1717#include "FlowParticles.h"
    18 #include "FlowCmd.h"
     18#include "Flow.h"
    1919#include "Trace.h"
    2020
     
    4848    TRACE("Particles '%s' axis: %d pos: %g rel pos: %g",
    4949          _name.c_str(), _sv.position.axis, _sv.position.value,
    50           FlowCmd::getRelativePosition(&_sv.position));
     50          Flow::getRelativePosition(&_sv.position));
    5151
    52     _renderer->setPos(FlowCmd::getRelativePosition(&_sv.position));
     52    _renderer->setPos(Flow::getRelativePosition(&_sv.position));
    5353    _renderer->setAxis(_sv.position.axis);
    5454    assert(_renderer->active());
     
    5959FlowParticles::configure()
    6060{
    61     _renderer->setPos(FlowCmd::getRelativePosition(&_sv.position));
     61    _renderer->setPos(Flow::getRelativePosition(&_sv.position));
    6262    _renderer->setColor(Vector4f(_sv.color.r,
    6363                                 _sv.color.g,
Note: See TracChangeset for help on using the changeset viewer.