Changeset 3631


Ignore:
Timestamp:
Apr 16, 2013, 4:16:52 AM (7 years ago)
Author:
ldelgass
Message:

Refactor names in particle renderer to match other classes

Location:
trunk/packages/vizservers/nanovis
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/FlowParticles.cpp

    r3630 r3631  
    7171          getRelativePosition(&_sv.position));
    7272
    73     _renderer->setPos(getRelativePosition(&_sv.position));
    74     _renderer->setAxis(_sv.position.axis);
     73    _renderer->setSlicePosition(getRelativePosition(&_sv.position));
     74    _renderer->setSliceAxis(_sv.position.axis);
    7575    assert(_renderer->active());
    7676    _renderer->render();
     
    8787                                _sv.color.a));
    8888    _renderer->particleSize(_sv.particleSize);
    89     if (_renderer->getAxis() != _sv.position.axis) {
     89    if (_renderer->getSliceAxis() != _sv.position.axis) {
    9090        needReset = true;
    91         _renderer->setAxis(_sv.position.axis);
     91        _renderer->setSliceAxis(_sv.position.axis);
    9292    }
    9393    float pos = getRelativePosition(&_sv.position);
    94     if (_renderer->getPos() != pos) {
     94    if (_renderer->getSlicePosition() != pos) {
    9595        needReset = true;
    96         _renderer->setPos(pos);
     96        _renderer->setSlicePosition(pos);
    9797    }
    9898    _renderer->active(!_sv.isHidden);
  • trunk/packages/vizservers/nanovis/ParticleRenderer.cpp

    r3630 r3631  
    335335
    336336void
    337 ParticleRenderer::setAxis(FlowSliceAxis axis)
     337ParticleRenderer::setSliceAxis(FlowSliceAxis axis)
    338338{
    339339    if (axis != _sliceAxis) {
     
    344344
    345345void
    346 ParticleRenderer::setPos(float pos)
     346ParticleRenderer::setSlicePosition(float pos)
    347347{
    348348    if (pos != _slicePos) {
  • trunk/packages/vizservers/nanovis/ParticleRenderer.h

    r3630 r3631  
    7070    }
    7171
    72     void setAxis(FlowSliceAxis axis);
     72    void setSliceAxis(FlowSliceAxis axis);
    7373
    74     FlowSliceAxis getAxis() const
     74    FlowSliceAxis getSliceAxis() const
    7575    {
    7676        return _sliceAxis;
    7777    }
    7878
    79     void setPos(float pos);
     79    void setSlicePosition(float pos);
    8080
    81     float getPos() const
     81    float getSlicePosition() const
    8282    {
    8383        return _slicePos;
Note: See TracChangeset for help on using the changeset viewer.