Changeset 776

Timestamp:

Jul 9, 2007 4:55:19 PM (17 years ago)

Author:

vrinside

Message:

Add 3D surface plot and grid rendering

Location:

trunk/vizservers/nanovis

Files:

• ContourLineFilter.cpp (added)
• ContourLineFilter.h (added)
• Grid.cpp (added)
• Grid.h (added)
• HeightMap.cpp (added)
• HeightMap.h (added)
• Makefile.in (modified) (2 diffs)
• Nv.cpp (modified) (3 diffs)
• NvShader.cpp (modified) (2 diffs)
• NvShader.h (modified) (1 diff)
• R2/include/R2/graphics (added)
• R2/include/R2/graphics/R2Geometry.h (added)
• R2/include/R2/graphics/R2IndexBuffer.h (added)
• R2/include/R2/graphics/R2VertexBuffer.h (added)
• R2/src/R2Geometry.cpp (added)
• R2/src/R2IndexBuffer.cpp (added)
• R2/src/R2VertexBuffer.cpp (added)
• TransferFunction.h (modified) (1 diff)
• TypeDefs.h (added)
• Volume.cpp (modified) (2 diffs)
• Volume.h (modified) (4 diffs)
• ZincBlendeVolume.cpp (modified) (1 diff)
• ZincBlendeVolume.h (modified) (1 diff)
• nanovis.cpp (modified) (29 diffs)
• shaders/heightcolor.cg (added)
• shaders/one_volume.cg (modified) (1 diff)

trunk/vizservers/nanovis/Makefile.in

@@ -39 +39 @@
                 NvLoadFile.o NvDefaultTFData.o NvColorTableShader.o NvColorTableRenderer.o NvParticleAdvectionShader.o \
                 NvEventLog.o NvParticleRenderer.o NvLIC.o NvZincBlendeReconstructor.o NvStdVertexShader.o \
-                R2string.o R2FilePath.o R2Fonts.o R2Object.o
+                ContourLineFilter.o HeightMap.o Grid.o \
+                R2string.o R2FilePath.o R2Fonts.o R2Object.o R2Geometry.o R2IndexBuffer.o R2VertexBuffer.o
 
 all: nanovis
@@ -97 +98 @@
 R2Object.o: R2/src/R2Object.cpp $(R2INC)/R2/R2Object.h
         $(CC) $(CFLAGS) -o $@ -c $<
-
-
+R2Geometry.o: R2/src/R2Geometry.cpp $(R2INC)/R2/graphics/R2Geometry.h
+        $(CC) $(CFLAGS) -o $@ -c $<
+R2VertexBuffer.o: R2/src/R2VertexBuffer.cpp $(R2INC)/R2/graphics/R2VertexBuffer.h
+        $(CC) $(CFLAGS) -o $@ -c $<
+R2IndexBuffer.o: R2/src/R2IndexBuffer.cpp $(R2INC)/R2/graphics/R2IndexBuffer.h
+        $(CC) $(CFLAGS) -o $@ -c $<
 
 NvStdVertexShader.o: NvStdVertexShader.cpp NvStdVertexShader.h
+ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
+HeightMap.o: HeightMap.cpp HeightMap.h
+Grid.o: Grid.cpp Grid.h
 NvLoadFile.o: NvLoadFile.cpp NvLoadFile.h
 NvParticleAdvectionShader.o: NvParticleAdvectionShader.cpp NvParticleAdvectionShader.h

trunk/vizservers/nanovis/Nv.cpp

@@ -5 +5 @@
 #include "NvEventLog.h"
 #include "VolumeRenderer.h"
+#include "Grid.h"
 #include <R2/R2FilePath.h>
 #include <stdio.h>
@@ -16 +17 @@
 VolumeRenderer* g_vol_render;
 R2Fonts* g_fonts;
+Grid* g_grid;
 
 //query opengl information
@@ -130 +132 @@
 
     g_fonts = new R2Fonts();
-    // INSOO
-    //g_fonts->addFont("verdana", "verdana.fnt");
-    //g_fonts->setFont("verdana");
+    g_fonts->addFont("verdana", "verdana.fnt");
+    g_fonts->setFont("verdana");
 
     //g_color_table_renderer = new NvColorTableRenderer();
     // INSOO
     //g_color_table_renderer->setFonts(g_fonts);
+
+    g_grid = new Grid();
+    g_grid->setFont(g_fonts);
 
     NvInitVolumeRenderer();

trunk/vizservers/nanovis/NvShader.cpp

@@ -1 +1 @@
 #include "NvShader.h"
+#include <stdio.h>
 
 CGcontext g_context = 0;
@@ -17 +18 @@
 }
 
+void NvShader::loadVertexProgram(const char* fileName, const char* entryPoint)
+{
+    resetPrograms();
+
+    printf("[%s] loading\n", fileName);
+    _cgVP = cgCreateProgramFromFile(g_context, CG_SOURCE, fileName, CG_PROFILE_VP30,
+                            entryPoint, NULL);
+
+    cgGLLoadProgram(_cgVP);
+}
+
+void NvShader::loadFragmentProgram(const char* fileName, const char* entryPoint)
+{
+    printf("[%s] loading\n", fileName);
+    _cgFP = cgCreateProgramFromFile(g_context, CG_SOURCE, fileName, CG_PROFILE_FP30,
+                            entryPoint, NULL);
+
+    cgGLLoadProgram(_cgFP);
+}
+
+void NvShader::resetPrograms()
+{
+    if (_cgVP != 0)
+    {
+        cgDestroyProgram(_cgVP);
+    }
+
+    if (_cgFP != 0)
+    {
+        cgDestroyProgram(_cgFP);
+    }
+}

trunk/vizservers/nanovis/NvShader.h

@@ -10 +10 @@
     CGprogram _cgFP;
 
-protected :
+public :
     NvShader();
 
 public :
     virtual ~NvShader();
+
+protected :
+    void resetPrograms();
+public :
+    /**
+     * @brief create a Cg vertex program and load it
+     * @param fileName the name of Cg program file
+     * @param entryPoint a entry point of the Cg program
+     */
+    void loadVertexProgram(const char* fileName, const char* entryPoint);
+
+    /**
+     * @brief create a Cg fragment program and load it
+     * @param fileName the name of Cg program file
+     * @param entryPoint a entry point of the Cg program
+     */
+    void loadFragmentProgram(const char* fileName, const char* entryPoint);
+    
+    CGparameter getNamedParameterFromFP(const char* paramName);
+    CGparameter getNamedParameterFromVP(const char* paramName);
+
+    CGprogram getVP() const;
+    CGprogram getFP() const;
 };
 
 extern CGcontext g_context;
 
+inline CGparameter NvShader::getNamedParameterFromFP(const char* paramName)
+{
+    if (_cgFP)
+    {
+        return cgGetNamedParameter(_cgFP, paramName);
+    }
+
+    return 0;
+}
+
+inline CGparameter NvShader::getNamedParameterFromVP(const char* paramName)
+{
+    if (_cgVP)
+    {
+        return cgGetNamedParameter(_cgVP, paramName);
+    }
+
+    return 0;
+}
+
+inline CGprogram NvShader::getVP() const
+{
+    return _cgVP;
+}
+
+inline CGprogram NvShader::getFP() const
+{
+    return _cgFP;
+}
+
 #endif // 
 

trunk/vizservers/nanovis/TransferFunction.h

@@ -31 +31 @@
   ~TransferFunction();
   void update(float* data);
+    Texture1D* getTexture();
 };
 
+inline Texture1D* TransferFunction::getTexture()
+{
+    return tex;
+}
 
 #endif

trunk/vizservers/nanovis/Volume.cpp

@@ -20 +20 @@
 Volume::Volume(float x, float y, float z,
                 int w, int h, int d, float s, 
-                int n, float* data, double v0, double v1):
+                int n, float* data, double v0, double v1, double nz_min):
         width(w),
         height(h),
@@ -27 +27 @@
         n_components(n),
         vmin(v0),
-        vmax(v1),
+        vmax(v1), 
+    nonzero_min(nz_min),
         enabled(true),
         n_slice(256), // default value

trunk/vizservers/nanovis/Volume.h

@@ -44 +44 @@
 
 class Volume{
-        
-
 public:
         int volume_type;        //cubic or zincblende
@@ -53 +51 @@
 
         Texture3D* tex; //OpenGL texture storing the volume
-        double vmin;    //minimum (unscaled) value in data
-        double vmax;    //maximum (unscaled) value in data
+    double vmin;    //minimum (unscaled) value in data
+    double vmax;    //maximum (unscaled) value in data
+    double nonzero_min;
 
         float specular; //specular lighting parameter
@@ -89 +88 @@
         Volume(float x, float y, float z, 
                         int width, int height, int depth, float size,
-                        int n_component, float* data, double vmin, double vmax);
+                        int n_component, float* data, double vmin, double vmax, double nonzero_min);
         ~Volume();
         
@@ -100 +99 @@
         double range_min() { return vmin; }
         double range_max() { return vmax; }
+    double range_nzero_min() { return nonzero_min; }
 
         void set_n_slice(int val); //set number of slices

trunk/vizservers/nanovis/ZincBlendeVolume.cpp

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

trunk/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, const Vector3& cellSize);
+                double vmin, double vmax, double non_zeromin, const Vector3& cellSize);
 
         ~ZincBlendeVolume();

trunk/vizservers/nanovis/nanovis.cpp

@@ -48 +48 @@
 #include "NvEventLog.h"
 #include "NvZincBlendeReconstructor.h"
+#include "HeightMap.h"
+#include "Grid.h"
 
 // R2 headers
@@ -57 +59 @@
 extern VolumeRenderer* g_vol_render;
 extern NvColorTableRenderer* g_color_table_renderer;
+extern Grid* g_grid;
 PlaneRenderer* plane_render;
 Camera* cam;
@@ -107 +110 @@
 
 int render_window;              //the handle of the render window;
+bool axis_on = true;
 
 // forward declarations
@@ -112 +116 @@
 void get_slice_vectors();
 Rappture::Outcome load_volume_stream(int index, std::iostream& fin);
-void load_volume(int index, int width, int height, int depth, int n_component, float* data, double vmin, double vmax);
+void load_volume(int index, int width, int height, int depth, int n_component, float* data, double vmin, double vmax, 
+                double nzero_min);
 TransferFunction* get_transfunc(char *name);
 void resize_offscreen_buffer(int w, int h);
@@ -140 +145 @@
 vector<Volume*> volume;
 
+vector<HeightMap*> g_heightMap;
+
 // maps transfunc name to TransferFunction object
 Tcl_HashTable tftable;
@@ -196 +203 @@
 static int PlaneEnableCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
 
+static int GridCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
+static int AxisCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
+
 static int GetVolumeIndices _ANSI_ARGS_((Tcl_Interp *interp, int argc, CONST84 char *argv[], vector<int>* vectorPtr));
+static int GetIndices(Tcl_Interp *interp, int argc, CONST84 char *argv[], vector<int>* vectorPtr);
 static int GetAxis _ANSI_ARGS_((Tcl_Interp *interp, char *str, int *valPtr));
 static int GetColor _ANSI_ARGS_((Tcl_Interp *interp, char *str, float *rgbPtr));
@@ -318 +329 @@
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
-    // INSOO
-    // TBD
-    //bmp_write("nv>screenshot -bytes");
-    bmp_write_to_file();
+    bmp_write("nv>screenshot -bytes");
     
     resize_offscreen_buffer(old_win_width, old_win_height); 
@@ -756 +764 @@
             return TCL_OK;
         }
+
         Tcl_AppendResult(interp, "bad option \"", argv[2],
             "\": should be label", (char*)NULL);
@@ -833 +842 @@
             if (!strcmp(header, "<HDR>"))
             {
+                printf("HDR stream is in\n");
                 std::stringstream fdata(std::ios_base::out|std::ios_base::in|std::ios_base::binary);
                 fdata.write(buf.bytes(),buf.size());
@@ -1100 +1110 @@
         volume[1]->disable_data();
         volume[1]->disable();
+        return TCL_OK;
+    }
+
+    Tcl_AppendResult(interp, "bad option \"", argv[1],
+        "\": should be data, outline, shading, or state", (char*)NULL);
+    return TCL_ERROR;
+}
+
+int HeightMapCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]))
+{
+    if (argc < 2) 
+    {
+        {   
+        srand( (unsigned)time( NULL ) );
+        int size = 20 * 20;
+        float* data = (float*) malloc(sizeof(float) * size);
+        for (int i = 0; i < size; ++i)
+        {
+            data[i] = rand() * 1.0f / RAND_MAX;
+        }
+
+        HeightMap* heightMap = new HeightMap();
+        heightMap->setHeight(0, 0, 1, 1, 20, 20, data);
+        heightMap->setColorMap(get_transfunc("default"));
+        heightMap->setVisible(true);
+        heightMap->setLineContourVisible(true);
+        g_heightMap.push_back(heightMap);
+        }
+
+        return TCL_OK;
+    }
+
+    char c = *argv[1];
+    if (c == 'd' && strcmp(argv[1],"data") == 0) 
+    {
+        //bytes
+        vector<int> indices;
+        if (strcmp(argv[2],"on") == 0) 
+        {
+            if (GetVolumeIndices(interp, argc-2, argv+2, &indices) != TCL_OK) 
+            {
+                return TCL_ERROR;
+            }
+
+            for (int i = 0; i < indices.size(); ++i)
+            {
+                if ((indices[i] < g_heightMap.size()) && (g_heightMap[indices[i]] != NULL))
+                {
+                    g_heightMap[indices[i]]->setVisible(true);
+                }
+            }
+            return TCL_OK;
+        }
+        else if (strcmp(argv[2],"off") == 0) 
+        {
+            if (GetVolumeIndices(interp, argc-2, argv+2, &indices) != TCL_OK) 
+            {
+                return TCL_ERROR;
+            }
+
+            for (int i = 0; i < indices.size(); ++i)
+            {
+                if ((indices[i] < g_heightMap.size()) && (g_heightMap[indices[i]] != NULL))
+                {
+                    g_heightMap[indices[i]]->setVisible(false);
+                }
+            }
+            return TCL_OK;
+        }
+        
+        
+        
+    }
+    else if (c == 'l' && (strcmp(argv[1], "linecontour") == 0))
+    {
+        //bytes
+        vector<int> indices;
+        if (strcmp(argv[2],"on") == 0) 
+        {
+            if (GetVolumeIndices(interp, argc-3, argv+3, &indices) != TCL_OK) 
+            {
+                return TCL_ERROR;
+            }
+
+            for (int i = 0; i < indices.size(); ++i)
+            {
+                if ((indices[i] < g_heightMap.size()) && (g_heightMap[indices[i]] != NULL))
+                {
+                    g_heightMap[indices[i]]->setLineContourVisible(true);
+                }
+            }
+            return TCL_OK;
+        }
+        else if (strcmp(argv[2],"off") == 0) 
+        {
+            if (GetVolumeIndices(interp, argc-3, argv+3, &indices) != TCL_OK) 
+            {
+                return TCL_ERROR;
+            }
+
+            for (int i = 0; i < indices.size(); ++i)
+            {
+                if ((indices[i] < g_heightMap.size()) && (g_heightMap[indices[i]] != NULL))
+                {
+                    g_heightMap[indices[i]]->setLineContourVisible(false);
+                }
+            }
+            return TCL_OK;
+        }
+        
+        return TCL_OK;
+    }
+    else if (c == 't' && (strcmp(argv[1], "transfunc") == 0))
+    {
+        TransferFunction *tf = get_transfunc((char*)argv[3]);
+        if (tf == NULL) {
+            Tcl_AppendResult(interp, "transfer function \"", argv[3],
+                "\" is not defined", (char*)NULL);
+            return TCL_ERROR;
+        }
+
+        vector<int> indices;
+        if (GetVolumeIndices(interp, argc - 3, argv + 3, &indices) != TCL_OK) 
+        {
+            for (int i = 0; i < indices.size(); ++i)
+            {
+                if ((indices[i] < g_heightMap.size()) && (g_heightMap[indices[i]] != NULL))
+                {
+                    g_heightMap[indices[i]]->setColorMap(tf);
+                }
+            }
+        }
+        return TCL_OK;
+    }
+    
+    Tcl_AppendResult(interp, "bad option \"", argv[1],
+        "\": should be data, outline, shading, or state", (char*)NULL);
+    return TCL_ERROR;
+}
+
+int GridCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]))
+{
+    char c = *argv[1];
+    if (c == 'v' && strcmp(argv[1],"visible") == 0) 
+    {
+        if (strcmp(argv[2],"on") == 0) 
+        {
+            g_grid->setVisible(true);
+            return TCL_OK;
+        }
+        else if (strcmp(argv[2],"off") == 0) 
+        {
+            g_grid->setVisible(false);
+            return TCL_OK;
+        }
+    }
+    else if (c == 'l' && strcmp(argv[1],"linecount") == 0) 
+    {
+        int x, y, z;
+
+        if ((Tcl_GetInt(interp, argv[2], &x) == TCL_OK) &&
+            (Tcl_GetInt(interp, argv[3], &y) == TCL_OK) &&
+            (Tcl_GetInt(interp, argv[4], &z) == TCL_OK)) {
+
+            if (g_grid) g_grid->setGridLineCount(x, y, z);
+
+            return TCL_OK;
+        }
+    }
+    else if (c == 'a' && strcmp(argv[1],"axiscolor") == 0) 
+    {
+        int r, g, b;
+        if ((Tcl_GetInt(interp, argv[2], &r) == TCL_OK) &&
+            (Tcl_GetInt(interp, argv[3], &g) == TCL_OK) &&
+            (Tcl_GetInt(interp, argv[4], &b) == TCL_OK)) {
+
+            if (g_grid) g_grid->setAxisColor(r / 255.0f, g / 255.0f, b / 255.0f);
+            return TCL_OK;
+        }
+    }
+    else if (c == 'l' && strcmp(argv[1],"linecolor") == 0) 
+    {
+        int r, g, b;
+        if ((Tcl_GetInt(interp, argv[2], &r) == TCL_OK) &&
+            (Tcl_GetInt(interp, argv[3], &g) == TCL_OK) &&
+            (Tcl_GetInt(interp, argv[4], &b) == TCL_OK)) {
+
+            if (g_grid) g_grid->setGridLineColor(r / 255.0f, g / 255.0f, b / 255.0f);
+            return TCL_OK;
+        }
+    }
+    else if (c == 'm')
+    {
+        if (strcmp(argv[1],"minmax") == 0) 
+        {
+            double x1, y1, z1, x2, y2, z2;
+            if ((Tcl_GetDouble(interp, argv[2], &x1) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[3], &y1) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[4], &z1) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[5], &x2) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[6], &y2) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[7], &z2) == TCL_OK)) {
+
+                if (g_grid) g_grid->setMinMax(Vector3(x1, y1, z1), Vector3(x2, y2, z2));
+
+                return TCL_OK;
+            }
+        }
+    }
+    else if (c == 'a' && strcmp(argv[1],"axisname") == 0) 
+    {
+        int axisID;
+        if ((Tcl_GetInt(interp, argv[2], &axisID) == TCL_OK))
+        {
+            if (g_grid) g_grid->setAxisName(axisID, argv[3]);
+            return TCL_OK;
+        }
+    }
+
+    Tcl_AppendResult(interp, "bad option \"", argv[1],
+        "\": should be data, outline, shading, or state", (char*)NULL);
+    return TCL_ERROR;
+}
+
+int AxisCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]))
+{
+    if (argc < 2) {
+        Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+            " option arg arg...\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    char c = *argv[1];
+    if (c == 'v' && strcmp(argv[1],"visible") == 0) 
+    {
+        if (strcmp(argv[2],"on") == 0) 
+        {
+            axis_on = true;
+        }
+        else if (strcmp(argv[2],"off") == 0) 
+        {
+            axis_on = false;
+        }
+            
         return TCL_OK;
     }
@@ -1145 +1399 @@
                 vectorPtr->push_back(ivol);
             }
+        }
+    }
+    return TCL_OK;
+}
+
+static int
+GetIndices(Tcl_Interp *interp, int argc, CONST84 char *argv[],
+    vector<int>* vectorPtr)
+{
+    int ivol;
+    for (int n=0; n < argc; n++) 
+    {
+        if (Tcl_GetInt(interp, argv[n], &ivol) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if (ivol < 0 || ivol >= volume.size()) {
+            Tcl_AppendResult(interp, "bad volume index \"", argv[n],
+                    "\"", (char*)NULL);
+                return TCL_ERROR;
         }
     }
@@ -1475 +1748 @@
         double vmin = 0.0;
         double vmax = 0.0;
+        double nzero_min = 0.0;
         int ngen = 0;
         for (int iz=0; iz < nz; iz++) {
@@ -1493 +1767 @@
                     if (vm < vmin) { vmin = vm; }
                     if (vm > vmax) { vmax = vm; }
+                    if (vm != 0.0f && vm < nzero_min)
+                    {
+                        nzero_min = vm;
+                    }
 
                     data[ngen++] = vx;
@@ -1506 +1784 @@
         }
 
-        load_volume(index, nx, ny, nz, 3, data, vmin, vmax);
+        load_volume(index, nx, ny, nz, 3, data, vmin, vmax, nzero_min);
         delete [] data;
     } else {
@@ -1565 +1843 @@
                 for (int i=0; i < nxy; i++) {
                     ftmp << xymesh.atNode(i).x() << " " << xymesh.atNode(i).y() << std::endl;
+                
                 }
                 ftmp.close();
@@ -1691 +1970 @@
             // generate the uniformly sampled data that we need for a volume
             int ngen = 0;
+            double nzero_min = 0.0;
             for (int iz=0; iz < nz; iz++) {
                 double zval = z0 + iz*dmin;
@@ -1699 +1979 @@
                         double v = field.value(xval,yval,zval);
 
+                        if (v != 0.0f && v < nzero_min)
+                        {
+                            nzero_min = v;
+                        }
+
                         // scale all values [0-1], -1 => out of bounds
                         v = (isnan(v)) ? -1.0 : (v - vmin)/dv;
+
                         data[ngen] = v;
                         ngen += 4;
@@ -1746 +2032 @@
 
             load_volume(index, nx, ny, nz, 4, data,
-                field.valueMin(), field.valueMax());
+                field.valueMin(), field.valueMax(), nzero_min);
 
             delete [] data;
@@ -1805 +2091 @@
             // generate the uniformly sampled data that we need for a volume
             int ngen = 0;
+            double nzero_min = 0.0;
             for (iz=0; iz < nz; iz++) {
                 double zval = z0 + iz*dmin;
@@ -1813 +2100 @@
                         double v = field.value(xval,yval,zval);
 
+                        if (v != 0.0f && v < nzero_min)
+                        {
+                            nzero_min = v;
+                        }
                         // scale all values [0-1], -1 => out of bounds
                         v = (isnan(v)) ? -1.0 : (v - vmin)/dv;
@@ -1861 +2152 @@
 
             load_volume(index, nx, ny, nz, 4, data,
-                field.valueMin(), field.valueMax());
+                field.valueMin(), field.valueMax(), nzero_min);
 
             delete [] data;
@@ -1888 +2179 @@
  */
 void load_volume(int index, int width, int height, int depth,
-    int n_component, float* data, double vmin, double vmax)
+    int n_component, float* data, double vmin, double vmax, double nzero_min)
 {
     while (n_volumes <= index) {
@@ -1901 +2192 @@
 
     volume[index] = new Volume(0.f, 0.f, 0.f, width, height, depth, 1.,
-                                 n_component, data, vmin, vmax);
+                                 n_component, data, vmin, vmax, nzero_min);
     assert(volume[index]!=0);
 }
@@ -1990 +2281 @@
   win_width = w;
   win_height = h;
+
+    if (g_fonts)
+    {
+        g_fonts->resize(w, h);
+    }
 
   //fprintf(stderr, "screen_buffer size: %d\n", sizeof(screen_buffer));
@@ -2212 +2508 @@
         (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
 
+    Tcl_CreateCommand(interp, "axis", AxisCmd,
+        (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+
+    Tcl_CreateCommand(interp, "grid", GridCmd,
+        (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+
+    Tcl_CreateCommand(interp, "heightmap", HeightMapCmd,
+        (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+
     // get screenshot
     Tcl_CreateCommand(interp, "screenshot", ScreenShotCmd,
@@ -2975 +3280 @@
 
         //now render things in the scene
-        draw_3d_axis();
+        if (axis_on)
+        {
+            draw_3d_axis();
+        }
+
+        if (g_grid->isVisible())
+        {
+            g_grid->render();
+        }
 
         //lic->render();        //display the line integral convolution result
@@ -2988 +3301 @@
         g_vol_render->render_all();
         perf->disable();
+
+        for (int ii = 0; ii < g_heightMap.size(); ++ii)
+        {
+            if (g_heightMap[ii]->isVisible())
+                g_heightMap[ii]->render();
+        }
 
         glPopMatrix();
@@ -3243 +3562 @@
 */
 
+void removeAllData()
+{
+    //
+}
 
 
@@ -3308 +3631 @@
     glutMainLoop();
 
+    removeAllData();
+
     NvExit();
 

trunk/vizservers/nanovis/shaders/one_volume.cg

@@ -56 +56 @@
     float normal_dot_half = max(dot(normal, half_vector), 0);
 
-    float ambient = 0.8;
+    //float ambient = 0.8;
+    float ambient = 0.2;
     float diffuse = normal_dot_light * renderParameters.z;
     float specular = pow(normal_dot_half, renderParameters.w)*(1-ambient-diffuse);