Changeset 1000 for trunk/vizservers/nanovis/HeightMap.cpp

Timestamp:

May 5, 2008, 3:05:29 PM (17 years ago)

Author:

vrinside

Message:

 

File:

• trunk/vizservers/nanovis/HeightMap.cpp (modified) (10 diffs)

trunk/vizservers/nanovis/HeightMap.cpp

@@ -20 +20 @@
 double HeightMap::valueMax = 1.0;
 
+#define TOPCONTOUR
 HeightMap::HeightMap() : 
     _vertexBufferObjectID(0), 
@@ -25 +26 @@
     _vertexCount(0), 
     _contour(0), 
+    _topContour(0), 
     _colorMap(0), 
     _indexBuffer(0), 
     _indexCount(0), 
     _contourColor(1.0f, 0.0f, 0.0f), 
-    _contourVisible(true), 
+    _contourVisible(false), 
+    _topContourVisible(true),
     _visible(false),
     _scale(1.0f, 1.0f, 1.0f), 
@@ -92 +95 @@
         
         if (_colorMap) {
+            // PUT vertex program here
+            //
+            //
+            
             cgGLBindProgram(_shader->getFP());
             cgGLEnableProfile(CG_PROFILE_FP30);
@@ -110 +117 @@
         ::glTexCoordPointer(3, GL_FLOAT, 12, 0);
         
+#define _TRIANGLES_
+#ifdef _TRIANGLES_
         glDrawElements(GL_TRIANGLES, _indexCount, GL_UNSIGNED_INT, 
                        _indexBuffer);
+#else                   
+        glDrawElements(GL_QUADS, _indexCount, GL_UNSIGNED_INT, 
+                       _indexBuffer);
+#endif
+
         glBindBuffer(GL_ARRAY_BUFFER, 0);
         
@@ -126 +140 @@
     glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
     
-    if (_contour && _contourVisible) {
-        glDisable(GL_BLEND);
-        glDisable(GL_TEXTURE_2D);
-        glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 1.0f);
-        glDepthRange (0.0, 0.999);
-        _contour->render();
-        glDepthRange (0.0, 1.0);
+    if (_contour) {
+        if (_contourVisible) {
+            glDisable(GL_BLEND);
+            glDisable(GL_TEXTURE_2D);
+            glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 1.0f);
+            glDepthRange (0.0, 0.999);
+            _contour->render();
+            glDepthRange (0.0, 1.0);
+        }
+
+#ifdef TOPCONTOUR
+        if (_topContourVisible) {
+            glDisable(GL_BLEND);
+            glDisable(GL_TEXTURE_2D);
+            glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 1.0f);
+            //glDepthRange (0.0, 0.999);
+            _topContour->render();
+            //glDepthRange (0.0, 1.0);
+        }
+#endif
     }
     glPopMatrix();
@@ -149 +176 @@
     int boundaryHeight = zCount - 1;
     int* ptr = indexBuffer;
-    int index1, index2, index3, index4;
+        int index1, index2, index3, index4;
     bool index1Valid, index2Valid, index3Valid, index4Valid;
     index1Valid = index2Valid = index3Valid = index4Valid = true;
@@ -166 +193 @@
                 if (isnan(heights[index4])) index4Valid = false;
             
+#ifdef _TRIANGLES_
                 if (index1Valid && index2Valid && index3Valid) {
                     *ptr = index1; ++ptr;
@@ -178 +206 @@
                     ++ic;
                 }
+#else
+                if (index1Valid && index2Valid && index3Valid && index4Valid) {
+                    *ptr = index1; ++ptr;
+                    *ptr = index2; ++ptr;
+                    *ptr = index3; ++ptr;
+                    *ptr = index4; ++ptr;
+                    ++ic;
+                }
+#endif
             }
         }
@@ -266 +303 @@
     _contour = lineFilter.create(0.0f, 1.0f, 10, heights, xCount, yCount);
 
+#ifdef TOPCONTOUR
+    ContourLineFilter topLineFilter;
+    topLineFilter.setHeightTop(true);
+    _topContour = topLineFilter.create(0.0f, 1.0f, 10, heights, xCount, yCount);
+#endif
+
     //if (heightMap)
     //{
@@ -336 +379 @@
     _contour = lineFilter.create(0.0f, 1.0f, 10, heightMap, xCount, yCount);
     
+#ifdef TOPCONTOUR
+    ContourLineFilter topLineFilter;
+    topLineFilter.setHeightTop(true);
+    _topContour = topLineFilter.create(0.0f, 1.0f, 10, heightMap, xCount, yCount);
+#endif
+
+
     //if (heightMap)
     //{