Changeset 4164 for trunk/packages/vizservers/nanovis/util

Timestamp:

Feb 1, 2014 3:22:43 AM (10 years ago)

Author:

ldelgass

Message:

Fix coloring of fonts in grid labels

File:

• trunk/packages/vizservers/nanovis/util/Fonts.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/util/Fonts.cpp

@@ -82 +82 @@
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, _fonts[_fontIndex]._fontTextureID);
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
     glMatrixMode(GL_PROJECTION);
@@ -221 +222 @@
             glGenTextures(1, &sFont._fontTextureID);
             glBindTexture(GL_TEXTURE_2D, sFont._fontTextureID);
-            glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, 
-                         sFont._textureWidth, sFont._textureHeight, 0, 
-                         GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, pTexMap);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-            glTexEnvi(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, 
+                         sFont._textureWidth, sFont._textureHeight, 0, 
+                         GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, pTexMap);
             glBindTexture(GL_TEXTURE_2D, 0);