Changeset 406 for trunk/gui/vizservers/nanovis

Timestamp:

Apr 24, 2006, 9:59:10 AM (18 years ago)

Author:

qiaow

Message:

Added ScreenSnapper? class and VolumeRenderer? class.
VolumeRenderer? class can handle motiple volumes. Volume rendering code is seperated
from nanovis.cpp file.

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (6 diffs)
• Plane.h (modified) (1 diff)
• Renderable.h (modified) (1 diff)
• ScreenSnapper.cpp (added)
• ScreenSnapper.h (added)
• Sphere.cpp (modified) (1 diff)
• VolumeRenderer.cpp (added)
• VolumeRenderer.h (added)
• define.h (modified) (1 diff)
• nanoscale/EventPlayer.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (13 diffs)
• nanovis.h (modified) (2 diffs)

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
+                Lic.o Renderable.o Camera.o ScreenSnapper.o VolumeRenderer.o
+OBJ_VOLUMERENDERER = Volume.o ConvexPolygon.o TransferFunction.o Mat4x4.o  Camera.o
 
 OBJ_CLIENT = Socket.o ClientSocket.o RenderClient.o Event.o
@@ -61 +62 @@
         #g++ -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o
 
-Color.o: Color.cpp
+Color.o: Color.cpp Color.h
         gcc $(CFLAG) Color.cpp
 
-Event.o: Event.cpp
+Event.o: Event.cpp Event.h
         gcc $(CFLAG) Event.cpp
 
@@ -70 +71 @@
         gcc $(CFLAG) $(TFSRC)/ControlPoint.cpp
 
-Sphere.o: Renderable.o Color.o
+Sphere.o: Renderable.o Color.o Sphere.cpp Sphere.h
         gcc $(CFLAG) Sphere.cpp
 
@@ -76 +77 @@
         gcc $(CFLAG) TransferFunction.cpp
 
-Texture1D.o: Texture1D.cpp
+Texture1D.o: Texture1D.cpp Texture1D.h
         gcc $(CFLAG) Texture1D.cpp
 
-Texture2D.o: Texture2D.cpp $(AUXSRC)
+Texture2D.o: Texture2D.cpp Texture2D.h $(AUXSRC)
         gcc $(CFLAG) Texture2D.cpp
 
-Texture3D.o: Texture3D.cpp $(AUXSRC)
+Texture3D.o: Texture3D.cpp Texture3D.h $(AUXSRC)
         gcc $(CFLAG) Texture3D.cpp
 
@@ -88 +89 @@
         gcc $(CFLAG) ParticleSystem.cpp
 
-Renderable.o: Vector3.o Renderable.cpp
+Renderable.o: Vector3.o Renderable.cpp Renderable.h
         gcc $(CFLAG) Renderable.cpp
 
-Camera.o: Vector3.o Camera.cpp
+Camera.o: Vector3.o Camera.cpp Camera.h
         gcc $(CFLAG) Camera.cpp
+
+ScreenSnapper.o: define.h ScreenSnapper.cpp ScreenSnapper.h
+        gcc $(CFLAG) ScreenSnapper.cpp
 
 Lic.o: Renderable.o Lic.cpp Lic.h $(AUXSRC)
@@ -100 +104 @@
         gcc $(CFLAG) Volume.cpp
 
-Mat4x4.o: Mat4x4.cpp
+VolumeRenderer.o: $(OBJ_VOLUMERENDERER)  VolumeRenderer.h VolumeRenderer.cpp
+        gcc $(CFLAG) VolumeRenderer.cpp
+
+Mat4x4.o: Mat4x4.cpp Mat4x4.h
         gcc $(CFLAG) Mat4x4.cpp
 
-Vector4.o: Vector4.cpp
+Vector4.o: Vector4.cpp Vector4.h
         gcc $(CFLAG) Vector4.cpp
 
-Vector3.o: Vector3.cpp
+Vector3.o: Vector3.cpp Vector3.h
         gcc $(CFLAG) Vector3.cpp
 
-Plane.o: Plane.cpp
+Plane.o: Plane.cpp Plane.h
         gcc $(CFLAG) Plane.cpp
 
-ConvexPolygon.o: ConvexPolygon.cpp
+ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h
         gcc $(CFLAG) ConvexPolygon.cpp
 
-PerfQuery.o: PerfQuery.cpp
+PerfQuery.o: PerfQuery.cpp PerfQuery.h
         gcc $(CFLAG) PerfQuery.cpp
 

trunk/gui/vizservers/nanovis/Plane.h

@@ -27 +27 @@
     Plane();
     
-        void get_normal(Vector3 &normal);
+    void get_normal(Vector3 &normal);
     void get_point(Vector3 &point);
     Vector4 get_coeffs();
-        void set_coeffs(float _a, float _b, float _c, float _d);
-        void transform(Mat4x4 mat);
-        void transform(float *m);
-        bool retains(Vector3 point);
-        //bool clips(float point[3]) const { return !retains(point); }
+    void set_coeffs(float _a, float _b, float _c, float _d);
+    void transform(Mat4x4 mat);
+    void transform(float *m);
+    bool retains(Vector3 point);
+    //bool clips(float point[3]) const { return !retains(point); }
 
 };

trunk/gui/vizservers/nanovis/Renderable.h

@@ -21 +21 @@
 #include "Vector3.h"
 
+struct BoundBox{
+  Vector3 low; //lower coordinates
+  Vector3 high; //higher coordinates
+
+  BoundBox(){}
+  BoundBox(float low_x, float low_y, float low_z,
+          float high_x, float high_y, float high_z):
+          low(Vector3(low_x, low_y, low_z)),
+          high(Vector3(high_x, high_y, high_z)){}
+};
+
 class Renderable{
 protected:
   Vector3 location;     //the location (x,y,z) of the object
   bool enabled;         //display is enabled
+  BoundBox boundary;    //the bounding box
 
 public:

trunk/gui/vizservers/nanovis/Sphere.cpp

@@ -26 +26 @@
         stack(_stack),
         slice(_slice),
-        color(Color(r,g,b)) { }
+        color(Color(r,g,b))
+{ 
+  boundary = BoundBox(x-r, y-r, z-r, x+r, y+r, z+r);
+}
 
 Sphere::~Sphere(){}

trunk/gui/vizservers/nanovis/define.h

@@ -27 +27 @@
 #define NVIS_FLOAT GL_FLOAT
 #define NVIS_UNSIGNED_INT GL_UNSIGNED_INT
+#define NVIS_UNSIGNED_BYTE GL_UNSIGNED_BYTE
 
 #define NVIS_LINEAR_INTERP GL_LINEAR
 #define NVIS_NEAREST_INTERP GL_NEAREST
-
 
 typedef GLuint NVISdatatype;            //OpenGL datatype: unsigned int

trunk/gui/vizservers/nanovis/nanoscale/EventPlayer.cpp

@@ -65 +65 @@
 }
 
+
+/*
+ *Client communicates with the server
+ */
 void idle(void)
 {
@@ -165 +169 @@
 }
 
+
 int init_client(char* host, char* port, char* file){
 

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -35 +35 @@
 //render server
 
+VolumeRenderer* vol_render;
 Camera* cam;
+
 float color_table[256][4];      
 
@@ -59 +61 @@
 Lic* lic;
 
-char* screen_buffer = new char[3*NPIX*NPIX+1];          //buffer to store data read from the screen
+unsigned char* screen_buffer = new unsigned char[3*win_width*win_height+1];     //buffer to store data read from the screen
 NVISid final_fbo, final_color_tex, final_depth_rb;      //frame buffer for final rendering
 NVISid vel_fbo, slice_vector_tex;       //for projecting 3d vector to 2d vector on a plane
@@ -735 +737 @@
     g_context = cgCreateContext();
 
-    //load programs that can be used in all render modes
-    
-    //standard vertex program
-    m_vert_std_vprog = loadProgram(g_context, CG_PROFILE_VP30, CG_SOURCE, "./shaders/vertex_std.cg");
-    m_mvp_vert_std_param = cgGetNamedParameter(m_vert_std_vprog, "modelViewProjMatrix");
-    m_mvi_vert_std_param = cgGetNamedParameter(m_vert_std_vprog, "modelViewInv");
-
-    m_passthru_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/passthru.cg");
-    m_passthru_scale_param = cgGetNamedParameter(m_passthru_fprog, "scale");
-    m_passthru_bias_param  = cgGetNamedParameter(m_passthru_fprog, "bias");
-
-    m_copy_texcoord_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/copy_texcoord.cg");
-
 #ifdef NEW_CG
     m_posvel_fprog = loadProgram(g_context, CG_PROFILE_FP40, CG_SOURCE, "./shaders/update_pos_vel.cg");
@@ -763 +752 @@
 
   switch (choice){
-
     case 0:
-      //render one volume
-      m_one_volume_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/one_volume.cg");
-      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_mv_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelView");
-      m_render_param_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "renderParameters");
       break;
 
    case 1:
-      //render two volumes
+      break;
       
    default:
       break;
-
-
   }
 }
@@ -891 +868 @@
    init_lic();  //init line integral convolution
 
-   //load the default one volume shader
-   switch_shader(cur_shader);
-
+   //create volume renderer
+   vol_render = new VolumeRenderer(cam, volume[1], tf[0], g_context);
    
    psys = new ParticleSystem(NMESH, NMESH, g_context, volume[0]->id,
@@ -904 +880 @@
    init_particles();    //fill initial particles
 }
-
-
 
 
@@ -927 +901 @@
 void read_screen(){
   //glBindTexture(GL_TEXTURE_2D, 0);
-  //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
-  glReadPixels(0, 0, win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
+  //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
+  glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, screen_buffer);
   assert(glGetError()==0);
+  
+  for(int i=0; i<win_width*win_height; i++){
+    if(screen_buffer[3*i]!=0 || screen_buffer[3*i+1]!=0 || screen_buffer[3*i+2]!=0)
+      fprintf(stderr, "(%d %d %d) ", screen_buffer[3*i], screen_buffer[3*i+1],  screen_buffer[3*i+2]);
+  }
+  
 }
 
@@ -1068 +1048 @@
    glLoadIdentity();
 
-   glColor3f(1.,1.,1.);         //MUST HAVE THIS LINE!!!
+   //glColor3f(1.,1.,1.);               //MUST HAVE THIS LINE!!!
    glBegin(GL_QUADS);
    glTexCoord2f(0, 0); glVertex2f(-1, -1);
@@ -1285 +1265 @@
 #endif
 
-void get_near_far_z(Mat4x4 mv, double &zNear, double &zFar)
-{
-
-  double x0 = 0;
-  double y0 = 0;
-  double z0 = 0;
-  double x1 = 1;
-  double y1 = 1;
-  double z1 = 1;
-
-  double zMin, zMax;
-  zMin =  10000;
-  zMax = -10000;
-
-  double vertex[8][4];
-
-  vertex[0][0]=x0; vertex[0][1]=y0; vertex[0][2]=z0; vertex[0][3]=1.0;
-  vertex[1][0]=x1; vertex[1][1]=y0; vertex[1][2]=z0; vertex[1][3]=1.0;
-  vertex[2][0]=x0; vertex[2][1]=y1; vertex[2][2]=z0; vertex[2][3]=1.0;
-  vertex[3][0]=x0; vertex[3][1]=y0; vertex[3][2]=z1; vertex[3][3]=1.0;
-  vertex[4][0]=x1; vertex[4][1]=y1; vertex[4][2]=z0; vertex[4][3]=1.0;
-  vertex[5][0]=x1; vertex[5][1]=y0; vertex[5][2]=z1; vertex[5][3]=1.0;
-  vertex[6][0]=x0; vertex[6][1]=y1; vertex[6][2]=z1; vertex[6][3]=1.0;
-  vertex[7][0]=x1; vertex[7][1]=y1; vertex[7][2]=z1; vertex[7][3]=1.0;
-
-  for(int i=0;i<8;i++)
-  {
-    Vector4 tmp = mv.transform(Vector4(vertex[i][0], vertex[i][1], vertex[i][2], vertex[i][3]));
-    tmp.perspective_devide();
-    vertex[i][2] = tmp.z;
-    if (vertex[i][2]<zMin) zMin = vertex[i][2];
-    if (vertex[i][2]>zMax) zMax = vertex[i][2];
-  }
-
-  zNear = zMax;
-  zFar = zMin;
-}
-
-
-void activate_one_volume_shader(int volume_index, int n_actual_slices){
-
-  cgGLSetStateMatrixParameter(m_mvp_vert_std_param, CG_GL_MODELVIEW_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY);
-  cgGLSetStateMatrixParameter(m_mvi_vert_std_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_INVERSE);
-  cgGLBindProgram(m_vert_std_vprog);
-  cgGLEnableProfile(CG_PROFILE_VP30);
-
-  cgGLSetStateMatrixParameter(m_mvi_one_volume_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_INVERSE);
-  cgGLSetStateMatrixParameter(m_mv_one_volume_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY);
-  cgGLSetTextureParameter(m_vol_one_volume_param, volume[volume_index]->id);
-  cgGLEnableTextureParameter(m_vol_one_volume_param);
-  cgGLEnableTextureParameter(m_tf_one_volume_param);
-
-  //hack!
-  //if parameter.y == 0 : volume :0
-  //if parameter.y == 1 : volume :1
-  if(volume_index==0)
-    cgGLSetParameter4f(m_render_param_one_volume_param, n_actual_slices, 0., live_diffuse, live_specular);
-  else if(volume_index==1)
-    cgGLSetParameter4f(m_render_param_one_volume_param, n_actual_slices, 1., live_diffuse, live_specular);
-  cgGLBindProgram(m_one_volume_fprog);
-  cgGLEnableProfile(CG_PROFILE_FP30);
-}
-
-
-void deactivate_one_volume_shader(){
-  cgGLDisableProfile(CG_PROFILE_VP30);
-  cgGLDisableProfile(CG_PROFILE_FP30);
-
-  cgGLDisableTextureParameter(m_vol_one_volume_param);
-  cgGLDisableTextureParameter(m_tf_one_volume_param);
-}
-
-
-//render volumes
-void render_volume(int volume_index, int n_slices){
-
-  //volume start location
-  Vector4 shift_4d(volume[volume_index]->location.x, volume[volume_index]->location.y, volume[volume_index]->location.z, 0);
-
-  double x0 = 0;
-  double y0 = 0;
-  double z0 = 0;
-
-  Mat4x4 model_view;
-  Mat4x4 model_view_inverse;
-
-  double zNear, zFar;
-
-  //initialize volume plane with world coordinates
-  Plane volume_planes[6];
-
-  volume_planes[0].set_coeffs(1, 0, 0, -x0);
-  volume_planes[1].set_coeffs(-1, 0, 0, x0+1);
-  volume_planes[2].set_coeffs(0, 1, 0, -y0);
-  volume_planes[3].set_coeffs(0, -1, 0, y0+1);
-  volume_planes[4].set_coeffs(0, 0, 1, -z0);
-  volume_planes[5].set_coeffs(0, 0, -1, z0+1);
-
-  glPushMatrix();
-
-  glScalef(volume[volume_index]->aspect_ratio_width, 
-          volume[volume_index]->aspect_ratio_height, 
-          volume[volume_index]->aspect_ratio_depth);
-
-  glEnable(GL_DEPTH_TEST);
-
-  //draw volume bounding box
-  draw_bounding_box(x0+shift_4d.x, y0+shift_4d.y, z0+shift_4d.z, x0+shift_4d.x+1, y0+shift_4d.y+1, z0+shift_4d.z+1, 0.8, 0.1, 0.1, 1.5);
-
-  GLfloat mv[16];
-  glGetFloatv(GL_MODELVIEW_MATRIX, mv);
-
-  model_view = Mat4x4(mv);
-  model_view_inverse = model_view.inverse();
-
-  glPopMatrix();
-
-  //transform volume_planes to eye coordinates.
-  for(int i=0; i<6; i++)
-    volume_planes[i].transform(model_view);
-
-  get_near_far_z(mv, zNear, zFar);
-  //fprintf(stderr, "zNear:%f, zFar:%f\n", zNear, zFar);
-  //fflush(stderr);
-
-  //compute actual rendering slices
-  float z_step = fabs(zNear-zFar)/n_slices;             
-  int n_actual_slices = (int)(fabs(zNear-zFar)/z_step + 1);
-  //fprintf(stderr, "slices: %d\n", n_actual_slices);
-  //fflush(stderr);
-
-  static ConvexPolygon staticPoly;      
-  float slice_z;
-
-  Vector4 vert1 = (Vector4(-10, -10, -0.5, 1));
-  Vector4 vert2 = (Vector4(-10, +10, -0.5, 1));
-  Vector4 vert3 = (Vector4(+10, +10, -0.5, 1));
-  Vector4 vert4 = (Vector4(+10, -10, -0.5, 1));
-
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_BLEND);
-  
-  for (int i=0; i<n_actual_slices; i++){
-    slice_z = zFar + i * z_step;        //back to front
-        
-    ConvexPolygon *poly;
-    poly = &staticPoly;
-    poly->vertices.clear();
-
-    //Setting Z-coordinate 
-    vert1.z = slice_z;
-    vert2.z = slice_z;
-    vert3.z = slice_z;
-    vert4.z = slice_z;
-                
-    poly->append_vertex(vert1);
-    poly->append_vertex(vert2);
-    poly->append_vertex(vert3);
-    poly->append_vertex(vert4);
-        
-    for(int k=0; k<6; k++){
-      poly->clip(volume_planes[k]);
-    }
-
-    poly->copy_vertices_to_texcoords();
-    //move the volume to the proper location
-
-    poly->transform(model_view_inverse);
-    poly->translate(shift_4d);
-    poly->transform(model_view);
-
-    glPushMatrix();
-    glScalef(volume[volume_index]->aspect_ratio_width, volume[volume_index]->aspect_ratio_height, volume[volume_index]->aspect_ratio_depth);
-    
-    //glPushMatrix();
-    //glMatrixMode(GL_MODELVIEW);
-    //glLoadIdentity();
-    //glScaled(volume[volume_index]->aspect_ratio_width, volume[volume_index]->aspect_ratio_height, volume[volume_index]->aspect_ratio_depth);
-
-    /*
-    //draw slice lines only
-    glDisable(GL_BLEND);
-    glDisable(GL_TEXTURE_3D);
-    glDisable(GL_TEXTURE_2D);
-    glLineWidth(1.0);
-    glColor3f(1,1,1);
-    glBegin(GL_LINE_LOOP);
-      poly->Emit(false);
-    glEnd();
-    */
-    
-    activate_one_volume_shader(volume_index, n_actual_slices);
-    glPopMatrix();
-
-    glBegin(GL_POLYGON);
-      poly->Emit(true); 
-    glEnd();
-
-    deactivate_one_volume_shader();
-                
-  }
-
-  glDisable(GL_BLEND);
-  glDisable(GL_DEPTH_TEST);
-  //glPopMatrix();
-}
-
 
 void draw_3d_axis(){
@@ -1650 +1423 @@
      //render volume :1
      volume[1]->location =Vector3(0., 0., 0.);
-     render_volume(1, 256);
+     //render_volume(1, 256);
+     vol_render->render(0);
+
      //fprintf(stderr, "%lf\n", get_time_interval());
    perf->disable();
@@ -1663 +1438 @@
 #endif
 
-   display_final_fbo();
+   display_final_fbo(); //display the final rendering on screen
 
 #ifdef XINETD
    read_screen();
-   //glClear(GL_COLOR_BUFFER_BIT);
-   //glDrawPixels(win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
-#endif
+#else
+   //read_screen();
+#endif   
+
    glutSwapBuffers(); 
 }
@@ -1795 +1571 @@
                 live_specular+=1;
                 fprintf(stderr, "specular: %f\n", live_specular);
+                vol_render->set_specular(live_specular);
                 break;
         case 'p':
                 live_specular-=1;
                 fprintf(stderr, "specular: %f\n", live_specular);
+                vol_render->set_specular(live_specular);
                 break;
         case '[':
                 live_diffuse+=0.5;
+                vol_render->set_diffuse(live_diffuse);
                 break;
         case ']':
                 live_diffuse-=0.5;
+                vol_render->set_diffuse(live_diffuse);
                 break;
 
@@ -1845 +1625 @@
       left_last_y = y;
 
-      update_rot(delta_y, delta_x);
+      update_rot(-delta_y, -delta_x);
     }
     else if (right_down){

trunk/gui/vizservers/nanovis/nanovis.h

@@ -34 +34 @@
 #include "Texture1D.h"
 #include "TransferFunction.h"
-#include "ConvexPolygon.h"
 #include "Mat4x4.h"
 #include "Volume.h"
@@ -41 +40 @@
 #include "Event.h"
 #include "Lic.h"
+#include "VolumeRenderer.h"
 
 #include "config.h"