Changeset 432 for trunk

Timestamp:

May 5, 2006, 12:04:13 PM (18 years ago)

Author:

qiaow

Message:

Added some comments

Location:

trunk/gui/vizservers/nanovis

Files:

• PlaneRenderer.cpp (modified) (3 diffs)
• PlaneRenderer.h (modified) (1 diff)
• Texture2D.cpp (modified) (1 diff)
• Texture2D.h (modified) (1 diff)
• VolumeRenderer.cpp (modified) (4 diffs)
• VolumeRenderer.h (modified) (1 diff)
• nanovis.cpp (modified) (12 diffs)

trunk/gui/vizservers/nanovis/PlaneRenderer.cpp

@@ -20 +20 @@
   g_context(_context),
   render_width(_width),
-  render_height(_height)
+  render_height(_height),
+  active_plane(-1)
 {
   plane.clear();
@@ -72 +73 @@
   //glColor3f(1.,1.,1.);         //MUST HAVE THIS LINE!!!
 
+  //if no active plane
+  if(active_plane == -1)
+    return;
+
   activate_shader(active_plane);
   glBegin(GL_QUADS);
@@ -104 +109 @@
 
 void PlaneRenderer::set_active_plane(int index) { active_plane = index; }
+void PlaneRenderer::set_screen_size(int w, int h) { render_width = w;  render_height = h;}
 

trunk/gui/vizservers/nanovis/PlaneRenderer.h

@@ -64 +64 @@
                                                 //plane is added.
   void set_active_plane(int index);             //set the active plane to be rendered
+  void set_screen_size(int w, int h);           //change the rendering size
   void render();
 };

trunk/gui/vizservers/nanovis/Texture2D.cpp

@@ -132 +132 @@
   fprintf(stderr, "max texture units: %d.\n", max);
 }
+

trunk/gui/vizservers/nanovis/Texture2D.h

@@ -36 +36 @@
   void activate();
   void deactivate();
+  void enable();
+  void disable();
   GLuint initialize(float* data);
   static void check_max_size();

trunk/gui/vizservers/nanovis/VolumeRenderer.cpp

@@ -168 +168 @@
     float z_step = fabs(zNear-zFar)/n_slices;           
     int n_actual_slices = (int)(fabs(zNear-zFar)/z_step + 1);
+
+    //if no cloud
+    //n_actual_slices = 0;
+    
     actual_slices[cur_vol] = n_actual_slices;
     polys[cur_vol] = new ConvexPolygon*[n_actual_slices];
+
+    //if no cloud
+    //polys[cur_vol] = NULL;
 
     float slice_z;
@@ -259 +266 @@
 
     int counter = 0;
+    
     //transform slices and store them
     for (int i=0; i<n_actual_slices; i++){
@@ -291 +299 @@
         total_rendered_slices++; 
     }
+    
   } //iterate all volumes
   //fprintf(stderr, "total slices: %d\n", total_rendered_slices); 
@@ -705 +714 @@
 void VolumeRenderer::switch_volume_mode() { volume_mode = (!volume_mode); }
 
+void VolumeRenderer::enable_volume(int index){
+  volume[index]->enable();
+}
+
+void VolumeRenderer::disable_volume(int index){
+  volume[index]->disable();
+}

trunk/gui/vizservers/nanovis/VolumeRenderer.h

@@ -86 +86 @@
   void switch_slice_mode(); //switch_cutplane_mode
   void switch_volume_mode();
+  void enable_volume(int index); //enable a volume
+  void disable_volume(int index); //disable a volume
 };
 

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -129 +129 @@
 static int OutlineCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
 static int RefreshCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
+static int Switch2D3DCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
+static int PlaneNewCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
+static int PlaneLinkCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
+static int PlaneEnableCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
 
 static int DecodeAxis _ANSI_ARGS_((Tcl_Interp *interp, char *str, int *valPtr));
@@ -516 +520 @@
 }
 
+//Enable a volume.
+//Can enable a volume that is not yet added to the volume renderer.
+//But it won't be rendered until it's added to the volume renderer using VolumeLinkCmd
+//volume_index: the index maintained in the volume renderer.
 static int
 VolumeEnableCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
 {
-  fprintf(stderr, "link volume command\n");
+  fprintf(stderr, "enabled a volume to render command\n");
 
   double volume_index, mode;
@@ -525 +533 @@
   if (argc != 3) {
     Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                " volume_index tf_index \"", (char*)NULL);
+                " volume_index mode \"", (char*)NULL);
     return TCL_ERROR;
   }
@@ -536 +544 @@
 
   if(mode==0)
-    volume[(int)volume_index]->disable();
+    vol_render->disable_volume((int)volume_index);
   else
-    volume[(int)volume_index]->enable();
+    vol_render->enable_volume((int)volume_index);
 
   return TCL_OK;
@@ -617 +625 @@
         return TCL_OK;
 }
+
+
+//Switch: 
+//arg[1] = 0 : 3D rendering
+//arg[1] !=0 : 2D rendering 
+static int
+Switch2D3DCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
+{
+  fprintf(stderr, "switch 2D 3D rendering modes cmd\n");
+
+  double mode;
+
+  if (argc != 2) {
+    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+                " mode\"", (char*)NULL);
+    return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[1], &mode) != TCL_OK) {
+        return TCL_ERROR;
+  }
+
+  if(mode==0)
+    volume_mode = true;
+  else
+    volume_mode = false;
+
+  return TCL_OK;
+}
+
+
+static int 
+PlaneNewCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])){
+  fprintf(stderr, "load plane for 2D visualization command\n");
+
+  double index, w, h;
+
+  if (argc != 4) {
+    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+                " plane_index w h \"", (char*)NULL);
+    return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[1], &index) != TCL_OK) {
+        return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[2], &w) != TCL_OK) {
+        return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[3], &h) != TCL_OK) {
+        return TCL_ERROR;
+  }
+
+  //Now read w*h*4 bytes. The server expects the plane to be a stream of floats 
+  char* tmp = new char[int(w*h*sizeof(float))];
+  bzero(tmp, w*h*4);
+  int status = read(0, tmp, w*h*sizeof(float));
+  if (status <= 0){
+    exit(0);
+  }
+ 
+  plane[(int)index] = new Texture2D(w, h, GL_FLOAT, GL_LINEAR, 1, (float*)tmp);
+  
+  delete[] tmp;
+  return TCL_OK;
+}
+
+
+static 
+int PlaneLinkCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])){
+  fprintf(stderr, "link the plane to the 2D renderer command\n");
+
+  double plane_index, tf_index;
+
+  if (argc != 3) {
+    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+                " plane_index tf_index \"", (char*)NULL);
+    return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[1], &plane_index) != TCL_OK) {
+        return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[2], &tf_index) != TCL_OK) {
+        return TCL_ERROR;
+  }
+
+  plane_render->add_plane(plane[(int)plane_index], tf[(int)tf_index]);
+
+  return TCL_OK;
+}
+
+
+//Enable a 2D plane for render
+//The plane_index is the index mantained in the 2D plane renderer
+static 
+int PlaneEnableCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])){
+  fprintf(stderr, "enable a plane so the 2D renderer can render it command\n");
+
+  double plane_index, mode;
+
+  if (argc != 3) {
+    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+                " plane_index mode \"", (char*)NULL);
+    return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[1], &plane_index) != TCL_OK) {
+        return TCL_ERROR;
+  }
+  if (Tcl_GetDouble(interp, argv[2], &mode) != TCL_OK) {
+        return TCL_ERROR;
+  }
+
+  if(mode==0)
+    plane_render->set_active_plane(-1);
+  else
+    plane_render->set_active_plane(plane_index);
+
+  return TCL_OK;
+}
+
+
 
 //report errors related to CG shaders
@@ -1176 +1303 @@
       screen_buffer = 0;
   }
-  screen_buffer = new unsigned char[5*win_width*win_height];
+  screen_buffer = new unsigned char[4*win_width*win_height];
   assert(screen_buffer!=0);
 
@@ -1190 +1317 @@
   //change the camera setting
   cam->set_screen_size(win_width, win_height);
+  plane_render->set_screen_size(win_width, win_height);
 
   //Reinitialize final fbo for final display
@@ -1349 +1477 @@
        screen_buffer = 0;
    }
-   screen_buffer = new unsigned char[5*win_width*win_height];
+   screen_buffer = new unsigned char[4*win_width*win_height];
    assert(screen_buffer!=0);
 
@@ -1473 +1601 @@
  
   //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);
+  //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);
   
+  /*
+  //debug: check from the back of screen_buffer to see how far ReadPixel went
   fprintf(stderr, "%d %d:", win_width, win_height);
   for(int i=5*win_width*win_height-1; i>=0; i--){
@@ -1484 +1614 @@
       fprintf(stderr, "%d\n", i);
       i=0;
-      //fprintf(stderr, "%d ", screen_buffer[i]);
-    }
-  }
+    }
+  }
+  */
   
   /*
@@ -2029 +2159 @@
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
 
-   if( volume_mode){ //3D rendering mode
+   if(volume_mode){ //3D rendering mode
      glEnable(GL_TEXTURE_2D);
      glEnable(GL_DEPTH_TEST);
@@ -2072 +2202 @@
    read_screen();
 #else
-   read_screen();
+   //read_screen();
 #endif