Changeset 1546

Timestamp:

Jul 7, 2009 3:52:10 PM (15 years ago)

Author:

gah

Message:

add transparency to heightmap

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (2 diffs)
• HeightMap.cpp (modified) (5 diffs)
• HeightMap.h (modified) (3 diffs)
• shaders/heightcolor.cg (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -2031 +2031 @@
 }
 
+
+static int
+HeightMapOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                   Tcl_Obj *const *objv)
+{
+    float opacity;
+    if (GetFloatFromObj(interp, objv[2], &opacity) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    vector<HeightMap *> heightmaps;
+    if (GetHeightMaps(interp, objc - 3, objv + 3, &heightmaps) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    vector<HeightMap *>::iterator iter;
+    for (iter = heightmaps.begin(); iter != heightmaps.end(); iter++) {
+        (*iter)->opacity(opacity);
+    }
+    return TCL_OK;
+}
+
 static Rappture::CmdSpec heightMapOps[] = {
     {"create",       2, HeightMapCreateOp,      10, 10,
@@ -2038 +2058 @@
     {"legend",       2, HeightMapLegendOp,      5, 5, "index width height",},
     {"linecontour",  2, HeightMapLineContourOp, 2, 0, "oper ?args?",},
+    {"opacity",      1, HeightMapOpacityOp,     3, 0, "value ?heightmap...? ",},
     {"polygon",      1, HeightMapPolygonOp,     3, 3, "mode",},
     {"shading",      1, HeightMapShadingOp,     3, 3, "model",},
     {"test",         2, HeightMapTestOp,        2, 2, "",},
-    {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?indices?",},
+    {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?heightmap...?",},
 
     // HELP ME

trunk/packages/vizservers/nanovis/HeightMap.cpp

@@ -31 +31 @@
     _topContour(0), 
     _tfPtr(0), 
+    _opacity(0.5f),
     _indexBuffer(0), 
     _indexCount(0), 
@@ -43 +44 @@
     _shader = new NvShader();
     _shader->loadFragmentProgram("heightcolor.cg", "main");
-    _tfParam = _shader->getNamedParameterFromFP("tf");
+    _tfParam      = _shader->getNamedParameterFromFP("tf");
+    _opacityParam = _shader->getNamedParameterFromFP("opacity");
 }
 
@@ -103 +105 @@
             cgGLSetTextureParameter(_tfParam, _tfPtr->id());
             cgGLEnableTextureParameter(_tfParam);
+            cgGLSetParameter1f(_opacityParam, _opacity);
             
             glEnable(GL_TEXTURE_1D);
@@ -143 +146 @@
             glDisable(GL_BLEND);
             glDisable(GL_TEXTURE_2D);
-            glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 1.0f);
+            glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 
+                _opacity /*1.0f*/);
             glDepthRange (0.0, 0.999);
             _contour->render();
@@ -153 +157 @@
             glDisable(GL_BLEND);
             glDisable(GL_TEXTURE_2D);
-            glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 1.0f);
+            glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 
+                _opacity /*1.0f*/);
             //glDepthRange (0.0, 0.999);
             _topContour->render();

trunk/packages/vizservers/nanovis/HeightMap.h

@@ -27 +27 @@
     int _vertexCount;
     CGparameter _tfParam;
+    CGparameter _opacityParam;
     R2Geometry* _contour;
     R2Geometry* _topContour;
     TransferFunction* _tfPtr;
+    float _opacity;
     NvShader* _shader;
     int *_indexBuffer;
@@ -41 +43 @@
     Vector3 _scale;
     Vector3 _centerPoint;
-
     int xNum_, yNum_;           // Number of elements x and y axes in grid.
     float *heights_;            // Array of original (unscaled) heights
@@ -123 +124 @@
     }
 
+    void opacity(float opacity) {
+        _opacity = opacity;
+    }
+    float opacity(void) {
+        return _opacity;
+    }
     /**
      *@brief Defind the color of the line contour

trunk/packages/vizservers/nanovis/shaders/heightcolor.cg

@@ -1 +1 @@
 
-float4 main(float4 texCoord : TEXCOORD0,
-        uniform sampler1D tf) : COLOR
+float4 main(
+    float4 texCoord : TEXCOORD0,
+    uniform float opacity, 
+    uniform sampler1D tf) : COLOR
 {
-        float4 color;
-        color.xyz = tex1D(tf, texCoord.z).xyz;
-        color.w = 1.0f;
-        return color;
+    float4 color = tex1D(tf, texCoord.z);
+    color.w = opacity;
+    return color;
 }