- Timestamp:
- Apr 3, 2006, 8:56:23 PM (19 years ago)
- Location:
- trunk/gui/vizservers/nanovis
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/vizservers/nanovis/Makefile
r391 r396 56 56 57 57 simclient: Event.o nanoscale/EventPlayer.cpp 58 #gcc -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o $(LIB_CLIENT)59 g++ -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o58 gcc -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o $(LIB_CLIENT) 59 #g++ -g $(INCLUDES) $(NANOSCALESRC)/EventPlayer.cpp $(NANOSCALESRC)/clientlib.cpp -o simclient Event.o 60 60 61 61 Color.o: Color.cpp -
trunk/gui/vizservers/nanovis/ParticleSystem.cpp
r392 r396 113 113 flip = true; 114 114 reborn = false; 115 psys_frame = 0; 115 116 } 116 117 -
trunk/gui/vizservers/nanovis/config.h
r393 r396 18 18 //#define XINETD //enable render server 19 19 //#define EVENTLOG //enable event logging 20 //#define DO_RLE //do run length compression -
trunk/gui/vizservers/nanovis/nanovis.cpp
r393 r396 817 817 m_mvi_vert_std_param = cgGetNamedParameter(m_vert_std_vprog, "modelViewInv"); 818 818 819 /*820 m_pos_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/update_pos.cg");821 m_pos_timestep_param = cgGetNamedParameter(m_pos_fprog, "timestep");822 m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");823 m_pos_tex_param = cgGetNamedParameter(m_pos_fprog, "pos_tex");824 cgGLSetTextureParameter(m_vel_tex_param, volume[0]->id);825 */826 827 828 819 m_render_vel_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/render_vel.cg"); 829 820 m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex"); 830 821 m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal"); 831 822 cgGLSetTextureParameter(m_vel_tex_param_render_vel, volume[0]->id); 832 833 /*834 m_vel_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/update_vel.cg");835 m_vel_timestep_param = cgGetNamedParameter(m_vel_fprog, "timestep");836 m_vel_damping_param = cgGetNamedParameter(m_vel_fprog, "damping");837 m_vel_gravity_param = cgGetNamedParameter(m_vel_fprog, "gravity");838 m_vel_spherePos_param = cgGetNamedParameter(m_vel_fprog, "spherePos");839 m_vel_sphereVel_param = cgGetNamedParameter(m_vel_fprog, "sphereVel");840 */841 823 842 824 m_passthru_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/passthru.cg"); … … 894 876 bool particle = rand() % 256 > 150; 895 877 //particle = true; 896 if(particle) 878 if(particle) /*&& i/float(psys->psys_width)>0.3 && i/float(psys->psys_width)<0.7 879 && j/float(psys->psys_height)>0.1 && j/float(psys->psys_height)<0.4)*/ 897 880 { 898 881 //assign any location (x,y,z) in range [0,1] … … 1028 1011 1029 1012 1030 /*----------------------------------------------------*/1031 1013 void makePatterns(void) 1032 1014 { … … 1170 1152 display(); 1171 1153 1172 //read the image1173 //read_screen();1174 1154 #if DO_RLE 1175 1155 do_rle(); … … 1215 1195 glutSetWindow(render_window); 1216 1196 1217 /*1197 1218 1198 struct timespec ts; 1219 1199 ts.tv_sec = 0; 1220 ts.tv_nsec = 100000000;1200 ts.tv_nsec = 300000000; 1221 1201 nanosleep(&ts, 0); 1222 */1202 1223 1203 1224 1204 #ifdef XINETD … … 2025 2005 2026 2006 //enable fbo 2027 //fbo_capture();2007 fbo_capture(); 2028 2008 2029 2009 //convolve 2030 //lic();2010 lic(); 2031 2011 2032 2012 /* … … 2044 2024 2045 2025 //advect particles 2046 //psys->advect();2026 psys->advect(); 2047 2027 2048 2028 final_fbo_capture(); … … 2072 2052 //draw_3d_axis(); 2073 2053 2074 /*2075 2054 glPushMatrix(); 2076 2055 glScaled(volume[0]->aspect_ratio_width, … … 2090 2069 glDisable(GL_DEPTH_TEST); 2091 2070 glPopMatrix(); 2092 */2093 2071 2094 2072 //soft_display_verts(); 2095 2073 2096 /*2097 2074 glPushMatrix(); 2098 2075 … … 2108 2085 2109 2086 glPopMatrix(); 2110 */2111 2087 2112 2088 perf->enable(); … … 2117 2093 //render volume :1 2118 2094 volume[1]->location =Vector3(0., 0., 0.); 2119 render_volume(1, 100);2095 render_volume(1, 256); 2120 2096 //fprintf(stderr, "%lf\n", get_time_interval()); 2121 2097 perf->disable(); … … 2134 2110 #ifdef XINETD 2135 2111 read_screen(); 2136 glClear(GL_COLOR_BUFFER_BIT);2137 glDrawPixels(win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);2112 //glClear(GL_COLOR_BUFFER_BIT); 2113 //glDrawPixels(win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer); 2138 2114 #endif 2139 2115 glutSwapBuffers(); … … 2299 2275 2300 2276 //more coarse event handling 2301 if(abs(delta_x)<10 && abs(delta_y)<10)2302 return;2277 //if(abs(delta_x)<10 && abs(delta_y)<10) 2278 //return; 2303 2279 2304 2280 if(left_down){ -
trunk/gui/vizservers/nanovis/shaders/one_volume.cg
r393 r396 45 45 46 46 //sample the transfer function texture 47 //float4 color = tex1D(tf, sample.x);48 //color.w = 10*color.w/renderParameters.x;47 float4 color = tex1D(tf, sample.x); 48 color.w = 5*color.w/renderParameters.x; 49 49 50 float4 color = float4(sample.x, 0, 0, 1);50 //float4 color = float4(sample.x, 0, 0, 1); 51 51 52 52
Note: See TracChangeset
for help on using the changeset viewer.