Changeset 4819 for nanovis/branches/1.1

Timestamp:

Dec 6, 2014 7:16:39 PM (9 years ago)

Author:

ldelgass

Message:

merge r4067 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (6 diffs)
• TransferFunction.cpp (modified) (2 diffs)
• TransferFunction.h (modified) (1 diff)

nanovis/branches/1.1/Command.cpp

@@ -38 +38 @@
 #include <tcl.h>
 
-#include <RpField1D.h>
 #include <RpEncode.h>
 #include <RpOutcome.h>
@@ -981 +980 @@
 
         // decode the data and store in a series of fields
-        Rappture::Field1D rFunc, gFunc, bFunc, aFunc;
         int cmapc, amapc, i;
         Tcl_Obj **cmapv;
@@ -1003 +1001 @@
             return TCL_ERROR;
         }
+
+        int numColors = cmapc/4;
+        float *colorKeys = new float[numColors];
+        Vector3f *colors = new Vector3f[numColors];
         for (i = 0; i < cmapc; i += 4) {
             int j;
@@ -1018 +1020 @@
                 }
             }
-            rFunc.define(q[0], q[1]);
-            gFunc.define(q[0], q[2]);
-            bFunc.define(q[0], q[3]);
-        }
+
+            colorKeys[i/4] = (float)q[0];
+            colors[i/4].set((float)q[1], (float)q[2], (float)q[3]);
+        }
+        int numAlphas = amapc/2;
+        float *alphaKeys = new float[numAlphas];
+        float *alphas = new float[numAlphas];
         for (i=0; i < amapc; i += 2) {
             double q[2];
@@ -1037 +1042 @@
                 }
             }
-            aFunc.define(q[0], q[1]);
+            alphaKeys[i/2] = (float)q[0];
+            alphas[i/2] = (float)q[1];
         }
         // sample the given function into discrete slots
@@ -1043 +1049 @@
         float data[4*nslots];
         for (i=0; i < nslots; i++) {
-            double x = double(i)/(nslots-1);
-            data[4*i]   = rFunc.value(x);
-            data[4*i+1] = gFunc.value(x);
-            data[4*i+2] = bFunc.value(x);
-            data[4*i+3] = aFunc.value(x);
-        }
+            float x = float(i)/(nslots-1);
+            Vector3f color;
+            float alpha;
+            TransferFunction::sample(x, colorKeys, colors, numColors, &color);
+            TransferFunction::sample(x, alphaKeys, alphas, numAlphas, &alpha);
+
+            data[4*i]   = color.r;
+            data[4*i+1] = color.g;
+            data[4*i+2] = color.b;
+            data[4*i+3] = alpha;
+        }
+        delete [] colorKeys;
+        delete [] colors;
+        delete [] alphaKeys;
+        delete [] alphas;
         // find or create this transfer function
         NanoVis::defineTransferFunction(Tcl_GetString(objv[2]), nslots, data);

nanovis/branches/1.1/TransferFunction.cpp

@@ -58 +58 @@
 
 void
-TransferFunction::sample(float fraction, float *key, int count, Vector3f *keyValue, Vector3f *ret)
+TransferFunction::sample(float fraction, float *keys, Vector3f *keyValues, int count, Vector3f *ret)
 {
     int limit = count - 1;
-    if (fraction <= key[0]) {
-        *ret = keyValue[0];
-    } else if (fraction >= key[limit]) {
-        *ret = keyValue[limit];
+    if (fraction <= keys[0]) {
+        *ret = keyValues[0];
+    } else if (fraction >= keys[limit]) {
+        *ret = keyValues[limit];
     } else {
         int n;
-        for (n = 0; n < limit; n++){
-            if (fraction >= key[n] && fraction < key[n+1]) break;
+        for (n = 0; n < limit; n++) {
+            if (fraction >= keys[n] && fraction < keys[n+1]) break;
         }
         if (n >= limit) {
-            *ret = keyValue[limit];
+            *ret = keyValues[limit];
         } else {
-            float inter = (fraction - key[n]) / (key[n + 1] - key[n]);
-            ret->set(inter * (keyValue[n + 1].x - keyValue[n].x) + keyValue[n].x,
-                     inter * (keyValue[n + 1].y - keyValue[n].y) + keyValue[n].y,
-                     inter * (keyValue[n + 1].z - keyValue[n].z) + keyValue[n].z);
+            float inter = (fraction - keys[n]) / (keys[n + 1] - keys[n]);
+            ret->set(inter * (keyValues[n + 1].x - keyValues[n].x) + keyValues[n].x,
+                     inter * (keyValues[n + 1].y - keyValues[n].y) + keyValues[n].y,
+                     inter * (keyValues[n + 1].z - keyValues[n].z) + keyValues[n].z);
         }
     }
@@ -82 +82 @@
 
 void
-TransferFunction::sample(float fraction, float *key, int count, float *keyValue, float *ret)
+TransferFunction::sample(float fraction, float *keys, float *keyValues, int count, float *ret)
 {
     int limit = count - 1;
-    if (fraction <= key[0]) {
-        *ret = keyValue[0];
-    } else if (fraction >= key[limit]) {
-        *ret = keyValue[limit];
+    if (fraction <= keys[0]) {
+        *ret = keyValues[0];
+    } else if (fraction >= keys[limit]) {
+        *ret = keyValues[limit];
     } else {
         int n;
-        for (n = 0; n < limit; n++){
-            if (fraction >= key[n] && fraction < key[n+1]) break;
+        for (n = 0; n < limit; n++) {
+            if (fraction >= keys[n] && fraction < keys[n+1]) break;
         }
         if (n >= limit) {
-            *ret = keyValue[limit];
+            *ret = keyValues[limit];
         } else {
-            float inter = (fraction - key[n]) / (key[n + 1] - key[n]);
-            *ret = inter * (keyValue[n + 1] - keyValue[n]) + keyValue[n];
+            float inter = (fraction - keys[n]) / (keys[n + 1] - keys[n]);
+            *ret = inter * (keyValues[n + 1] - keyValues[n]) + keyValues[n];
         }
     }

nanovis/branches/1.1/TransferFunction.h

@@ -62 +62 @@
     }
 
-    static void sample(float fraction, float *key, int count, vrmath::Vector3f *keyValue, vrmath::Vector3f *ret);
+    static void sample(float fraction, float *keys, vrmath::Vector3f *keyValues, int count, vrmath::Vector3f *ret);
 
-    static void sample(float fraction, float *key, int count, float *keyValue, float *ret);
+    static void sample(float fraction, float *keys, float *keyValues, int count, float *ret);
 
 protected :