Changeset 4067

Timestamp:

Nov 15, 2013, 7:29:27 PM (11 years ago)

Author:

ldelgass

Message:

Use TransferFunction::sample() instead of Rappture::Field1D

Location:

trunk/packages/vizservers/nanovis

Files:

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

trunk/packages/vizservers/nanovis/Command.cpp

@@ -39 +39 @@
 #include <tcl.h>
 
-#include <RpField1D.h>
 #include <RpEncode.h>
 #include <RpBuffer.h>
@@ -1038 +1037 @@
 
         // decode the data and store in a series of fields
-        Rappture::Field1D rFunc, gFunc, bFunc, wFunc;
-        int cmapc, wmapc, i;
+        int cmapc, amapc, i;
         Tcl_Obj **cmapv;
-        Tcl_Obj **wmapv;
-
-        wmapv = cmapv = NULL;
+        Tcl_Obj **amapv;
+
+        amapv = cmapv = NULL;
         if (Tcl_ListObjGetElements(interp, objv[3], &cmapc, &cmapv) != TCL_OK) {
             return TCL_ERROR;
@@ -1052 +1050 @@
             return TCL_ERROR;
         }
-        if (Tcl_ListObjGetElements(interp, objv[4], &wmapc, &wmapv) != TCL_OK) {
+        if (Tcl_ListObjGetElements(interp, objv[4], &amapc, &amapv) != TCL_OK) {
             return TCL_ERROR;
         }
-        if ((wmapc % 2) != 0) {
+        if ((amapc % 2) != 0) {
             Tcl_AppendResult(interp, "wrong # elements in alphamap: should be ",
                 " { v w ... }", (char*)NULL);
             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;
@@ -1075 +1077 @@
                 }
             }
-            rFunc.define(q[0], q[1]);
-            gFunc.define(q[0], q[2]);
-            bFunc.define(q[0], q[3]);
-        }
-        for (i=0; i < wmapc; i += 2) {
+
+            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];
             int j;
 
             for (j=0; j < 2; j++) {
-                if (Tcl_GetDoubleFromObj(interp, wmapv[i+j], &q[j]) != TCL_OK) {
+                if (Tcl_GetDoubleFromObj(interp, amapv[i+j], &q[j]) != TCL_OK) {
                     return TCL_ERROR;
                 }
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
                     Tcl_AppendResult(interp, "bad alphamap value \"",
-                        Tcl_GetString(wmapv[i+j]),
+                        Tcl_GetString(amapv[i+j]),
                         "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
             }
-            wFunc.define(q[0], q[1]);
+
+            alphaKeys[i/2] = (float)q[0];
+            alphas[i/2] = (float)q[1];
         }
         // sample the given function into discrete slots
@@ -1100 +1107 @@
         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] = wFunc.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);

trunk/packages/vizservers/nanovis/TransferFunction.cpp

@@ -59 +59 @@
 
 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);
         }
     }
@@ -83 +83 @@
 
 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];
         }
     }

trunk/packages/vizservers/nanovis/TransferFunction.h

@@ -64 +64 @@
     }
 
-    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 :