Changeset 2909

Timestamp:

Apr 1, 2012, 11:58:40 AM (12 years ago)

Author:

ldelgass

Message:

Don't leak GL state in drawDeviceShape

Location:

trunk/packages/vizservers/nanovis

Files:

• NvVectorField.cpp (modified) (6 diffs)
• NvVectorField.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/NvVectorField.cpp

@@ -7 +7 @@
 NvVectorField::NvVectorField() :
     _vectorFieldId(0),
+    _volPtr(NULL),
     _activated(true),
+    _origin(0, 0, 0),
+    _physicalMin(0, 0, 0),
+    _physicalSize(1, 1, 1),
     _scaleX(1),
     _scaleY(1),
     _scaleZ(1),
-    _max(1)
-{
-    _deviceVisible = false;
-    _volPtr = 0;
-    _physicalSize.set(1.0f, 1.0f, 1.0f);
+    _max(1),
+    _deviceVisible(false)
+{
 }
 
@@ -28 +30 @@
 
 void 
-NvVectorField::setVectorField(Volume *volPtr, const Vector3& ori, 
+NvVectorField::setVectorField(Volume *volPtr, const Vector3& origin, 
                               float scaleX, float scaleY, float scaleZ, 
                               float max)
 {
     _volPtr = volPtr;
-    _origin = ori;
+    _origin = origin;
     _scaleX = scaleX;
     _scaleY = scaleY;
@@ -40 +42 @@
     _vectorFieldId = volPtr->id;
     _physicalMin = volPtr->getPhysicalBBoxMin();
-    TRACE("_pysicalMin %f %f %f\n", _physicalMin.x, _physicalMin.y, _physicalMin.z);
+    TRACE("_physicalMin %f %f %f\n", _physicalMin.x, _physicalMin.y, _physicalMin.z);
     _physicalSize = volPtr->getPhysicalBBoxMax() - _physicalMin;
-    TRACE("_pysicalSize %f %f %f\n", 
+    TRACE("_physicalSize %f %f %f\n", 
            _physicalSize.x, _physicalSize.y, _physicalSize.z);
 }
@@ -183 +185 @@
 NvVectorField::drawDeviceShape()
 {
+    glPushAttrib(GL_ENABLE_BIT);
+
+    glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
+
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_TEXTURE_2D);
@@ -190 +196 @@
     float x0, y0, z0, x1, y1, z1;
     std::map<std::string, NvDeviceShape>::iterator iterShape;
-    
-    glPushMatrix();
+
     glTranslatef(_origin.x, _origin.y, _origin.z);
     glScaled(_scaleX, _scaleY, _scaleZ);
@@ -253 +258 @@
         glEnd();
     }
-    glPopMatrix();
     
     glPopMatrix();
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_BLEND);
-    glEnable(GL_TEXTURE_2D);
+    glPopAttrib();
 }
 

trunk/packages/vizservers/nanovis/NvVectorField.h

@@ -31 +31 @@
     ~NvVectorField();
 
-    void setVectorField(Volume* vol, const Vector3& ori,
+    void setVectorField(Volume *vol, const Vector3& origin,
                         float scaleX, float scaleY, float scaleZ, float max);