Changeset 830 for trunk/vizservers

Timestamp:

Dec 19, 2007 9:19:52 AM (16 years ago)

Author:

vrinside

Message:

Make it keep original color data in order to apply it to point primitives of point primitive based rendering.

Location:

trunk/vizservers/nanovis

Files:

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

trunk/vizservers/nanovis/TransferFunction.cpp

@@ -17 +17 @@
 
 #include "TransferFunction.h"
+#include <memory.h>
 
 
-TransferFunction::TransferFunction(int _size, float* data){
+TransferFunction::TransferFunction(int _size, float* data)
+{
+    tex = new Texture1D(_size, GL_FLOAT);
 
-  tex = new Texture1D(_size, GL_FLOAT);
+    // _size : # of slot, 4 : rgba
+    size = _size * 4;
+    this->data = new float[size];
+    memcpy(this->data, data, sizeof(float) * size);
 
-  tex->initialize_float_rgba(data);
-  id = tex->id;
+    tex->initialize_float_rgba(data);
+    id = tex->id;
 }
 
 
-TransferFunction::~TransferFunction(){ delete tex; }
+TransferFunction::~TransferFunction()
+{ 
+    delete [] data;
+    delete tex; 
+}
 
-void TransferFunction::update(float* data){
-  tex->update_float_rgba(data);
+void TransferFunction::update(float* data)
+{
+    memcpy(this->data, data, sizeof(float) * size);
+
+    tex->update_float_rgba(data);
 }
 

trunk/vizservers/nanovis/TransferFunction.h

@@ -24 +24 @@
 class TransferFunction{
   int size;     //the resolution of the color map, how many (RGBA) quadraples
+  float* data;
   Texture1D* tex; //the texture storing the colors 
 
@@ -32 +33 @@
   void update(float* data);
     Texture1D* getTexture();
+  float* getData() { return data; }
 };