Changeset 4819 for nanovis/branches/1.1/Command.cpp

Timestamp:

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

Author:

ldelgass

Message:

merge r4067 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (6 diffs)

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);