Changeset 5768 in orxonox.OLD for trunk/src/lib/graphics/text_engine/text.cc

Timestamp:

Nov 24, 2005, 8:24:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: font is a Texture now (this is a procedural texture)

File:

• trunk/src/lib/graphics/text_engine/text.cc (modified) (5 diffs)

trunk/src/lib/graphics/text_engine/text.cc

@@ -38 +38 @@
   if (fontFile != NULL)
     this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
-  this->setSizeY2D(this->size = textSize);
+  this->setSizeY2D(textSize);
 }
 
@@ -69 +69 @@
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
-  this->size = TEXT_DEFAULT_SIZE;
-
+  this->setSize(TEXT_DEFAULT_SIZE);
   this->setText(NULL);
 }
@@ -182 +181 @@
   {
     glyphArray = this->font->getGlyphArray();
-    glBindTexture(GL_TEXTURE_2D, font->getFastTextureID());
+    glBindTexture(GL_TEXTURE_2D, font->getTexture());
   }
   else
@@ -189 +188 @@
       Font::initDefaultFont();
     glyphArray = Font::getDefaultFont()->getGlyphArray();
-    glBindTexture(GL_TEXTURE_2D, Font::getDefaultFont()->getFastTextureID());
+    glBindTexture(GL_TEXTURE_2D, Font::getDefaultFont()->getTexture());
   }
   const char* tmpText = this->externText;
@@ -210 +209 @@
 
         glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-        glVertex2d(posX, this->size);
+        glVertex2d(posX, this->getSizeY2D());
 
         glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-        glVertex2d(posX+tmpGlyph->width*this->size, this->size);
+        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), this->getSizeY2D());
 
         glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-        glVertex2d(posX+tmpGlyph->width*this->size, 0);
+        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), 0);
 
         glEnd();
         glEndList();
-        posX += tmpGlyph->advance * this->size;
+        posX += tmpGlyph->advance * this->getSizeY2D();
       }
       ++tmpText;