Changeset 417 for trunk/gui/vizservers/nanovis

Timestamp:

Apr 27, 2006, 2:14:52 PM (18 years ago)

Author:

qiaow

Message:

Fixed a bug in VolumeRenderer?.cpp

Location:

trunk/gui/vizservers/nanovis

Files:

• ConvexPolygon.cpp (modified) (1 diff)
• VolumeRenderer.cpp (modified) (9 diffs)
• VolumeRenderer.h (modified) (2 diffs)
• nanovis.cpp (modified) (2 diffs)
• shaders/one_volume.cg (modified) (1 diff)

trunk/gui/vizservers/nanovis/ConvexPolygon.cpp

@@ -187 +187 @@
                         }
                         glVertex4fv((float *)&(vertices[i]));
-                }
-         }
+                        /*
+                        //debug
+                        fprintf(stderr, "(%f %f %f %f)", 
+                                        vertices[i].x,
+                                        vertices[i].y,
+                                        vertices[i].z,
+                                        vertices[i].w );
+                        */
+                }
+         } 
+        //fprintf(stderr, " "); 
 }
 

trunk/gui/vizservers/nanovis/VolumeRenderer.cpp

@@ -31 +31 @@
   tf.clear(); 
   slice.clear();
-  add_volume(_vol, _tf, 256);
+  add_volume(_vol, _tf, 64);
 
   //initialize the volume shaders
@@ -93 +93 @@
       total_enabled_volumes ++;
   }
-  fprintf(stderr, "total volumes rendered: %d\n", total_enabled_volumes);
+  //fprintf(stderr, "total volumes rendered: %d\n", total_enabled_volumes);
 
   ConvexPolygon*** polys = new ConvexPolygon**[total_enabled_volumes];  //two dimension pointer array
@@ -181 +181 @@
     Vector4 vert4 = (Vector4(+10, -10, -0.5, 1));
 
+#if 1    
     //Render cutplanes first with depth test enabled.
     //They will mark the image with their depth values. Then we render other volume slices.
     //These volume slices will be occluded correctly by the cutplanes and vice versa.
-    glEnable(GL_DEPTH_TEST);
-    glDisable(GL_BLEND);
-
+
+    ConvexPolygon static_poly;
     for(int i=0; i<volume[volume_index]->get_cutplane_count(); i++){
       if(!volume[volume_index]->cutplane_is_enabled(i))
@@ -199 +199 @@
         vert3 = Vector4(+10, +10, offset, 1);
         vert4 = Vector4(+10, -10, offset, 1);
+        //continue;
       }
       else if(axis==2){
@@ -205 +206 @@
         vert3 = Vector4(offset, +10, +10, 1);
         vert4 = Vector4(offset, -10, +10, 1);
+        //continue;
       }
       else if(axis==3){
@@ -211 +213 @@
         vert3 = Vector4(+10, offset, +10, 1);
         vert4 = Vector4(-10, offset, +10, 1);
+        //continue;
       }
 
@@ -218 +221 @@
       vert4 = model_view_no_trans.transform(vert4);
 
-      ConvexPolygon poly;
-      poly.vertices.clear();
-
-      poly.append_vertex(vert1);
-      poly.append_vertex(vert2);
-      poly.append_vertex(vert3);
-      poly.append_vertex(vert4);
+      ConvexPolygon* p = &static_poly;
+      p->vertices.clear();
+
+      p->append_vertex(vert1);
+      p->append_vertex(vert2);
+      p->append_vertex(vert3);
+      p->append_vertex(vert4);
 
       for(int k=0; k<6; k++){
-        poly.clip(volume_planes[k], true);
+        p->clip(volume_planes[k], true);
       }
 
-      //poly->transform(model_view_inverse);
-      //poly->translate(shift_4d);
-      //poly->transform(model_view);
-      poly.transform(model_view_no_trans_inverse);
-      poly.transform(model_view_trans);
+      p->transform(model_view_no_trans_inverse);
+      p->transform(model_view_trans);
 
       glPushMatrix();
       glScalef(volume[volume_index]->aspect_ratio_width, volume[volume_index]->aspect_ratio_height, volume[volume_index]->aspect_ratio_depth);
 
-      activate_one_volume_shader(volume_index, 0, 1);
+      activate_one_volume_shader(volume_index, .0, 1.);
       glPopMatrix();
 
+      glEnable(GL_DEPTH_TEST);
+      glDisable(GL_BLEND);
+
       glBegin(GL_POLYGON);
-        poly.Emit(true); 
+        p->Emit(true); 
       glEnd();
+      glDisable(GL_DEPTH_TEST);
 
       deactivate_one_volume_shader();
     } //done cutplanes
-
+#endif
    
     //Now do volume rendering
+
+    vert1 = (Vector4(-10, -10, -0.5, 1));
+    vert2 = (Vector4(-10, +10, -0.5, 1));
+    vert3 = (Vector4(+10, +10, -0.5, 1));
+    vert4 = (Vector4(+10, -10, -0.5, 1));
 
     int counter = 0;
@@ -286 +295 @@
     }
   } //iterate all volumes
-
+  fprintf(stderr, "total slices: %d\n", total_rendered_slices); 
 
   //We sort all the polygons according to their eye-space depth, from farthest to the closest.
@@ -335 +344 @@
     deactivate_one_volume_shader();
   }
+  //fprintf(stderr, "\n\n");
+
 
   glDisable(GL_DEPTH_TEST);

trunk/gui/vizservers/nanovis/VolumeRenderer.h

@@ -19 +19 @@
 #include <GL/glew.h>
 #include <Cg/cgGL.h>
+#include <GL/glut.h>
 #include <math.h>
 #include <stdio.h>
@@ -43 +44 @@
   vector <TransferFunction*> tf;//array of corresponding transfer functions 
   vector <int> slice;           //array of corresponding number of slices
-  vector <bool> render_bit;     //bits marking which volume(s) to render
   int n_volumes;
 

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -862 +862 @@
    load_vector_file(0, "./data/J-wire-vec.dx");
    load_volume_file(1, "./data/mu-wire-3d.dx");
-   load_volume_file(2, "./data/mu-wire-3d.dx");
-   load_volume_file(3, "./data/mu-wire-3d.dx");
+   //load_volume_file(2, "./data/mu-wire-3d.dx");
+   //load_volume_file(3, "./data/mu-wire-3d.dx");
 
    init_tf();   //initialize transfer function
@@ -872 +872 @@
    //create volume renderer and add volumes to it
    vol_render = new VolumeRenderer(cam, volume[1], tf[0], g_context);
-   volume[2]->move(Vector3(0.42, 0.1, 0.1));
-   vol_render->add_volume(volume[2], tf[0], 256);
-   volume[3]->move(Vector3(0.2, -0.1, -0.1));
-   vol_render->add_volume(volume[3], tf[0], 256);
+   //volume[2]->move(Vector3(0.42, 0.1, 0.1));
+   //vol_render->add_volume(volume[2], tf[0], 256);
+   //volume[3]->move(Vector3(0.2, -0.1, -0.1));
+   //vol_render->add_volume(volume[3], tf[0], 256);
 
    

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

@@ -64 +64 @@
   OUT.Color = color;
   //debug
-  //OUT.Color = float4(tex_coord, 1);
+  //OUT.Color = float4(tex_coord.xyz, 1);
 
   return OUT;