Changeset 4908 for nanovis/branches/1.1/VolumeInterpolator.cpp

Timestamp:

Dec 23, 2014 5:27:03 PM (9 years ago)

Author:

ldelgass

Message:

Merge r4907 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• VolumeInterpolator.cpp (modified) (9 diffs)

nanovis/branches/1.1/VolumeInterpolator.cpp

@@ -5 +5 @@
  */
 #include <string.h>
-#include <memory.h>
 #include <sys/time.h>
-#include <math.h>
-#include <stdlib.h>
 
 #include <vrmath/Vector3f.h>
@@ -20 +17 @@
 
 VolumeInterpolator::VolumeInterpolator() : 
-    _volume(0), 
+    _volume(NULL), 
     _interval(8.0), 
     _started(false), 
@@ -54 +51 @@
     float interp;
 
-    computeKeys(fraction, _volumes.size(), &interp, &key1, &key2);
+    computeKeys(fraction, (int)_volumes.size(), &interp, &key1, &key2);
 
     if (interp == 0.0f) {
@@ -69 +66 @@
             normal1 = (*(Vector3f*)(data1 + 1) - 0.5) * 2;
             normal2 = (*(Vector3f*)(data2 + 1) - 0.5) * 2;
-            normal = (normal2 - normal2) * interp + normal1;
+            normal = (normal2 - normal1) * interp + normal1;
             normal = normal.normalize();
             normal = normal * 0.5 + 0.5;
@@ -89 +86 @@
                                 int *key1, int *key2)
 {
-    int limit = (int) count - 1;
+    int limit = count - 1;
     if (fraction <= 0) {
         *key1 = *key2 = 0;
@@ -98 +95 @@
     } else {
         int n;
-        for (n = 0; n < limit; n++){
-            if (fraction >= (n / (count - 1.0f)) && 
+        for (n = 0; n < limit; n++) {
+            if (fraction >= (n / (count - 1.0f)) &&
                 fraction < ((n+1)/(count-1.0f))) {
                 break;
@@ -150 +147 @@
                              volume->nonZeroMin());
 
-        _volume->numSlices(256-1);
         _volume->setPosition(volume->getPosition());
         _volume->setScale(volume->getScale());
@@ -165 +161 @@
         _volume->isosurface(0);
     }
-    _volumes.push_back(_volume);
+    _volumes.push_back(volume);
     TRACE("Volume \"%s\" is added to VolumeInterpolator", volume->name());
 }
@@ -172 +168 @@
 {
     return _volume;
-    //return _volumes[0];
 }