Changeset 431

Timestamp:

May 4, 2006, 8:36:28 PM (18 years ago)

Author:

qiaow

Message:

Added 2D renderer.

Location:

trunk/gui/vizservers/nanovis

Files:

• Camera.cpp (modified) (1 diff)
• Makefile (modified) (4 diffs)
• PlaneRenderer.cpp (added)
• PlaneRenderer.h (added)
• Texture2D.cpp (modified) (2 diffs)
• Texture2D.h (modified) (1 diff)
• Volume.cpp (modified) (1 diff)
• Volume.h (modified) (1 diff)
• VolumeRenderer.cpp (modified) (2 diffs)
• config.h (modified) (1 diff)
• nanovis.cpp (modified) (16 diffs)
• nanovis.h (modified) (1 diff)
• shaders/one_plane.cg (added)

trunk/gui/vizservers/nanovis/Camera.cpp

@@ -49 +49 @@
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-  gluPerspective(60, (GLdouble)width/(GLdouble)height, 0.1, 50.0);
+  gluPerspective(30, (GLdouble)width/(GLdouble)height, 0.1, 50.0);
 
   glMatrixMode(GL_MODELVIEW);

trunk/gui/vizservers/nanovis/Makefile

@@ -3 +3 @@
                 PerfQuery.o TransferFunction.o ControlPoint.o ColorGradient.o ColorPaletteWindow.o\
                 ColorGradientGLUTWindow.o TransferFunctionGLUTWindow.o MainWindow.o Event.o \
-                Lic.o Renderable.o Camera.o ScreenSnapper.o VolumeRenderer.o
+                Lic.o Renderable.o Camera.o ScreenSnapper.o VolumeRenderer.o PlaneRenderer.o 
 OBJ_VOLUMERENDERER = Volume.o ConvexPolygon.o TransferFunction.o Mat4x4.o  Camera.o
-
+OBJ_PLANERENDERER = Texture2D.o TransferFunction.o
 OBJ_CLIENT = Socket.o ClientSocket.o RenderClient.o Event.o
 
@@ -15 +15 @@
 NANOSCALESRC = ./nanoscale
 
-LIB_NANOVIS = -ltcl8.3 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
+LIB_NANOVIS = -ltcl8.4 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
 LIB_CLIENT = -L/opt/render/lib -lGL -lglut -pthread -lstdc++
-INCLUDES = -I../../src2/core -I/opt/render/include -I/autohome/u76/qiaow/Cg/usr/include
+INCLUDES = -I../src2/core -I/opt/render/include -I/autohome/u76/qiaow/Cg/usr/include
 CFLAG = -g -c $(INCLUDES)
 
@@ -26 +26 @@
 
 nanovis: $(OBJ_NANOVIS)
-        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../src2/core/*.o
+        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../src2/core/*.o
 
 ColorGradient.o: Color.o $(TFSRC)/ColorGradient.cpp
@@ -107 +107 @@
         gcc $(CFLAG) VolumeRenderer.cpp
 
+PlaneRenderer.o: $(OBJ_PLANERENDERER)  PlaneRenderer.h PlaneRenderer.cpp
+        gcc $(CFLAG) PlaneRenderer.cpp
+
 Mat4x4.o: Mat4x4.cpp Mat4x4.h
         gcc $(CFLAG) Mat4x4.cpp

trunk/gui/vizservers/nanovis/Texture2D.cpp

@@ -23 +23 @@
 Texture2D::Texture2D(){}
 
-Texture2D::Texture2D(int width, int height, GLuint type=GL_FLOAT, GLuint interp=GL_LINEAR, int n=4)
+Texture2D::Texture2D(int width, int height, GLuint type=GL_FLOAT, GLuint interp=GL_LINEAR, int n=4, float* data = 0)
 {
         assert(type == GL_UNSIGNED_BYTE || type == GL_FLOAT|| type ==GL_UNSIGNED_INT);
@@ -35 +35 @@
 
         this->id = 0; 
+
+        if(data != 0)
+          initialize(data);
 }
 

trunk/gui/vizservers/nanovis/Texture2D.h

@@ -31 +31 @@
 
   Texture2D();
-  Texture2D(int width, int height, GLuint type, GLuint interp, int n);
+  Texture2D(int width, int height, GLuint type, GLuint interp, int n, float* data);
   ~Texture2D();
         

trunk/gui/vizservers/nanovis/Volume.cpp

@@ -100 +100 @@
 int Volume::get_n_slice() { return n_slice; }
 
+void Volume::set_size(float s) { 
+  size = s; 
+  aspect_ratio_width = s*tex->aspect_ratio_width;
+  aspect_ratio_height = s*tex->aspect_ratio_height;
+  aspect_ratio_depth = s*tex->aspect_ratio_depth;
+}
+
 float Volume::get_specular() { return specular; }
 float Volume::get_diffuse() { return diffuse; }

trunk/gui/vizservers/nanovis/Volume.h

@@ -83 +83 @@
         int get_n_slice();      //return number of slices
 
+        void set_size(float s); //set the drawing size of volume 
+
         //methods related to cutplanes
         int add_cutplane(int _orientation, float _location); //add a plane and returns its index

trunk/gui/vizservers/nanovis/VolumeRenderer.cpp

@@ -45 +45 @@
   //cgGLSetTextureParameter(m_vol_one_volume_param, _vol->id);
   m_tf_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "tf");
+  //m_tf_cut_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "tf_cutplane");
   //cgGLSetTextureParameter(m_tf_one_volume_param, _tf->id);
   m_mvi_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelViewInv");
@@ -630 +631 @@
   cgGLSetTextureParameter(m_vol_one_volume_param, volume[volume_index]->id);
   cgGLSetTextureParameter(m_tf_one_volume_param, tf[volume_index]->id);
+  //cgGLSetTextureParameter(m_tf_cut_one_volume_param, tf_cut[volume_index]->id);
   cgGLEnableTextureParameter(m_vol_one_volume_param);
   cgGLEnableTextureParameter(m_tf_one_volume_param);
+  //cgGLEnableTextureParameter(m_tf_cut_one_volume_param);
 
   if(!slice_mode)

trunk/gui/vizservers/nanovis/config.h

@@ -16 +16 @@
 
 #define NV40      //Uncomment if using 6 series card. By default we assume older card the 5xxx series
-#define XINETD  //enable render server
+//#define XINETD  //enable render server
 //#define EVENTLOG  //enable event logging
 //#define DO_RLE  //do run length compression

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -38 +38 @@
 
 VolumeRenderer* vol_render;
+PlaneRenderer* plane_render;
 Camera* cam;
+
+bool volume_mode = false; //if true nanovis renders volumes in 3D, if not renders 2D plane
 
 // color table for built-in transfer function editor
@@ -83 +86 @@
 
 int n_volumes = 0;
-Volume* volume[MAX_N_VOLUMES];          //point to volumes, currently handle up to 10 volumes
+Volume* volume[MAX_N_VOLUMES];          //pointers to volumes, currently handle up to 10 volumes
 TransferFunction* tf[MAX_N_VOLUMES];    //transfer functions, currently handle up to 10 colormaps
+Texture2D* plane[10];                   //pointers to 2D planes, currently handle up 10
 
 PerfQuery* perf;                        //perfromance counter
@@ -254 +258 @@
 
         int axis;
-        if (DecodeAxis(interp, argv[3], &axis) != TCL_OK) {
+        if (DecodeAxis(interp, (char*)argv[3], &axis) != TCL_OK) {
             return TCL_ERROR;
         }
@@ -299 +303 @@
 
         int axis;
-        if (DecodeAxis(interp, argv[3], &axis) != TCL_OK) {
+        if (DecodeAxis(interp, (char*)argv[3], &axis) != TCL_OK) {
             return TCL_ERROR;
         }
@@ -381 +385 @@
         }
 
-        resize_offscreen_buffer(w, h);
+        resize_offscreen_buffer((int)w, (int)h);
 fprintf(stdin,"new screen size: %d %d\n",w,h);
         return TCL_OK;
@@ -488 +492 @@
 }
 
+
+static int
+VolumeResizeCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
+{
+  fprintf(stderr, "resize drawing size of the volume command\n");
+
+  double volume_index, size; 
+
+  if (argc != 3) {
+    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+                " volume_index size \"", (char*)NULL);
+    return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[1], &volume_index) != TCL_OK) {
+        return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[2], &size) != TCL_OK) {
+        return TCL_ERROR;
+  }
+
+  volume[(int)volume_index]->set_size((float) size);
+  return TCL_OK;
+}
 
 static int
@@ -1143 +1170 @@
   win_height = h;
 
+  //fprintf(stderr, "screen_buffer size: %d\n", sizeof(screen_buffer));
+
   if (screen_buffer) {
       delete[] screen_buffer;
-  }
-  screen_buffer = new unsigned char[3*win_width*win_height+1];
+      screen_buffer = 0;
+  }
+  screen_buffer = new unsigned char[5*win_width*win_height];
+  assert(screen_buffer!=0);
 
   //delete the current render buffer resources
@@ -1288 +1319 @@
 
 
+void make_test_2D_data(){
+
+  int w = 300;
+  int h = 200;
+  float* data = new float[w*h];
+
+  //procedurally make a gradient plane
+  for(int j=0; j<h; j++){
+    for(int i=0; i<w; i++){
+      data[w*j+i] = float(i)/float(w);
+    }
+  }
+
+  plane[0] = new Texture2D(w, h, GL_FLOAT, GL_LINEAR, 1, data);
+
+  delete[] data;
+}
+
+
 /*----------------------------------------------------*/
 void initGL(void) 
@@ -1297 +1347 @@
    if (screen_buffer) {
        delete[] screen_buffer;
+       screen_buffer = 0;
    }
-   screen_buffer = new unsigned char[3*win_width*win_height+1];
+   screen_buffer = new unsigned char[5*win_width*win_height];
+   assert(screen_buffer!=0);
 
    //create the camera with default setting
@@ -1344 +1396 @@
    //load_volume_file(0, "./data/input_nd_dx_4"); //take a VERY long time?
    //load_vector_file(1, "./data/J-wire-vec.dx");
-   load_volume_file(1, "./data/mu-wire-3d.dx");
+   //load_volume_file(1, "./data/mu-wire-3d.dx");
    //load_volume_file(3, "./data/mu-wire-3d.dx");
    //load_volume_file(4, "./data/mu-wire-3d.dx");
@@ -1368 +1420 @@
    //vol_render->add_volume(volume[4], tf[0]);
 
+
+   //create an 2D plane renderer
+   plane_render = new PlaneRenderer(g_context, win_width, win_height);
+   make_test_2D_data();
+
+   plane_render->add_plane(plane[0], tf[0]);
+
+   
    //init_particle_system();
    //init_lic(); 
@@ -1400 +1460 @@
   //enable or disable an existing volume 
   Tcl_CreateCommand(interp, "volume_enable", VolumeEnableCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  //resize volume 
+  Tcl_CreateCommand(interp, "volume_resize", VolumeResizeCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
 
   //refresh the screen (render again)
@@ -1409 +1471 @@
   //glBindTexture(GL_TEXTURE_2D, 0);
   //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
-  glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, screen_buffer);
+ 
+  //debug: set magic number
+  memset(screen_buffer, 253, 5*win_width*win_height);
+
+  glReadPixels(0, 0, win_width, win_height, GL_RGBA, GL_UNSIGNED_BYTE, screen_buffer);
+  //glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, screen_buffer);
   assert(glGetError()==0);
+  
+  fprintf(stderr, "%d %d:", win_width, win_height);
+  for(int i=5*win_width*win_height-1; i>=0; i--){
+    if(screen_buffer[i] != 253){
+      fprintf(stderr, "%d\n", i);
+      i=0;
+      //fprintf(stderr, "%d ", screen_buffer[i]);
+    }
+  }
   
   /*
@@ -1470 +1546 @@
 
 void xinetd_listen(){
-    //command:
-    // 0. load data
-    // 1. flip on/off screen
-    // 2. rotation
-    // 3. zoom
-    // 4. more slices
-    // 5. less sleces
 
     std::string data;
@@ -1960 +2029 @@
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
 
-   glEnable(GL_TEXTURE_2D);
-   glEnable(GL_DEPTH_TEST);
-
-   //camera setting activated
-   cam->activate();
-
-   //now render things in the scene
-   //
-   draw_3d_axis();
+   if( volume_mode){ //3D rendering mode
+     glEnable(GL_TEXTURE_2D);
+     glEnable(GL_DEPTH_TEST);
+
+     //camera setting activated
+     cam->activate();
+
+     //now render things in the scene
+     //
+     draw_3d_axis();
    
-   //lic->render();     //display the line integral convolution result
-   //soft_display_verts();
-   //perf->enable();
-   //  psys->render();
-   //perf->disable();
-   //fprintf(stderr, "particle pixels: %d\n", perf->get_pixel_count());
-   //perf->reset();
-
-
-   perf->enable();
-     vol_render->render_all();
-     //fprintf(stderr, "%lf\n", get_time_interval());
-   perf->disable();
- 
+     //lic->render();   //display the line integral convolution result
+     //soft_display_verts();
+     //perf->enable();
+     //  psys->render();
+     //perf->disable();
+     //fprintf(stderr, "particle pixels: %d\n", perf->get_pixel_count());
+     //perf->reset();
+    
+     perf->enable();
+       vol_render->render_all();
+       //fprintf(stderr, "%lf\n", get_time_interval());
+     perf->disable();
+   }
+   else{ //2D rendering mode
+
+     perf->enable();
+       plane_render->render();
+     perf->disable();
+   }
+
+
 #ifdef XINETD
    float cost  = perf->get_pixel_count();
@@ -1995 +2072 @@
    read_screen();
 #else
-   //read_screen();
+   read_screen();
 #endif   
 

trunk/gui/vizservers/nanovis/nanovis.h

@@ -41 +41 @@
 #include "Lic.h"
 #include "VolumeRenderer.h"
+#include "PlaneRenderer.h"
 
 #include "config.h"