Changeset 2927 for trunk/packages/vizservers

Timestamp:

Apr 1, 2012 11:16:54 PM (12 years ago)

Author:

ldelgass

Message:

Style fixes and GL state leak fixes in HeightMap?

Location:

trunk/packages/vizservers/nanovis

Files:

• HeightMap.cpp (modified) (10 diffs)
• HeightMap.h (modified) (2 diffs)
• nanovis.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/HeightMap.cpp

@@ -62 +62 @@
 
 void 
-HeightMap::render(graphics::RenderContext* renderContext)
-{
+HeightMap::render(graphics::RenderContext *renderContext)
+{
+    glPushAttrib(GL_ENABLE_BIT | GL_POLYGON_BIT | GL_LIGHTING_BIT);
+
     if (renderContext->getCullMode() == graphics::RenderContext::NO_CULL) {
         glDisable(GL_CULL_FACE);
     } else {
         glEnable(GL_CULL_FACE);
-        glCullFace((GLuint) renderContext->getCullMode());
-    }
-    glPolygonMode(GL_FRONT_AND_BACK, (GLuint) renderContext->getPolygonMode());
-    glShadeModel((GLuint) renderContext->getShadingModel());
-
+        glCullFace((GLuint)renderContext->getCullMode());
+    }
+    glPolygonMode(GL_FRONT_AND_BACK, (GLuint)renderContext->getPolygonMode());
+    glShadeModel((GLuint)renderContext->getShadingModel());
+
+    glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
 
@@ -83 +86 @@
 
     if (_contour != NULL) {
-        glDepthRange (0.001, 1.0);
+        glDepthRange(0.001, 1.0);
     }
         
@@ -96 +99 @@
         glDisableClientState(GL_INDEX_ARRAY);
         glDisableClientState(GL_NORMAL_ARRAY);
-        
+
         if (_tfPtr) {
             // PUT vertex program here
             //
             //
-            
-            cgGLBindProgram(_shader->getFP());
-            cgGLEnableProfile(CG_PROFILE_FP40);
-            
+            _shader->bind();
+ 
             cgGLSetTextureParameter(_tfParam, _tfPtr->id());
             cgGLEnableTextureParameter(_tfParam);
             cgGLSetParameter1f(_opacityParam, _opacity);
-            
+
             glEnable(GL_TEXTURE_1D);
             _tfPtr->getTexture()->activate();
-            
+ 
             glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         }
-        
+
         glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferObjectID);
         glVertexPointer(3, GL_FLOAT, 12, 0);
-        
+
         glBindBuffer(GL_ARRAY_BUFFER, _textureBufferObjectID);
-        ::glTexCoordPointer(3, GL_FLOAT, 12, 0);
-        
+        glTexCoordPointer(3, GL_FLOAT, 12, 0);
+
 #define _TRIANGLES_
 #ifdef _TRIANGLES_
         glDrawElements(GL_TRIANGLES, _indexCount, GL_UNSIGNED_INT, 
                        _indexBuffer);
-#else                   
+#else
         glDrawElements(GL_QUADS, _indexCount, GL_UNSIGNED_INT, 
                        _indexBuffer);
@@ -131 +132 @@
 
         glBindBuffer(GL_ARRAY_BUFFER, 0);
-        
+
         glDisableClientState(GL_VERTEX_ARRAY);
         if (_tfPtr != NULL) {
             _tfPtr->getTexture()->deactivate();
             glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-            
-            cgGLDisableProfile(CG_PROFILE_FP40);
+
+            _shader->unbind();
         }
     }
     glShadeModel(GL_FLAT);
     glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-    
+
     if (_contour != NULL) {
         if (_contourVisible) {
@@ -148 +149 @@
             glDisable(GL_TEXTURE_2D);
             glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 
-                _opacity /*1.0f*/);
+                      _opacity /*1.0f*/);
             glDepthRange (0.0, 0.999);
             _contour->render();
-            glDepthRange (0.0, 1.0);
         }
 
@@ -159 +159 @@
             glDisable(GL_TEXTURE_2D);
             glColor4f(_contourColor.x, _contourColor.y, _contourColor.z, 
-                _opacity /*1.0f*/);
+                      _opacity /*1.0f*/);
             //glDepthRange (0.0, 0.999);
             _topContour->render();
-            //glDepthRange (0.0, 1.0);
-        }
-#endif
-    }
+        }
+#endif
+        glDepthRange (0.0, 1.0);
+    }
+
     glPopMatrix();
+    glPopAttrib();
 }
 
@@ -446 +448 @@
 }
 
-// Maps the data coordinates of the surface into the grid's axes.
+/**
+ * \brief Maps the data coordinates of the surface into the grid's axes.
+ */
 void 
-HeightMap::MapToGrid(Grid *gridPtr)
+HeightMap::mapToGrid(Grid *gridPtr)
 {
     int count = _xNum * _yNum;
@@ -517 +521 @@
 
 void 
-HeightMap::render_topview(graphics::RenderContext* renderContext, 
-                          int render_width, int render_height)
-{
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+HeightMap::renderTopview(graphics::RenderContext* renderContext, 
+                         int render_width, int render_height)
+{
+    glClear(GL_COLOR_BUFFER_BIT);
     glPushAttrib(GL_VIEWPORT_BIT);
     glViewport(0, 0, render_width, render_height);
@@ -574 +578 @@
         
         if (_tfPtr != NULL) {
-            cgGLBindProgram(_shader->getFP());
-            cgGLEnableProfile(CG_PROFILE_FP40);
+            _shader->bind();
             
             cgGLSetTextureParameter(_tfParam, _tfPtr->id());
             cgGLEnableTextureParameter(_tfParam);
-            
+
             glEnable(GL_TEXTURE_1D);
             _tfPtr->getTexture()->activate();
-            
+
             glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        }
-        else {
+        } else {
             glDisableClientState(GL_TEXTURE_COORD_ARRAY);
         }
-        
+
         glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferObjectID);
         glVertexPointer(3, GL_FLOAT, 12, 0);
-        
+
         glBindBuffer(GL_ARRAY_BUFFER, _textureBufferObjectID);
-        ::glTexCoordPointer(3, GL_FLOAT, 12, 0);
-        
+        glTexCoordPointer(3, GL_FLOAT, 12, 0);
+
 #define _TRIANGLES_
 #ifdef _TRIANGLES_
         glDrawElements(GL_TRIANGLES, _indexCount, GL_UNSIGNED_INT, 
                        _indexBuffer);
-#else                   
+#else
         glDrawElements(GL_QUADS, _indexCount, GL_UNSIGNED_INT, 
                        _indexBuffer);
@@ -605 +607 @@
 
         glBindBuffer(GL_ARRAY_BUFFER, 0);
-        
+
         glDisableClientState(GL_VERTEX_ARRAY);
         if (_tfPtr != NULL) {
             _tfPtr->getTexture()->deactivate();
             glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-            
-            cgGLDisableProfile(CG_PROFILE_FP40);
-        }
-    }
-    
+
+            _shader->unbind();
+        }
+    }
+
     glShadeModel(GL_FLAT);
     glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-    
+
     if (_contour != NULL) {
         if (_contourVisible) {

trunk/packages/vizservers/nanovis/HeightMap.h

@@ -31 +31 @@
     void render(graphics::RenderContext *renderContext);
 
-    void render_topview(graphics::RenderContext *renderContext,
-                        int render_width, int render_height);
+    void renderTopview(graphics::RenderContext *renderContext,
+                       int render_width, int render_height);
 
     /**
@@ -54 +54 @@
     void setHeight(int xCount, int yCount, Vector3 *heights);
 
-    void MapToGrid(Grid *gridPtr);
+    void mapToGrid(Grid *gridPtr);
 
     /**

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -1560 +1560 @@
         HeightMap *hmPtr;
         hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
-        hmPtr->MapToGrid(grid);
+        hmPtr->mapToGrid(grid);
     }
     HeightMap::updatePending = false;
@@ -2434 +2434 @@
     //cam->initialize();
 
-    heightmap->render_topview(renderContext, width, height);
+    heightmap->renderTopview(renderContext, width, height);
 
     NanoVis::readScreen();