Changeset 2953 for trunk/packages/vizservers/nanovis/R2

Timestamp:

Apr 9, 2012 10:18:09 AM (12 years ago)

Author:

ldelgass

Message:

Remove unused global origin, make default transfer function a bit more
sensible (used to have full opacity at 0). Fix HeightMap? dtor to use delete[]
instead of free() on array allocated with new[]. Document data response in
protocol.

File:

• trunk/packages/vizservers/nanovis/R2/src/R2Fonts.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/R2/src/R2Fonts.cpp

@@ -73 +73 @@
 R2Fonts::begin()
 {
+    glPushAttrib(GL_TRANSFORM_BIT | GL_ENABLE_BIT);
     glEnable(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, _fonts[_fontIndex]. _fontTextureID);
-
-    glPushAttrib(GL_TRANSFORM_BIT | GL_ENABLE_BIT);
+    glBindTexture(GL_TEXTURE_2D, _fonts[_fontIndex]._fontTextureID);
+
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-
-    glLoadIdentity( );
+    glLoadIdentity();
+
     gluOrtho2D(0.0f, _screenWidth, _screenHeight, 0.0f);
 
     glMatrixMode(GL_MODELVIEW);
-    glPushMatrix( );
-    glLoadIdentity( );
-
-    glEnable(GL_TEXTURE_2D);
+    glPushMatrix();
+    glLoadIdentity();
+
     glEnable(GL_BLEND);
     glDisable(GL_DEPTH_TEST);
@@ -98 +97 @@
 
     glMatrixMode(GL_PROJECTION);
-    glPopMatrix( );
+    glPopMatrix();
 
     glMatrixMode(GL_MODELVIEW);
-    glPopMatrix( );
-
-    glPopAttrib( );
+    glPopMatrix();
+
+    glPopAttrib();
 }
 
@@ -229 +228 @@
         }
 
-        fsInput.close( );
+        fsInput.close();
     }
     delete [] path;