Changeset 467

Timestamp:

Jun 8, 2006 4:50:10 PM (18 years ago)

Author:

mmc

Message:

Last minute fixes so we can deploy the nanoVIS server:

• Added monitor.tcl script which monitors nanoscale and restarts as needed.
• Fixed relative paths for shaders and fonts. All shaders and fonts are

taken from /opt/nanovis/lib

• Fixed the ordering of data for the nanowire simulator

Location:

trunk/gui/vizservers

Files:

• nanoscale/Makefile (modified) (1 diff)
• nanoscale/monitor.tcl (added)
• nanovis/Lic.cpp (modified) (1 diff)
• nanovis/Makefile (modified) (2 diffs)
• nanovis/ParticleSystem.cpp (modified) (1 diff)
• nanovis/PlaneRenderer.cpp (modified) (1 diff)
• nanovis/VolumeRenderer.cpp (modified) (2 diffs)
• nanovis/nanovis.cpp (modified) (4 diffs)

trunk/gui/vizservers/nanoscale/Makefile

@@ -2 +2 @@
 LDFLAGS =
 TARGETS = server client mycat
+INSTALL_DIR     = /opt/nanovis
 
 all: $(TARGETS)
+
+install: server
+        cp server $(INSTALL_DIR)/bin/nanoscale
 
 client: client.o clientlib.o

trunk/gui/vizservers/nanovis/Lic.cpp

@@ -89 +89 @@
   assert(glGetError()==0);
 
-  m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/render_vel.cg");
+  m_render_vel_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/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");

trunk/gui/vizservers/nanovis/Makefile

@@ -14 +14 @@
 TFSRC = ./transfer-function
 NANOSCALESRC = ./nanoscale
+INSTALL_DIR = /opt/nanovis
 
 LIB_NANOVIS = -ltcl8.3 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
@@ -21 +22 @@
 
 all: nanovis
+
+install: nanovis
+        cp nanovis $(INSTALL_DIR)/bin
 
 clean:

trunk/gui/vizservers/nanovis/ParticleSystem.cpp

@@ -66 +66 @@
   m_g_context = context;
 
-  m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/update_pos.cg");
+  m_pos_fprog = loadProgram(m_g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/update_pos.cg");
   m_pos_timestep_param  = cgGetNamedParameter(m_pos_fprog, "timestep");
   m_vel_tex_param = cgGetNamedParameter(m_pos_fprog, "vel_tex");

trunk/gui/vizservers/nanovis/PlaneRenderer.cpp

@@ -35 +35 @@
   
   //plane rendering shader
-  m_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/one_plane.cg");
+  m_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/one_plane.cg");
   m_data_param = cgGetNamedParameter(m_fprog, "data");
   m_tf_param = cgGetNamedParameter(m_fprog, "tf");

trunk/gui/vizservers/nanovis/VolumeRenderer.cpp

@@ -27 +27 @@
 
   init_shaders();
-  init_font("./font/Font.bmp");
+  init_font("/opt/nanovis/lib/font/Font.bmp");
 }
 
@@ -37 +37 @@
   
   //standard vertex program
-  m_vert_std_vprog = loadProgram(g_context, CG_PROFILE_VP30, CG_SOURCE, "./shaders/vertex_std.cg");
+  m_vert_std_vprog = loadProgram(g_context, CG_PROFILE_VP30, CG_SOURCE, "/opt/nanovis/lib/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");
 
   //volume rendering shader
-  m_one_volume_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "./shaders/one_volume.cg");
+  m_one_volume_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, "/opt/nanovis/lib/shaders/one_volume.cg");
   m_vol_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "volume");
   //cgGLSetTextureParameter(m_vol_one_volume_param, _vol->id);

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -1639 +1639 @@
             double dval;
             int nread = 0;
+            int ixy = 0;
+            int iz = 0;
             while (!fin.eof() && nread < npts) {
                 if (!(fin >> dval).fail()) {
-                    field.define(nread++, dval);
+                    int nid = nxy*iz + ixy;
+                    field.define(nid, dval);
+
+                    nread++;
+                    if (++iz >= nz) {
+                        iz = 0;
+                        ixy++;
+                    }
                 }
             }
@@ -1679 +1688 @@
             // generate the uniformly sampled data that we need for a volume
             int ngen = 0;
-            for (int iz=0; iz < nz; iz++) {
+            for (iz=0; iz < nz; iz++) {
                 double zval = z0 + iz*dmin;
                 for (int iy=0; iy < ny; iy++) {
@@ -1847 +1856 @@
                             GL_TEXTURE_2D, final_color_tex, 0);
 
-        
   // initialize final depth renderbuffer
   glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, final_depth_rb);
@@ -1934 +1942 @@
 
 #ifdef NEW_CG
-    m_posvel_fprog = loadProgram(g_context, CG_PROFILE_FP40, CG_SOURCE, "./shaders/update_pos_vel.cg");
+    m_posvel_fprog = loadProgram(g_context, CG_PROFILE_FP40, CG_SOURCE, "/opt/nanovis/lib/shaders/update_pos_vel.cg");
     m_posvel_timestep_param  = cgGetNamedParameter(m_posvel_fprog, "timestep");
     m_posvel_damping_param   = cgGetNamedParameter(m_posvel_fprog, "damping");