Changeset 380 for trunk/gui/vizservers/nanovis

Timestamp:

Mar 27, 2006, 9:54:02 PM (18 years ago)

Author:

qiaow

Message:

Transfer function widget is working!!

Location:

trunk/gui/vizservers/nanovis

Files:

• TransferFunction.cpp (modified) (2 diffs)
• TransferFunction.h (modified) (1 diff)
• config.h (modified) (1 diff)
• nanovis.cpp (modified) (11 diffs)
• shaders/one_volume.cg (modified) (2 diffs)
• transfer-function/ColorPaletteWindow.cpp (modified) (1 diff)

trunk/gui/vizservers/nanovis/TransferFunction.cpp

@@ -21 +21 @@
 TransferFunction::TransferFunction(int _size, float* data){
 
-  tex = new Texture1D(size, GL_UNSIGNED_BYTE);
-  id = tex->id;
+  tex = new Texture1D(_size, GL_FLOAT);
 
   tex->initialize_float_rgba(data);
+  id = tex->id;
 }
 
@@ -30 +30 @@
 TransferFunction::~TransferFunction(){ delete tex; }
 
+void TransferFunction::update(float* data){
+  tex->update_float_rgba(data);
+}
 
 

trunk/gui/vizservers/nanovis/TransferFunction.h

@@ -26 +26 @@
   Texture1D* tex; //the texture storing the colors 
 
+public:
   GLuint id;    //OpenGL's texture identifier
-
-
-public:
   TransferFunction(int _size, float* data);
   ~TransferFunction();
+  void update(float* data);
 };
 

trunk/gui/vizservers/nanovis/config.h

@@ -15 +15 @@
 
 
-//#define NV40  //Uncomment if using 6 series card. By default we assume older card the 5xxx series
+#define NV40    //Uncomment if using 6 series card. By default we assume older card the 5xxx series

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -24 +24 @@
 #include "RpFieldPrism3D.h"
 
+//transfer function headers
 #include "transfer-function/TransferFunctionMain.h"
 #include "transfer-function/ControlPoint.h"
@@ -31 +32 @@
 #include "transfer-function/MainWindow.h"
 
-float color_table[256][4];
-
+float color_table[256][4];      
+
+int render_window;              //the handle of the render window;
 // forward declarations
 void init_particles();
@@ -75 +77 @@
 CGprogram m_one_volume_fprog;
 CGparameter m_vol_one_volume_param;
+CGparameter m_tf_one_volume_param;
 CGparameter m_mvi_one_volume_param;
 CGparameter m_render_param_one_volume_param;
@@ -528 +531 @@
 
 
+//load value from the gui, only one transfer function
+extern void update_tf_texture(){
+  glutSetWindow(render_window);
+
+  fprintf(stderr, "tf update\n");
+  if(tf[0]==0) return;
+
+  float data[256*4];
+  for(int i=0; i<256; i++){
+    data[4*i+0] = color_table[i][0];
+    data[4*i+1] = color_table[i][1];
+    data[4*i+2] = color_table[i][2];
+    data[4*i+3] = color_table[i][3];
+    fprintf(stderr, "(%f,%f,%f,%f) ", data[4*i+0], data[4*i+1], data[4*i+2], data[4*i+3]);
+  }
+
+  tf[0]->update(data);
+}
+
+
+
 //initialize frame buffer objects for offscreen rendering
 void init_fbo(){
@@ -689 +713 @@
       m_vol_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "volume");
       cgGLSetTextureParameter(m_vol_one_volume_param, volume[0]->id);
+      m_tf_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "tf");
+      cgGLSetTextureParameter(m_tf_one_volume_param, tf[0]->id);
       m_mvi_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelViewInv");
       m_render_param_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "renderParameters");
@@ -738 +764 @@
 
 
-
+void init_tf(){
+  float data[256*4];
+  memset(data, 0, 4*256*sizeof(float));
+
+  tf[0] = new TransferFunction(256, data);
+}
 
 
@@ -792 +823 @@
    load_vector_file(0, "./data/J-wire-vec.dx");
    load_volume_file(1, "./data/mu-wire-3d.dx");
+
+   init_tf();   //initialize transfer function
 
    init_fbo();  //frame buffer objects
@@ -952 +985 @@
 /*----------------------------------------------------*/
 void idle(){
+  glutSetWindow(render_window);
+
   struct timespec ts;
   ts.tv_sec = 0;
@@ -1352 +1387 @@
   cgGLSetTextureParameter(m_vol_one_volume_param, volume[volume_index]->id);
   cgGLEnableTextureParameter(m_vol_one_volume_param);
+  cgGLEnableTextureParameter(m_tf_one_volume_param);
 
   //hack!
@@ -1369 +1405 @@
   cgGLDisableProfile(CG_PROFILE_FP30);
 
-  cgGLEnableTextureParameter(m_vol_one_volume_param);
-  //cgGLDisableTextureParameter(m_vel_tex_param);
-  //cgGLDisableTextureParameter(m_pos_tex_param);
+  cgGLDisableTextureParameter(m_vol_one_volume_param);
+  cgGLDisableTextureParameter(m_tf_one_volume_param);
 }
 
@@ -1928 +1963 @@
    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB); 
 
-   MainTransferFunctionWindow * mainWin;
-   mainWin = new MainTransferFunctionWindow();
-   mainWin->mainInit();
+   MainTransferFunctionWindow * tf_window;
+   tf_window = new MainTransferFunctionWindow();
+   tf_window->mainInit();
    
    glutInitWindowSize(NPIX, NPIX);
    glutInitWindowPosition(10, 10);
-   glutCreateWindow(argv[0]);
+   render_window = glutCreateWindow(argv[0]);
 
    glutDisplayFunc(display);

trunk/gui/vizservers/nanovis/shaders/one_volume.cg

@@ -17 +17 @@
 PixelOut main(v2f IN, /* uniform sampler1D tf,*/
                 uniform sampler3D volume,
-                //uniform sampler1D map,
+                uniform sampler1D tf,
                 uniform float4x4 modelViewInv,
                 uniform float4 renderParameters)
@@ -34 +34 @@
     else{
       //shades of red //more opaque
-      OUT.Color = float4(sample, 0, 0, 7*sample/renderParameters.x);
+      OUT.Color = tex1D(tf, sample);
+      OUT.Color.w = 10*OUT.Color.w/renderParameters.x;
 
-      if(sample<0.6 && sample>0.4){
-        OUT.Color = float4(0, 0, 1, 10*sample/renderParameters.x);
-      }
+      //OUT.Color = float4(sample, 0, 0, 7*sample/renderParameters.x);
+
+      //if(sample<0.6 && sample>0.4){
+        //OUT.Color = float4(0, 0, 1, 10*sample/renderParameters.x);
+      //}
     }
   }

trunk/gui/vizservers/nanovis/transfer-function/ColorPaletteWindow.cpp

@@ -106 +106 @@
 
 
-void update_tf_texture(){};
+void update_tf_texture();
 
 void ColorPalette::cmdHandler(int arg){