Changeset 4164

Timestamp:

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

Author:

ldelgass

Message:

Fix coloring of fonts in grid labels

Location:

trunk/packages/vizservers/nanovis

Files:

• Grid.cpp (modified) (2 diffs)
• VtkDataSetReader.cpp (modified) (1 diff)
• util/Fonts.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Grid.cpp

@@ -201 +201 @@
 
         _font->begin();
+
+        glColor4f(_axisColor.r, _axisColor.g, _axisColor.b, 
+                  _axisColor.a);
+
         if (gluProject(1.0 + xTitleOfs, 0.0, 0.0, mv, prjm, viewport, &wx, &wy, &wz) &&
             wz >= 0.0 && wz <= 1.0) {
@@ -234 +238 @@
         }
         
-        glColor4f(1.0f, 1.0f, 0.0f, 1.0f); 
+        glColor4f(_majorColor.r, _majorColor.g, _majorColor.b, 
+                  _majorColor.a);
 
         for (result = xAxis.firstMajor(iter); result; result = iter.next()) {

trunk/packages/vizservers/nanovis/VtkDataSetReader.cpp

@@ -50 +50 @@
             reader->ReadAllVectorsOn();
             //reader->ReadAllTensorsOn();
-            //reader->ReadAllFieldsOn();
+            reader->ReadAllFieldsOn();
             reader->SetLookupTableName("");
             reader->Update();

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);