- Timestamp:
- May 31, 2007, 11:22:53 AM (17 years ago)
- Location:
- trunk/vizservers
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/vizservers/nanovis/Lic.cpp
r587 r755 19 19 #include <assert.h> 20 20 21 #include <R2/R2FilePath.h> 21 22 #include "Lic.h" 22 23 … … 89 90 assert(glGetError()==0); 90 91 91 m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/render_vel.cg"); 92 R2string path = R2FilePath::getInstance()->getPath("render_vel.cg"); 93 m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path); 92 94 m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex"); 93 95 m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal"); -
trunk/vizservers/nanovis/Nv.cpp
r611 r755 119 119 } 120 120 121 void NvInit( )121 void NvInit(char* path) 122 122 { 123 char* filepath = "./shaders:./resources:" \ 124 "/opt/nanovis/lib/shaders:/opt/nanovis/lib/resources"; 123 if (path != NULL) { 124 R2FilePath::getInstance()->setPath(path); 125 } 125 126 126 R2FilePath::getInstance()->setPath(filepath);127 127 NvPrintSystemInfo(); 128 128 NvInitGLEW(); -
trunk/vizservers/nanovis/Nv.h
r580 r755 5 5 #include <Cg/cg.h> 6 6 7 extern void NvInit( );7 extern void NvInit(char* path=NULL); 8 8 extern void NvExit(); 9 9 -
trunk/vizservers/nanovis/NvColorTableShader.cpp
r580 r755 1 #include <R2/R2FilePath.h> 1 2 #include "NvColorTableShader.h" 2 3 … … 12 13 void NvColorTableShader::init() 13 14 { 14 _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE, 15 "/opt/nanovis/lib/shaders/one_plane.cg", CG_PROFILE_FP30, "main", NULL); 15 R2string path = R2FilePath::getInstance()->getPath("one_plane.cg"); 16 _cgFP = cgCreateProgramFromFile(g_context, CG_SOURCE, 17 path, CG_PROFILE_FP30, "main", NULL); 16 18 cgGLLoadProgram(_cgFP); 17 19 -
trunk/vizservers/nanovis/NvLIC.cpp
r587 r755 19 19 #include <assert.h> 20 20 21 #include <R2/R2FilePath.h> 21 22 #include "NvLIC.h" 22 23 … … 89 90 assert(glGetError()==0); 90 91 91 m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/render_vel.cg"); 92 R2string path = R2FilePath::getInstance()->getPath("render_vel.cg"); 93 m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path); 92 94 m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex"); 93 95 m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal"); -
trunk/vizservers/nanovis/NvParticleAdvectionShader.cpp
r585 r755 1 #include <R2/R2FilePath.h> 1 2 #include "NvParticleAdvectionShader.h" 2 3 … … 12 13 void NvParticleAdvectionShader::init(const Vector3& scale) 13 14 { 14 _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE, 15 "/opt/nanovis/lib/shaders/update_pos.cg", CG_PROFILE_FP30, "main", NULL); 15 R2string path = R2FilePath::getInstance()->getPath("update_pos.cg"); 16 _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE, path, 17 CG_PROFILE_FP30, "main", NULL); 16 18 17 19 cgGLLoadProgram(_cgFP); -
trunk/vizservers/nanovis/NvParticleRenderer.cpp
r587 r755 19 19 #include <string.h> 20 20 21 #include <R2/R2FilePath.h> 21 22 #include "NvParticleRenderer.h" 22 23 … … 68 69 m_g_context = context; 69 70 70 m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/update_pos.cg"); 71 R2string path = R2FilePath::getInstance()->getPath("update_pos.cg"); 72 m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path); 71 73 m_pos_timestep_param = cgGetNamedParameter(m_pos_fprog, "timestep"); 72 74 m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex"); -
trunk/vizservers/nanovis/NvRegularVolumeShader.cpp
r580 r755 1 #include <R2/R2FilePath.h> 1 2 #include "NvRegularVolumeShader.h" 2 3 … … 12 13 void NvRegularVolumeShader::init() 13 14 { 14 _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE,15 "/opt/nanovis/lib/shaders/one_volume.cg", CG_PROFILE_FP30, "main", NULL);15 R2string path = R2FilePath::getInstance()->getPath("one_volume.cg"); 16 _cgFP= cgCreateProgramFromFile(g_context, CG_SOURCE, path, CG_PROFILE_FP30, "main", NULL); 16 17 cgGLLoadProgram(_cgFP); 17 18 -
trunk/vizservers/nanovis/ParticleSystem.cpp
r587 r755 19 19 #include <string.h> 20 20 21 #include <R2/R2FilePath.h> 21 22 #include "ParticleSystem.h" 22 23 … … 68 69 m_g_context = context; 69 70 70 m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/update_pos.cg"); 71 R2string path = R2FilePath::getInstance()->getPath("update_pos.cg"); 72 m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, path); 71 73 m_pos_timestep_param = cgGetNamedParameter(m_pos_fprog, "timestep"); 72 74 m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex"); -
trunk/vizservers/nanovis/PlaneRenderer.cpp
r467 r755 14 14 */ 15 15 16 #include <R2/R2FilePath.h> 16 17 #include "PlaneRenderer.h" 17 18 … … 35 36 36 37 //plane rendering shader 37 m_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/one_plane.cg"); 38 R2string path = R2FilePath::getInstance()->getPath("one_plane.cg"); 39 m_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, path); 38 40 m_data_param = cgGetNamedParameter(m_fprog, "data"); 39 41 m_tf_param = cgGetNamedParameter(m_fprog, "tf"); -
trunk/vizservers/nanovis/nanovis.cpp
r752 r755 15 15 */ 16 16 17 #include <getopt.h> 17 18 #include <stdio.h> 18 19 #include <math.h> … … 818 819 } 819 820 820 // err = buf.decode();821 821 err = Rappture::encoding::decode(buf,RPENC_Z|RPENC_B64|RPENC_HDR); 822 822 if (err) { … … 3244 3244 3245 3245 3246 3246 3247 /*----------------------------------------------------*/ 3247 3248 int main(int argc, char** argv) 3248 { 3249 { 3250 3251 char path [1000]; 3252 while(1) { 3253 int c; 3254 int this_option_optind = optind ? optind : 1; 3255 int option_index = 0; 3256 struct option long_options[] = { 3257 // name, has_arg, flag, val 3258 { 0,0,0,0 }, 3259 }; 3260 3261 c = getopt_long(argc, argv, "+p:", long_options, &option_index); 3262 if (c == -1) 3263 break; 3264 3265 switch(c) { 3266 case 'p': 3267 strncpy(path, optarg, sizeof(path)); 3268 break; 3269 default: 3270 fprintf(stderr,"Don't know what option '%c'.\n", c); 3271 return 1; 3272 } 3273 } 3274 3249 3275 R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv); 3250 3276 … … 3255 3281 3256 3282 glutInit(&argc, argv); 3257 glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA); 3258 3283 glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA); 3284 3259 3285 glutInitWindowSize(win_width, win_height); 3260 3286 … … 3272 3298 glutReshapeFunc(resize_offscreen_buffer); 3273 3299 3274 NvInit(); 3275 3300 NvInit(path); 3276 3301 initGL(); 3277 3302 initTcl(); -
trunk/vizservers/start_viz.sh.in
r754 r755 13 13 mkdir ${dir}/bin ${dir}/lib 14 14 15 cp -r ${install_dir}/lib/shaders ${dir} 16 cp -r ${install_dir}/lib/resources ${dir} 17 cp ${install_dir}/lib/lib* ${dir}/lib 15 cp ${install_dir}/lib ${dir} 18 16 cp ${install_dir}/bin/voronoi ${install_dir}/bin/nanoscale ${install_dir}/bin/nanovis ${dir}/bin 19 17 20 18 cd ${dir} 21 19 22 ${dir}/bin/nanoscale -l 2000 -b 2000 -s 172.18.3.255 -c ${dir}/bin/nanovis 20 ${dir}/bin/nanoscale -d -b 2000 -s 172.18.3.255 -l 2000 -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources" 21 #${dir}/bin/nanoscale -b 2000 -s 172.18.3.255 -l 2020 -c "${dir}/bin/pymolproxy /opt/pymol/bin/pymol -p -q -i -x -X 0 -Y 0" 22 #${dir}/bin/nanoscale -b 2000 -s 172.18.3.255 -l 2000 -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources" -l 2020 -c "${dir}/bin/pymolproxy /opt/pymol/bin/pymol -p -q -i -x -X 0 -Y 0"
Note: See TracChangeset
for help on using the changeset viewer.