Changeset 580 for trunk/gui/vizservers/nanovis

Timestamp:

Feb 20, 2007, 4:15:00 PM (18 years ago)

Author:

vrinside

Message:

 

Location:

trunk/gui/vizservers/nanovis

Files:

• Camera.cpp (modified) (3 diffs)
• Camera.h (modified) (2 diffs)
• Nv.cpp (added)
• Nv.h (added)
• NvColorTableRenderer.cpp (added)
• NvColorTableRenderer.h (added)
• NvColorTableShader.cpp (added)
• NvColorTableShader.h (added)
• NvDefaultTFData.cpp (added)
• NvLoadFile.cpp (added)
• NvLoadFile.h (added)
• NvRegularVolumeShader.cpp (added)
• NvRegularVolumeShader.h (added)
• NvShader.cpp (added)
• NvShader.h (added)
• NvVolQDVolume.cpp (added)
• NvVolQDVolume.h (added)
• NvVolQDVolumeShader.cpp (added)
• NvVolQDVolumeShader.h (added)
• NvVolumeShader.cpp (added)
• NvVolumeShader.h (added)
• NvZincBlendeVolumeShader.cpp (added)
• NvZincBlendeVolumeShader.h (added)
• R2 (added)
• R2/include (added)
• R2/include/R2 (added)
• R2/include/R2/R2.h (added)
• R2/include/R2/R2FilePath.h (added)
• R2/include/R2/R2Fonts.h (added)
• R2/include/R2/R2Object.h (added)
• R2/include/R2/R2string.h (added)
• R2/src (added)
• R2/src/R2FilePath.cpp (added)
• R2/src/R2Fonts.cpp (added)
• R2/src/R2Object.cpp (added)
• R2/src/R2string.cpp (added)
• Volume.h (modified) (1 diff)
• VolumeRenderer.cpp (modified) (6 diffs)
• VolumeRenderer.h (modified) (3 diffs)
• ZincBlendeVolume.cpp (modified) (1 diff)
• ZincBlendeVolume.h (modified) (1 diff)
• nanovis.cpp (modified) (41 diffs)
• resources (added)
• resources/verdana.fnt (added)
• resources/verdana_bold.fnt (added)
• shaders/zincblende_volume.cg (modified) (1 diff)
• start_server (modified) (1 diff)

trunk/gui/vizservers/nanovis/Camera.cpp

@@ -17 +17 @@
 #include "Camera.h"
 
-Camera::Camera(int w, int h,
+Camera::Camera(int startx, int starty, int w, int h,
                 double loc_x, double loc_y, double loc_z, 
                 double target_x, double target_y, double target_z,
                 int angle_x, int angle_y, int angle_z):
+     startX(startx),
+     startY(starty),
          width(w),
          height(h),
@@ -46 +48 @@
 void Camera::activate(){
   //fprintf(stderr, "camera: %d, %d\n", width, height);
-  glViewport(0, 0, width, height);
+  glViewport(startX, startY, width, height);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-  gluPerspective(30, (GLdouble)width/(GLdouble)height, 0.1, 50.0);
+  gluPerspective(30, (GLdouble)(width - startX)/(GLdouble)(height - startY), 0.1, 50.0);
 
   glMatrixMode(GL_MODELVIEW);
@@ -63 +65 @@
 }
 
-void Camera::set_screen_size(int w, int h){
+void Camera::set_screen_size(int sx, int sy, int w, int h){
   width = w; height = h;
+  startX = sx; startY = sy;
 }

trunk/gui/vizservers/nanovis/Camera.h

@@ -30 +30 @@
         int width;      //screen size
         int height;     //screen size
+    int startX;
+    int startY;
 
         ~Camera();
-        Camera(int w, int h,
+        Camera(int startx, int starty, int w, int h,
                 double loc_x, double loc_y, double loc_z, 
                 double target_x, double target_y, double target_z,
@@ -40 +42 @@
         void rotate(double angle_x, double angle_y, double angle_z); //change target point
         void activate();//make the camera setting active, this has to be called before drawing things.
-        void set_screen_size(int w, int h);
+        void set_screen_size(int startx, int starty, int w, int h);
 };
 

trunk/gui/vizservers/nanovis/Volume.h

@@ -40 +40 @@
 
 
-enum {CUBIC, ZINCBLENDE};
+enum {CUBIC, VOLQD, ZINCBLENDE};
 
 

trunk/gui/vizservers/nanovis/VolumeRenderer.cpp

@@ -30 +30 @@
 }
 
-
-VolumeRenderer::~VolumeRenderer(){}
+VolumeRenderer::~VolumeRenderer()
+{
+    delete m_zincBlendeShader;
+    delete m_regularVolumeShader;
+    delete m_volQDVolumeShader;
+}
 
 //initialize the volume shaders
@@ -43 +47 @@
 
   //volume rendering shader: one cubic volume
-  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);
-  m_tf_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "tf");
-  //m_tf_cut_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "tf_cutplane");
-  //cgGLSetTextureParameter(m_tf_one_volume_param, _tf->id);
-  m_mvi_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelViewInv");
-  m_mv_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelView");
-  m_render_param_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "renderParameters");
-
-
+  m_regularVolumeShader = new NvRegularVolumeShader();
 
   //volume rendering shader: one zincblende orbital volume.
@@ -63 +57 @@
   //The engine is already capable of rendering multiple volumes and combine them. Thus, we just invoke this shader on
   //S, P, D and SS orbitals with different transfor functions. The result is a multi-orbital rendering.
-  m_zincblende_volume_fprog = loadProgram(g_context, CG_PROFILE_FP30, CG_SOURCE, 
-                                        "/opt/nanovis/lib/shaders/zincblende_volume.cg");
-
-  m_zincblende_tf_param = cgGetNamedParameter(m_zincblende_volume_fprog, "tf");
-  m_zincblende_volume_a_param = cgGetNamedParameter(m_zincblende_volume_fprog, "volumeA");
-  m_zincblende_volume_b_param = cgGetNamedParameter(m_zincblende_volume_fprog, "volumeB");
-  m_zincblende_cell_size_param = cgGetNamedParameter(m_zincblende_volume_fprog, "cellSize");
-  m_zincblende_mvi_param = cgGetNamedParameter(m_zincblende_volume_fprog, "modelViewInv");
-  m_zincblende_render_param = cgGetNamedParameter(m_zincblende_volume_fprog, "renderParameters");
-
+  m_zincBlendeShader = new NvZincBlendeVolumeShader();
+
+  m_volQDVolumeShader = new NvVolQDVolumeShader();
 }
 
@@ -125 +112 @@
 
 
-void VolumeRenderer::render_all(){
+void VolumeRenderer::render_all()
+{
   int total_rendered_slices = 0;
 
@@ -239 +227 @@
 
     ConvexPolygon static_poly;
-    for(int i=0; i<volume[volume_index]->get_cutplane_count(); i++){
+    for(int i=0; i<volume[volume_index]->get_cutplane_count(); i++)
+    {
       if(!volume[volume_index]->cutplane_is_enabled(i))
         continue;
@@ -692 +681 @@
   {
     //regular cubic volume
-    //
-
-    cgGLSetStateMatrixParameter(m_mvi_one_volume_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_INVERSE);
-    cgGLSetStateMatrixParameter(m_mv_one_volume_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY);
-    cgGLSetTextureParameter(m_vol_one_volume_param, volume[volume_index]->id);
-    cgGLSetTextureParameter(m_tf_one_volume_param, tf[volume_index]->id);
-    //cgGLSetTextureParameter(m_tf_cut_one_volume_param, tf_cut[volume_index]->id);
-    cgGLEnableTextureParameter(m_vol_one_volume_param);
-    cgGLEnableTextureParameter(m_tf_one_volume_param);
-    //cgGLEnableTextureParameter(m_tf_cut_one_volume_param);
-
-    if(!slice_mode)
-      cgGLSetParameter4f(m_render_param_one_volume_param, 
-                  volume[volume_index]->get_n_slice(), 
-                  volume[volume_index]->get_opacity_scale(), 
-                  volume[volume_index]->get_diffuse(), 
-                  volume[volume_index]->get_specular());
-    else
-      cgGLSetParameter4f(m_render_param_one_volume_param, 
-                  0.,
-                  volume[volume_index]->get_opacity_scale(), 
-                  volume[volume_index]->get_diffuse(), 
-                  volume[volume_index]->get_specular());
-
-    cgGLBindProgram(m_one_volume_fprog);
-    cgGLEnableProfile(CG_PROFILE_FP30);
+    m_regularVolumeShader->bind(tf[volume_index]->id, volume[volume_index], slice_mode);
   }
 
   else if (volume[volume_index]->volume_type == ZINCBLENDE)
   {
-    //zinc blende volume
-    ZincBlendeVolume* vol = (ZincBlendeVolume*) volume[volume_index];
-
-    cgGLSetStateMatrixParameter(m_zincblende_mvi_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_INVERSE);
-    cgGLSetTextureParameter(m_zincblende_tf_param, tf[volume_index]->id);
-    cgGLSetParameter4f(m_zincblende_cell_size_param, vol->cell_size.x, vol->cell_size.y, vol->cell_size.z, 0.);
-
-    cgGLSetTextureParameter(m_zincblende_volume_a_param, vol->zincblende_tex[0]->id);
-    cgGLSetTextureParameter(m_zincblende_volume_b_param, vol->zincblende_tex[1]->id);
-    cgGLEnableTextureParameter(m_zincblende_volume_a_param);
-    cgGLEnableTextureParameter(m_zincblende_volume_b_param);
-
-    if(!slice_mode)
-      cgGLSetParameter4f(m_zincblende_render_param, 
-                  vol->get_n_slice(), 
-                  vol->get_opacity_scale(), 
-                  vol->get_diffuse(), 
-                  vol->get_specular());
-    else
-      cgGLSetParameter4f(m_zincblende_render_param, 
-                  0.,
-                  vol->get_opacity_scale(), 
-                  vol->get_diffuse(), 
-                  vol->get_specular());
-
-    cgGLBindProgram(m_zincblende_volume_fprog);
-    cgGLEnableProfile(CG_PROFILE_FP30);
-
-  }
-}
-
-
-void VolumeRenderer::deactivate_volume_shader(){
+    m_zincBlendeShader->bind(tf[volume_index]->id, volume[volume_index], slice_mode);
+  }
+  else if (volume[volume_index]->volume_type == VOLQD)
+  {
+    m_volQDVolumeShader->bind(tf[volume_index]->id, volume[volume_index], slice_mode);
+  }
+}
+
+
+void VolumeRenderer::deactivate_volume_shader()
+{
   cgGLDisableProfile(CG_PROFILE_VP30);
-  cgGLDisableProfile(CG_PROFILE_FP30);
-
-  cgGLDisableTextureParameter(m_vol_one_volume_param);
-  cgGLDisableTextureParameter(m_tf_one_volume_param);
-
-  cgGLDisableTextureParameter(m_zincblende_volume_a_param);
-  cgGLDisableTextureParameter(m_zincblende_volume_b_param);
-  cgGLDisableTextureParameter(m_zincblende_tf_param);
+
+  m_regularVolumeShader->unbind();
+  m_zincBlendeShader->unbind();
 }
 

trunk/gui/vizservers/nanovis/VolumeRenderer.h

@@ -34 +34 @@
 #include "ZincBlendeVolume.h"
 #include "PerfQuery.h"
+#include "NvRegularVolumeShader.h"
+#include "NvVolQDVolumeShader.h"
+#include "NvZincBlendeVolumeShader.h"
 
 using namespace std;
 
-class VolumeRenderer{
+class VolumeRenderer {
 
 private:
@@ -52 +55 @@
 
   //shader parameters for rendering a single cubic volume
-  CGprogram m_one_volume_fprog;
-  CGparameter m_vol_one_volume_param;
-  CGparameter m_tf_one_volume_param;
-  CGparameter m_mvi_one_volume_param;
-  CGparameter m_mv_one_volume_param;
-  CGparameter m_render_param_one_volume_param;
+  NvRegularVolumeShader* m_regularVolumeShader;
+  NvVolQDVolumeShader* m_volQDVolumeShader;
 
 
@@ -68 +67 @@
   //S, P, D and SS orbitals with different transfor functions. The result is a multi-orbital rendering.
   //This is equivalent to rendering 4 unrelated data sets occupying the same space.
-  CGprogram m_zincblende_volume_fprog;
-  CGparameter m_zincblende_tf_param;  //four transfer functions
-  CGparameter m_zincblende_volume_a_param, m_zincblende_volume_b_param; //two cubic volumes (one zincblende orbital)
-  CGparameter m_zincblende_cell_size_param; //cell size in texture space
-  CGparameter m_zincblende_mvi_param; //modelview inverse matrix
-  CGparameter m_zincblende_render_param; //render parameters
+  NvZincBlendeVolumeShader* m_zincBlendeShader;
+  
   
   

trunk/gui/vizservers/nanovis/ZincBlendeVolume.cpp

@@ -22 +22 @@
                                         int w, int h, int d, float s, int n, 
                                         float* dataVolumeA, float* dataVolumeB,
-                                        double v0, double v1)
-                : Volume(x, y, z, w, h, d, s, n, dataVolumeA, v0, v1)
+                                        double v0, double v1, const Vector3& cellSize)
+                : Volume(x, y, z, w, h, d, s, n, dataVolumeA, v0, v1), cell_size(cellSize)
 {
   

trunk/gui/vizservers/nanovis/ZincBlendeVolume.h

@@ -36 +36 @@
                 int width, int height, int depth, float size, int n_component, 
                 float* dataVolumeA, float* dataVolumeB,
-                double vmin, double vmax);
+                double vmin, double vmax, const Vector3& cellSize);
 
         ~ZincBlendeVolume();

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -26 +26 @@
 #include <fcntl.h>
 
+#include "Nv.h"
+
 #include "nanovis.h"
 #include "RpField1D.h"
@@ -38 +40 @@
 #include "transfer-function/ColorPaletteWindow.h"
 #include "transfer-function/MainWindow.h"
+#include "ZincBlendeVolume.h"
+#include "NvLoadFile.h"
+#include "NvVolQDVolume.h"
+#include "NvColorTableRenderer.h"
+
+// R2 headers
+#include <R2/R2FilePath.h>
+#include <R2/R2Fonts.h>
 
 //render server
@@ -43 +53 @@
 VolumeRenderer* vol_render;
 PlaneRenderer* plane_render;
+NvColorTableRenderer* color_table_renderer;
 Camera* cam;
 
@@ -90 +101 @@
 
 int render_window;              //the handle of the render window;
+
 // forward declarations
 void init_particles();
@@ -100 +112 @@
 void bmp_header_add_int(unsigned char* header, int& pos, int data);
 void bmp_write(const char* cmd);
+void bmp_write_to_file();
+void display();
+void read_screen();
 
 ParticleSystem* psys;
@@ -130 +145 @@
 
 //Nvidia CG shaders and their parameters
-CGcontext g_context;
+//INSOO
+//CGcontext g_context;
 
 CGprogram m_passthru_fprog;
 CGparameter m_passthru_scale_param, m_passthru_bias_param;
 
+R2Fonts* g_fonts;
+
+/*
 CGprogram m_copy_texcoord_fprog;
-
 CGprogram m_one_volume_fprog;
 CGparameter m_vol_one_volume_param;
@@ -143 +161 @@
 CGparameter m_mv_one_volume_param;
 CGparameter m_render_param_one_volume_param;
-
+*/
+
+/*
 CGprogram m_vert_std_vprog;
 CGparameter m_mvp_vert_std_param;
 CGparameter m_mvi_vert_std_param;
+*/
 
 using namespace std;
@@ -155 +176 @@
 static Tcl_DString cmdbuffer;
 
+static int ScreenShotCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
 static int CameraCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
 static int CutplaneCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
@@ -257 +279 @@
                 "\": should be aim, angle, or zoom", (char*)NULL);
         return TCL_ERROR;
+}
+
+/*
+{
+  glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+
+  glViewport(0, 0, 1024, 1024);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  gluOrtho2D(0, render_width, 0, render_height);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+
+  glBegin(GL_QUADS);
+  glTexCoord2f(0, 0); glVertex2f(30, 30);
+  glTexCoord2f(1, 0); glVertex2f(1024 - 60, 30);
+  glTexCoord2f(1, 1); glVertex2f(1024 - 60, 1024 - 60);
+  glTexCoord2f(0, 1); glVertex2f(30, 1024 - 60);
+  glEnd();
+}
+*/
+
+static int
+ScreenShotCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
+{
+    int old_win_width = win_width;
+    int old_win_height = win_height;
+#ifdef XINETD
+    resize_offscreen_buffer(1024, 1024);
+    cam->set_screen_size(30, 90, 1024 - 60, 1024 - 120);
+    offscreen_buffer_capture();  //enable offscreen render
+    display();
+
+    // TBD
+    Volume* vol = volume[0];
+    TransferFunction* tf = vol_render->get_volume_shading(vol);
+    if (tf)
+    {
+        float data[512];
+        for (int i=0; i < 256; i++) {
+            data[i] = data[i+256] = (float)(i/255.0);
+        }
+        Texture2D* plane = new Texture2D(256, 2, GL_FLOAT, GL_LINEAR, 1, data);
+        color_table_renderer->render(1024, 1024, plane, tf, vol->range_min(), vol->range_max());
+        delete plane;
+    }
+
+    read_screen();
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+    // INSOO
+    // TBD
+    bmp_write_to_file();
+    //bmp_write("nv>screenshot -bytes");
+    resize_offscreen_buffer(old_win_width, old_win_height); 
+#endif
+
+
+        return TCL_OK;
 }
 
@@ -415 +496 @@
     plane_render->render();
 
+// INSOO
     glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, screen_buffer);
+    //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screen_buffer); // INSOO's
 
     std::ostringstream result;
@@ -568 +651 @@
         }
 
+        //INSOO
+        FILE* f = fopen("/tmp/aa.cpp", "wt");
+        fprintf(f, "float tfdata[] = {\n");
+        fprintf(f, "    ");
+        int num = nslots * 4;
+        for (i=0; i < num; i++) {
+            if (((i + 1) % 4) == 0)
+            {
+                fprintf(f, "\n    ");
+            }
+            fprintf(f, "%f, ", data[i]);
+        }
+        fclose(f);
+
         // find or create this transfer function
         int newEntry;
@@ -584 +681 @@
         return TCL_OK;
     }
+
+
     Tcl_AppendResult(interp, "bad option \"", argv[1],
         "\": should be define", (char*)NULL);
@@ -640 +739 @@
  * ----------------------------------------------------------------------
  */
+void NvLoadVolumeBinFile2(int index, char* filename);
 static int
 VolumeCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
@@ -985 +1085 @@
             ++iter;
         }
+        return TCL_OK;
+    }
+    else if (c == 'v' && strcmp(argv[1],"volqd") == 0) {
+        int n = n_volumes;
+
+        NvLoadVolumeBinFile(n, "/home/nanohub/vrinside/grid_1_0");
+
+        volume[n]->set_n_slice(256-n);
+        volume[n]->disable_cutplane(0);
+        volume[n]->disable_cutplane(1);
+        volume[n]->disable_cutplane(2);
+        vol_render->add_volume(volume[n], get_transfunc("default"));
+
+        return TCL_OK;
+    }
+    else if (c == 'z' && strcmp(argv[1],"zinc") == 0) {
+        int n = n_volumes;
+
+        NvLoadVolumeBinFile2(n, "/home/nanohub/vrinside/grid_1_0");
+
+        volume[n]->set_n_slice(256-n);
+        volume[n]->disable_cutplane(0);
+        volume[n]->disable_cutplane(1);
+        volume[n]->disable_cutplane(2);
+        vol_render->add_volume(volume[n], get_transfunc("default"));
+
+        return TCL_OK;
+    }
+    else if (c == 't' && strcmp(argv[1],"test2") == 0) {
+        volume[1]->disable_data();
+        volume[1]->disable();
         return TCL_OK;
     }
@@ -1810 +1941 @@
 }
 
+//INSOO
+extern float tfdefaultdata[];
+void load_volqd_volume(int index, int width, int height, int depth,
+    int n_component, float* data, double vmin, double vmax, Vector3& cellSize)
+{
+    while (n_volumes <= index) {
+        volume.push_back(NULL);
+        n_volumes++;
+    }
+
+    if (volume[index] != NULL) {
+        delete volume[index];
+        volume[index] = NULL;
+    }
+
+    volume[index] = new NvVolQDVolume(0.f, 0.f, 0.f, width, height, depth, 1.,
+                                 n_component, data, vmin, vmax, cellSize);
+
+    float dx0 = -0.5;
+    float dy0 = -0.5*height/width;
+    float dz0 = -0.5*depth/width;
+    volume[index]->move(Vector3(dx0, dy0, dz0));
+
+    // INSOO
+    // Tentatively
+    TransferFunction* tf = new TransferFunction(256, tfdefaultdata);
+    vol_render->shade_volume(volume[index], tf);
+}
+
+// INSOO
+void load_zinc_volume(int index, int width, int height, int depth,
+    int n_component, float* data, double vmin, double vmax, Vector3& cellSize)
+{
+    while (n_volumes <= index) {
+        volume.push_back(NULL);
+        n_volumes++;
+    }
+
+    if (volume[index] != NULL) {
+        delete volume[index];
+        volume[index] = NULL;
+    }
+
+    volume[index] = new ZincBlendeVolume(0.f, 0.f, 0.f, width, height, depth, 1.,
+                                 n_component, data, data, vmin, vmax, cellSize);
+
+    float dx0 = -0.5;
+    float dy0 = -0.5*height/width;
+    float dz0 = -0.5*depth/width;
+    volume[index]->move(Vector3(dx0, dy0, dz0));
+}
 
 // get a colormap 1D texture by name
@@ -1852 +2034 @@
 
 //initialize frame buffer objects for offscreen rendering
-void init_offscreen_buffer(){
+void init_offscreen_buffer()
+{
 
   //initialize final fbo for final display
@@ -1896 +2079 @@
 
   //fprintf(stderr, "screen_buffer size: %d\n", sizeof(screen_buffer));
+  printf("screen_buffer size: %d %d\n", w, h);
 
   if (screen_buffer) {
@@ -1901 +2085 @@
       screen_buffer = NULL;
   }
+
   screen_buffer = new unsigned char[4*win_width*win_height];
   assert(screen_buffer != NULL);
@@ -1914 +2099 @@
 
   //change the camera setting
-  cam->set_screen_size(win_width, win_height);
+  cam->set_screen_size(0, 0, win_width, win_height);
   plane_render->set_screen_size(win_width, win_height);
 
@@ -2062 +2247 @@
 void initGL(void) 
 { 
-   system_info();
-   init_glew();
+   g_fonts = new R2Fonts();
+   g_fonts->addFont("verdana", "verdana.fnt");
+   g_fonts->setFont("verdana");
 
    //buffer to store data read from the screen
@@ -2074 +2260 @@
 
    //create the camera with default setting
-   cam = new Camera(win_width, win_height, 
+   cam = new Camera(0, 0, win_width, win_height, 
                    live_obj_x, live_obj_y, live_obj_z,
                    0., 0., 100.,
@@ -2082 +2268 @@
    glShadeModel(GL_FLAT);
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
    glClearColor(0,0,0,1);
    glClear(GL_COLOR_BUFFER_BIT);
@@ -2118 +2305 @@
 
    init_offscreen_buffer();    //frame buffer object for offscreen rendering
-   init_cg();   //create cg shader context 
 
    //create volume renderer and add volumes to it
    vol_render = new VolumeRenderer(g_context);
 
+   color_table_renderer = new NvColorTableRenderer();
+   color_table_renderer->setFonts(g_fonts);
    
    /*
@@ -2187 +2375 @@
         (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
 
+    // get screenshot
+    Tcl_CreateCommand(interp, "screenshot", ScreenShotCmd,
+        (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+
     // create a default transfer function
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
@@ -2195 +2387 @@
 
 
-void read_screen(){
-  //glBindTexture(GL_TEXTURE_2D, 0);
-  //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
- 
+void read_screen()
+{
   glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, screen_buffer);
   assert(glGetError()==0);
@@ -2253 +2443 @@
 }
 
+// INSOO
+// FOR DEBUGGING
 void
-bmp_write(const char* cmd)
+bmp_write_to_file()
 {
     unsigned char header[54];
@@ -2317 +2509 @@
     }
 
+    FILE* f;
+    f = fopen("/tmp/image.bmp", "wb");
+    fwrite((void*) header, sizeof(header), 1, f);
+    fwrite((void*) screen_buffer, (3*win_width+pad)*win_height, 1, f);
+    fclose(f);
+}
+
+void
+bmp_write(const char* cmd)
+{
+    unsigned char header[54];
+    int pos = 0;
+    header[pos++] = 'B';
+    header[pos++] = 'M';
+
+    // BE CAREFUL:  BMP files must have an even multiple of 4 bytes
+    // on each scan line.  If need be, we add padding to each line.
+    int pad = 0;
+    if ((3*win_width) % 4 > 0) {
+        pad = 4 - ((3*win_width) % 4);
+    }
+
+    // file size in bytes
+    int fsize = (3*win_width+pad)*win_height + sizeof(header);
+    bmp_header_add_int(header, pos, fsize);
+
+    // reserved value (must be 0)
+    bmp_header_add_int(header, pos, 0);
+
+    // offset in bytes to start of bitmap data
+    bmp_header_add_int(header, pos, sizeof(header));
+
+    // size of the BITMAPINFOHEADER
+    bmp_header_add_int(header, pos, 40);
+
+    // width of the image in pixels
+    bmp_header_add_int(header, pos, win_width);
+
+    // height of the image in pixels
+    bmp_header_add_int(header, pos, win_height);
+
+    // 1 plane + (24 bits/pixel << 16)
+    bmp_header_add_int(header, pos, 1572865);
+
+    // no compression
+    // size of image for compression
+    bmp_header_add_int(header, pos, 0);
+    bmp_header_add_int(header, pos, 0);
+
+    // x pixels per meter
+    // y pixels per meter
+    bmp_header_add_int(header, pos, 0);
+    bmp_header_add_int(header, pos, 0);
+
+    // number of colors used (0 = compute from bits/pixel)
+    // number of important colors (0 = all colors important)
+    bmp_header_add_int(header, pos, 0);
+    bmp_header_add_int(header, pos, 0);
+
+    // BE CAREFUL: BMP format wants BGR ordering for screen data
+    unsigned char* scr = screen_buffer;
+    for (int row=0; row < win_height; row++) {
+        for (int col=0; col < win_width; col++) {
+            unsigned char tmp = scr[2];
+            scr[2] = scr[0];  // B
+            scr[0] = tmp;     // R
+            scr += 3;
+        }
+        scr += pad;  // skip over padding already in screen data
+    }
+
     std::ostringstream result;
     result << cmd << " " << fsize << "\n";
@@ -2323 +2586 @@
     write(0, header, sizeof(header));
     write(0, screen_buffer, (3*win_width+pad)*win_height);
+
 }
 
@@ -2390 +2654 @@
     //  Generate the latest frame and send it back to the client
     //
+    // INSOO
+    offscreen_buffer_capture();  //enable offscreen render
+
     display();
+
+    // INSOO
+#ifdef XINETD
+   read_screen();
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); 
+#else
+   display_offscreen_buffer(); //display the final rendering on screen
+   read_screen();
+   glutSwapBuffers(); 
+#endif   
 
 #if DO_RLE
@@ -2430 +2707 @@
 
 /*----------------------------------------------------*/
-void idle(){
+void idle()
+{
   glutSetWindow(render_window);
 
@@ -2450 +2728 @@
 
 
-void display_offscreen_buffer(){
+void display_offscreen_buffer()
+{
    glEnable(GL_TEXTURE_2D);
    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -2469 +2748 @@
    glTexCoord2f(0, 1); glVertex2f(0, win_height);
    glEnd();
-}
-
-void offscreen_buffer_capture(){
+
+}
+
+void offscreen_buffer_capture()
+{
    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
 }
@@ -2767 +3048 @@
 
 
-void draw_axis(){
+void draw_axis()
+{
 
   glDisable(GL_TEXTURE_2D);
@@ -2808 +3090 @@
    //psys->advect(); //advect particles
 
-   offscreen_buffer_capture();  //enable offscreen render
-   //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); //enable onscreen render
+// INSOO
+   //offscreen_buffer_capture();  //enable offscreen render
 
    //start final rendering
@@ -2870 +3152 @@
      glPopMatrix();
    }
-   else{
+   else {
      //2D rendering mode
      perf->enable();
@@ -2877 +3159 @@
    }
 
-
 #ifdef XINETD
    float cost  = perf->get_pixel_count();
@@ -2884 +3165 @@
    perf->reset();
 
-   display_offscreen_buffer(); //display the final rendering on screen
-
+/*
 #ifdef XINETD
-   read_screen();
+    read_screen();
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 #else
-   //read_screen();
-#endif   
-
-   glutSwapBuffers(); 
+    display_offscreen_buffer(); //display the final rendering on screen
+    read_screen();
+    glutSwapBuffers();
+#endif
+*/
 }
 
@@ -3089 +3371 @@
 void init_service(){
   //open log and map stderr to log file
-  xinetd_log = fopen("log.txt", "w");
+  xinetd_log = fopen("/tmp/log.txt", "w");
   close(2);
   dup2(fileno(xinetd_log), 2);
@@ -3140 +3422 @@
    
    glutInitWindowSize(win_width, win_height);
+
    glutInitWindowPosition(10, 10);
    render_window = glutCreateWindow(argv[0]);
@@ -3145 +3428 @@
 
 #ifndef XINETD
-   //MainTransferFunctionWindow * tf_window;
-   //tf_window = new MainTransferFunctionWindow();
-   //tf_window->mainInit();
-
    glutMouseFunc(mouse);
    glutMotionFunc(motion);
    glutKeyboardFunc(keyboard);
 #endif
+
    glutIdleFunc(idle);
    glutReshapeFunc(resize_offscreen_buffer);
 
+   NvInit();
+
+
    initGL();
    initTcl();
+
+
 
 #ifdef EVENTLOG
@@ -3169 +3454 @@
 
 #ifdef XINETD
-   end_service();
+    end_service();
 #endif
 
-   return 0;
-}
+    NvExit();
+
+    return 0;
+}

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

@@ -29 +29 @@
   PixelOut OUT;
 
-  float4 tex_coord = mul(modelViewInv, IN.TexCoord) + float4(0.5, 0.5, 0.5, 0.5);
+  // INSOO
+  //float4 tex_coord = mul(modelViewInv, IN.TexCoord) + float4(0.5, 0.5, 0.5, 0.5);
+  float4 tex_coord = mul(modelViewInv, IN.TexCoord);
   float4 twice_cell_size = cellSize * 2.0;
         

trunk/gui/vizservers/nanovis/start_server

@@ -11 +11 @@
 export DISPLAY
 
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin:/usr/bin/X11:/opt/nanovis/bin
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin:/usr/bin/X11:/home/nanohub/vrinside/rappture/gui/vizservers
 export PATH
 
-LD_LIBRARY_PATH="/opt/render/lib:/lib:/usr/lib:/usr/local/lib"
-export LD_LIBRARY_PATH
+#LD_LIBRARY_PATH="/opt/render/lib:/lib:/usr/lib:/usr/local/lib"
+#export LD_LIBRARY_PATH
 
-exec /opt/nanovis/bin/nanoscale -l 4000 -b 4001 -s 172.18.3.255 -c /opt/nanovis/bin/nanovis > /dev/null 2>&1
+exec /home/nanohub/vrinside/rappture/gui/vizservers/nanovis/nanoscale -l 2000 -b 2001 -s 128.210.189.255 -c "/home/nanohub/vrinside/rappture/gui/vizservers/nanovis/nanovis" > /dev/null 2>&1