Changeset 3631

Timestamp:

Apr 16, 2013 1:16:52 AM (11 years ago)

Author:

ldelgass

Message:

Refactor names in particle renderer to match other classes

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowParticles.cpp (modified) (2 diffs)
• ParticleRenderer.cpp (modified) (2 diffs)
• ParticleRenderer.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowParticles.cpp

@@ -71 +71 @@
           getRelativePosition(&_sv.position));
 
-    _renderer->setPos(getRelativePosition(&_sv.position));
-    _renderer->setAxis(_sv.position.axis);
+    _renderer->setSlicePosition(getRelativePosition(&_sv.position));
+    _renderer->setSliceAxis(_sv.position.axis);
     assert(_renderer->active());
     _renderer->render();
@@ -87 +87 @@
                                 _sv.color.a));
     _renderer->particleSize(_sv.particleSize);
-    if (_renderer->getAxis() != _sv.position.axis) {
+    if (_renderer->getSliceAxis() != _sv.position.axis) {
         needReset = true;
-        _renderer->setAxis(_sv.position.axis);
+        _renderer->setSliceAxis(_sv.position.axis);
     }
     float pos = getRelativePosition(&_sv.position);
-    if (_renderer->getPos() != pos) {
+    if (_renderer->getSlicePosition() != pos) {
         needReset = true;
-        _renderer->setPos(pos);
+        _renderer->setSlicePosition(pos);
     }
     _renderer->active(!_sv.isHidden);

trunk/packages/vizservers/nanovis/ParticleRenderer.cpp

@@ -335 +335 @@
 
 void
-ParticleRenderer::setAxis(FlowSliceAxis axis)
+ParticleRenderer::setSliceAxis(FlowSliceAxis axis)
 {
     if (axis != _sliceAxis) {
@@ -344 +344 @@
 
 void
-ParticleRenderer::setPos(float pos)
+ParticleRenderer::setSlicePosition(float pos)
 {
     if (pos != _slicePos) {

trunk/packages/vizservers/nanovis/ParticleRenderer.h

@@ -70 +70 @@
     }
 
-    void setAxis(FlowSliceAxis axis);
+    void setSliceAxis(FlowSliceAxis axis);
 
-    FlowSliceAxis getAxis() const
+    FlowSliceAxis getSliceAxis() const
     {
         return _sliceAxis;
     }
 
-    void setPos(float pos);
+    void setSlicePosition(float pos);
 
-    float getPos() const
+    float getSlicePosition() const
     {
         return _slicePos;