Changeset 2975 for trunk/packages/vizservers

Timestamp:

Apr 19, 2012 11:40:03 AM (12 years ago)

Author:

ldelgass

Message:

Unfriend NanoVis? from VolumeRenderer?, use getVolumeInterpolator() method instead
of accessing private member pointer.

Location:

trunk/packages/vizservers/nanovis

Files:

• VolumeRenderer.h (modified) (1 diff)
• nanovis.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/VolumeRenderer.h

@@ -63 +63 @@
     }
 
-    friend class NanoVis;
-
 private:
     void initShaders();

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -1423 +1423 @@
 void NanoVis::update()
 {
-    if (volRenderer->_volumeInterpolator->isStarted()) {
+    VolumeInterpolator *volInterp = volRenderer->getVolumeInterpolator();
+    if (volInterp->isStarted()) {
         struct timeval clock;
         gettimeofday(&clock, NULL);
@@ -1429 +1430 @@
 
         elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 -
-            volRenderer->_volumeInterpolator->getStartTime();
+            volInterp->getStartTime();
 
         TRACE("%lf %lf\n", elapsed_time, 
-               volRenderer->_volumeInterpolator->getInterval());
+              volInterp->getInterval());
         float fraction;
         float f;
 
-        f = fmod((float) elapsed_time, (float)volRenderer->_volumeInterpolator->getInterval());
+        f = fmod((float) elapsed_time, (float)volInterp->getInterval());
         if (f == 0.0) {
             fraction = 0.0f;
         } else {
-            fraction = f / volRenderer->_volumeInterpolator->getInterval();
+            fraction = f / volInterp->getInterval();
         }
         TRACE("fraction : %f\n", fraction);
-        volRenderer->_volumeInterpolator->update(fraction);
+        volInterp->update(fraction);
     }
 }