Changeset 396

Timestamp:

Apr 3, 2006, 8:56:23 PM (18 years ago)

Author:

qiaow

Message:

In the process of adding Line Integral Convolution class

Location:

trunk/gui/vizservers/nanovis

Files:

• Lic.cpp (added)
• Lic.h (added)
• Makefile (modified) (1 diff)
• ParticleSystem.cpp (modified) (1 diff)
• config.h (modified) (1 diff)
• nanovis.cpp (modified) (13 diffs)
• shaders/one_volume.cg (modified) (1 diff)

trunk/gui/vizservers/nanovis/Makefile

@@ -56 +56 @@
 
 simclient: Event.o nanoscale/EventPlayer.cpp
-        #gcc -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o $(LIB_CLIENT)
-        g++ -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o
+        gcc -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o $(LIB_CLIENT)
+        #g++ -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o
 
 Color.o: Color.cpp

trunk/gui/vizservers/nanovis/ParticleSystem.cpp

@@ -113 +113 @@
   flip = true;
   reborn = false;
+  psys_frame = 0;
 }
 

trunk/gui/vizservers/nanovis/config.h

@@ -18 +18 @@
 //#define XINETD  //enable render server
 //#define EVENTLOG  //enable event logging
+//#define DO_RLE  //do run length compression

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -817 +817 @@
     m_mvi_vert_std_param = cgGetNamedParameter(m_vert_std_vprog, "modelViewInv");
 
-/*
-    m_pos_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/update_pos.cg");
-    m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
-    m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");
-    m_pos_tex_param = cgGetNamedParameter(m_pos_fprog, "pos_tex");
-    cgGLSetTextureParameter(m_vel_tex_param, volume[0]->id);
-*/
-  
-
     m_render_vel_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/render_vel.cg");
     m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex");
     m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal");
     cgGLSetTextureParameter(m_vel_tex_param_render_vel, volume[0]->id);
-
-    /*
-    m_vel_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/update_vel.cg");
-    m_vel_timestep_param  = cgGetNamedParameter(m_vel_fprog, "timestep");
-    m_vel_damping_param   = cgGetNamedParameter(m_vel_fprog, "damping");
-    m_vel_gravity_param   = cgGetNamedParameter(m_vel_fprog, "gravity");
-    m_vel_spherePos_param = cgGetNamedParameter(m_vel_fprog, "spherePos");
-    m_vel_sphereVel_param = cgGetNamedParameter(m_vel_fprog, "sphereVel");
-    */
 
     m_passthru_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/passthru.cg");
@@ -894 +876 @@
       bool particle = rand() % 256 > 150; 
       //particle = true;
-      if(particle)
+      if(particle) /*&& i/float(psys->psys_width)>0.3 && i/float(psys->psys_width)<0.7 
+                      && j/float(psys->psys_height)>0.1 && j/float(psys->psys_height)<0.4)*/
       {
         //assign any location (x,y,z) in range [0,1]
@@ -1028 +1011 @@
 
 
-/*----------------------------------------------------*/
 void makePatterns(void) 
 { 
@@ -1170 +1152 @@
     display();
 
-    //read the image
-    //read_screen(); 
 #if DO_RLE
     do_rle();
@@ -1215 +1195 @@
   glutSetWindow(render_window);
 
-  /*
+  
   struct timespec ts;
   ts.tv_sec = 0;
-  ts.tv_nsec = 100000000;
+  ts.tv_nsec = 300000000;
   nanosleep(&ts, 0);
-  */
+  
 
 #ifdef XINETD
@@ -2025 +2005 @@
 
    //enable fbo
-   //fbo_capture();
+   fbo_capture();
 
    //convolve
-   //lic();
+   lic();
 
    /*
@@ -2044 +2024 @@
    
    //advect particles
-   //psys->advect();
+   psys->advect();
 
    final_fbo_capture();
@@ -2072 +2052 @@
    //draw_3d_axis();
    
-   /*
    glPushMatrix();
    glScaled(volume[0]->aspect_ratio_width, 
@@ -2090 +2069 @@
    glDisable(GL_DEPTH_TEST);
    glPopMatrix();
-   */
    
    //soft_display_verts();
    
-   /*
    glPushMatrix();
 
@@ -2108 +2085 @@
 
    glPopMatrix();
-   */
 
    perf->enable();
@@ -2117 +2093 @@
      //render volume :1
      volume[1]->location =Vector3(0., 0., 0.);
-     render_volume(1, 100);
+     render_volume(1, 256);
      //fprintf(stderr, "%lf\n", get_time_interval());
    perf->disable();
@@ -2134 +2110 @@
 #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);
+   //glClear(GL_COLOR_BUFFER_BIT);
+   //glDrawPixels(win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
 #endif
    glutSwapBuffers(); 
@@ -2299 +2275 @@
 
     //more coarse event handling
-    if(abs(delta_x)<10 && abs(delta_y)<10)
-      return;
+    //if(abs(delta_x)<10 && abs(delta_y)<10)
+      //return;
 
     if(left_down){

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

@@ -45 +45 @@
 
       //sample the transfer function texture
-      //float4 color = tex1D(tf, sample.x);
-      //color.w = 10*color.w/renderParameters.x;
+      float4 color = tex1D(tf, sample.x);
+      color.w = 5*color.w/renderParameters.x;
 
-      float4 color = float4(sample.x, 0, 0, 1);
+      //float4 color = float4(sample.x, 0, 0, 1);