Changeset 755 for trunk


Ignore:
Timestamp:
May 31, 2007 11:22:53 AM (17 years ago)
Author:
dkearney
Message:

added -p option to nanovis so we can add paths in a colon separated string.
removed all references to hard coded paths in /opt/nanovis
updated start_vis.sh script to include nanovis' -p flag and what a call to pymol might look like

Location:
trunk/vizservers
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/vizservers/nanovis/Lic.cpp

    r587 r755  
    1919#include <assert.h>
    2020
     21#include <R2/R2FilePath.h>
    2122#include "Lic.h"
    2223
    … …  
    8990  assert(glGetError()==0);
    9091
    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);
    9294  m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex");
    9395  m_plane_normal_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "plane_normal");

  • trunk/vizservers/nanovis/Nv.cpp

    r611 r755  
    119119}
    120120
    121 void NvInit()
     121void NvInit(char* path)
    122122{
    123     char* filepath = "./shaders:./resources:" \
    124                     "/opt/nanovis/lib/shaders:/opt/nanovis/lib/resources";
     123    if (path != NULL) {
     124        R2FilePath::getInstance()->setPath(path);
     125    }
    125126
    126     R2FilePath::getInstance()->setPath(filepath);
    127127    NvPrintSystemInfo();
    128128    NvInitGLEW();

  • trunk/vizservers/nanovis/Nv.h

    r580 r755  
    55#include <Cg/cg.h>
    66
    7 extern void NvInit();
     7extern void NvInit(char* path=NULL);
    88extern void NvExit();
    99

  • trunk/vizservers/nanovis/NvColorTableShader.cpp

    r580 r755  
     1#include <R2/R2FilePath.h>
    12#include "NvColorTableShader.h"
    23
    … …  
    1213void NvColorTableShader::init()
    1314{
    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);
    1618    cgGLLoadProgram(_cgFP);
    1719

  • trunk/vizservers/nanovis/NvLIC.cpp

    r587 r755  
    1919#include <assert.h>
    2020
     21#include <R2/R2FilePath.h>
    2122#include "NvLIC.h"
    2223
    … …  
    8990  assert(glGetError()==0);
    9091
    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);
    9294  m_vel_tex_param_render_vel = cgGetNamedParameter(m_render_vel_fprog, "vel_tex");
    9395  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>
    12#include "NvParticleAdvectionShader.h"
    23
    … …  
    1213void NvParticleAdvectionShader::init(const Vector3& scale)
    1314{
    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);
    1618
    1719    cgGLLoadProgram(_cgFP);

  • trunk/vizservers/nanovis/NvParticleRenderer.cpp

    r587 r755  
    1919#include <string.h>
    2020
     21#include <R2/R2FilePath.h>
    2122#include "NvParticleRenderer.h"
    2223
    … …  
    6869  m_g_context = context;
    6970
    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);
    7173  m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
    7274  m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");

  • trunk/vizservers/nanovis/NvRegularVolumeShader.cpp

    r580 r755  
     1#include <R2/R2FilePath.h>
    12#include "NvRegularVolumeShader.h"
    23
    … …  
    1213void NvRegularVolumeShader::init()
    1314{
    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);
    1617    cgGLLoadProgram(_cgFP);
    1718

  • trunk/vizservers/nanovis/ParticleSystem.cpp

    r587 r755  
    1919#include <string.h>
    2020
     21#include <R2/R2FilePath.h>
    2122#include "ParticleSystem.h"
    2223
    … …  
    6869  m_g_context = context;
    6970
    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);
    7173  m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
    7274  m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");

  • trunk/vizservers/nanovis/PlaneRenderer.cpp

    r467 r755  
    1414 */
    1515
     16#include <R2/R2FilePath.h>
    1617#include "PlaneRenderer.h"
    1718
    … …  
    3536 
    3637  //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);
    3840  m_data_param = cgGetNamedParameter(m_fprog, "data");
    3941  m_tf_param = cgGetNamedParameter(m_fprog, "tf");

  • trunk/vizservers/nanovis/nanovis.cpp

    r752 r755  
    1515 */
    1616
     17#include <getopt.h>
    1718#include <stdio.h>
    1819#include <math.h>
    … …  
    818819            }
    819820
    820             // err = buf.decode();
    821821            err = Rappture::encoding::decode(buf,RPENC_Z|RPENC_B64|RPENC_HDR);
    822822            if (err) {
    … …  
    32443244
    32453245
     3246
    32463247/*----------------------------------------------------*/
    32473248int 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
    32493275    R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
    32503276
    … …  
    32553281
    32563282   glutInit(&argc, argv);
    3257    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA); 
    3258    
     3283   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
     3284
    32593285   glutInitWindowSize(win_width, win_height);
    32603286
    … …  
    32723298   glutReshapeFunc(resize_offscreen_buffer);
    32733299
    3274    NvInit();
    3275 
     3300   NvInit(path);
    32763301   initGL();
    32773302   initTcl();

  • trunk/vizservers/start_viz.sh.in

    r754 r755  
    1313mkdir ${dir}/bin ${dir}/lib
    1414
    15 cp -r ${install_dir}/lib/shaders ${dir}
    16 cp -r ${install_dir}/lib/resources ${dir}
    17 cp ${install_dir}/lib/lib* ${dir}/lib
     15cp ${install_dir}/lib ${dir}
    1816cp ${install_dir}/bin/voronoi ${install_dir}/bin/nanoscale ${install_dir}/bin/nanovis ${dir}/bin
    1917
    2018cd ${dir}
    2119
    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.