Changeset 2820 for trunk/packages/vizservers

Timestamp:

Mar 7, 2012 11:10:08 AM (12 years ago)

Author:

ldelgass

Message:

Move functions to sample a set of control points to TransferFunction? as static
methods and remove Util.cpp/h. Currently the functions are unused, but could
be useful as a replacement for using Rappture::Field1D.

Location:

trunk/packages/vizservers/nanovis

Files:

• Makefile.in (modified) (2 diffs)
• TransferFunction.cpp (modified) (2 diffs)
• TransferFunction.h (modified) (3 diffs)
• Util.cpp (deleted)
• Util.h (deleted)
• nanovis.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Makefile.in

@@ -161 +161 @@
                 TransferFunction.o \
                 Unirect.o \
-                Util.o \
                 VelocityArrowsSlice.o \
                 Volume.o \
@@ -349 +348 @@
 TransferFunction.o: TransferFunction.cpp
 Unirect.o: Unirect.cpp Unirect.h Trace.h
-Util.o: Util.cpp Util.h
 VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h
 Volume.o: Volume.cpp Volume.h $(AUXSRC)

trunk/packages/vizservers/nanovis/TransferFunction.cpp

@@ -14 +14 @@
  * ======================================================================
  */
-
 
 #include "TransferFunction.h"
@@ -55 +54 @@
 }
 
+void
+TransferFunction::sample(float fraction, float *key, int count, Vector3 *keyValue, Vector3 *ret)
+{
+    int limit = count - 1;
+    if (fraction <= key[0]) {
+        *ret = keyValue[0];
+    } else if (fraction >= key[limit]) {
+        *ret = keyValue[limit];
+    } else {
+        int n;
+        for (n = 0; n < limit; n++){
+            if (fraction >= key[n] && fraction < key[n+1]) break;
+        }
+        if (n >= limit) {
+            *ret = keyValue[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);
+        }
+    }
+}
+
+void
+TransferFunction::sample(float fraction, float *key, int count, float *keyValue, float *ret)
+{
+    int limit = count - 1;
+    if (fraction <= key[0]) {
+        *ret = keyValue[0];
+    } else if (fraction >= key[limit]) {
+        *ret = keyValue[limit];
+    } else {
+        int n;
+        for (n = 0; n < limit; n++){
+            if (fraction >= key[n] && fraction < key[n+1]) break;
+        }
+        if (n >= limit) {
+            *ret = keyValue[limit];
+        } else {
+            float inter = (fraction - key[n]) / (key[n + 1] - key[n]);
+            *ret = inter * (keyValue[n + 1] - keyValue[n]) + keyValue[n];
+        }
+    }
+}

trunk/packages/vizservers/nanovis/TransferFunction.h

@@ -14 +14 @@
  * ======================================================================
  */
+#ifndef TRANSFER_FUNCTION_H
+#define TRANSFER_FUNCTION_H
 
-#ifndef _TRANSFER_FUNCTION_H_
-#define _TRANSFER_FUNCTION_H_
-
+#include <R2/R2Object.h>
 
 #include "Texture1D.h"
-#include <R2/R2Object.h>
+#include "Vector3.h"
 
-
-class TransferFunction : public R2Object {
+class TransferFunction : public R2Object
+{
     int _size;                  //the resolution of the color map, how many
                                 //(RGBA) quadraples
@@ -30 +30 @@
     const char *_name;
     GLuint _id;                 //OpenGL's texture identifier
+
 protected :
     ~TransferFunction();
+
 public:
     TransferFunction(int size, float *data);
@@ -57 +59 @@
         _name = name;
     }
+
+    static void sample(float fraction, float *key, int count, Vector3 *keyValue, Vector3 *ret);
+    static void sample(float fraction, float *key, int count, float *keyValue, float *ret);
 };
 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -41 +41 @@
 #include "PointSetRenderer.h"
 #include "PointSet.h"
-#include "Util.h"
 #include <NvLIC.h>
 #include <Trace.h>