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

Timestamp:

Aug 25, 2005, 2:46:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: text is now Rendered as expected (in FastMode)

File:

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

trunk/src/lib/graphics/text_engine.cc

@@ -375 +375 @@
   this->setSize(fontSize);
 
-  this->setFont(fontFile);
+  this->loadFont(fontFile);
 
   this->setStyle("c");//TTF_STYLE_NORMAL);
@@ -383 +383 @@
 
 /**
- *  destructs a font
+ * destructs a font
+ * this releases the memory a font uses to be opened.
 */
 Font::~Font()
@@ -407 +408 @@
  * @returns true if loaded, false if something went wrong, or if a font was loaded before.
 */
-bool Font::setFont(const char* fontFile)
+bool Font::loadFont(const char* fontFile)
 {
   if (!this->fontFile)
@@ -576 +577 @@
             maxLineHeight = tmpGlyph->height;
 
-          if (tmpRect.x+tmpGlyph->width > tmpSurf->w)
+          if (tmpRect.x+tmpGlyph->advance > tmpSurf->w)
             {
               tmpRect.x = 0;
@@ -600 +601 @@
               TexCoord tmpTexCoord;
               tmpTexCoord.minU = (float)tmpRect.x/(float)tmpSurf->w;
-              tmpTexCoord.maxU = (float)(tmpRect.x +1 + tmpGlyph->width)/(float)tmpSurf->w;
+              tmpTexCoord.maxU = (float)(tmpRect.x + tmpGlyph->advance)/(float)tmpSurf->w;
               tmpTexCoord.minV = (float)(tmpRect.y)/(float)tmpSurf->w;
               tmpTexCoord.maxV = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
@@ -608 +609 @@
               glBegin(GL_QUADS);
               glTexCoord2f(tmpTexCoord.minU, tmpTexCoord.minV);
-              glVertex2d(0, 0);
+              glVertex2d(0, - tmpGlyph->bearingY);
               glTexCoord2f(tmpTexCoord.minU, tmpTexCoord.maxV);
-              glVertex2d(0, tmpGlyph->height);
+              glVertex2d(0, tmpGlyph->height - tmpGlyph->bearingY);
               glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.maxV);
-              glVertex2d(tmpGlyph->width, tmpGlyph->height);
+              glVertex2d(tmpGlyph->width, tmpGlyph->height - tmpGlyph->bearingY);
               glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.minV);
-              glVertex2d(tmpGlyph->width, 0);
+              glVertex2d(tmpGlyph->width, - tmpGlyph->bearingY);
               glEnd();
               glEndList();
               SDL_FreeSurface(glyphSurf);
 
-              tmpRect.x += tmpGlyph->width + 2;
+              tmpRect.x += tmpGlyph->advance;
 
               // Outputting Glyphs to BMP-files.
@@ -693 +694 @@
   int i;
   int x,y; // the counters
-  int maxLineHeight;
+  int maxLineHeight = this->getMaxHeight();
   unsigned int size = 32;  // starting Value, we have to start somewhere 32 seems reasonable. (take any small enough 2^i number)
   bool sizeOK = false;
@@ -701 +702 @@
     {
       x = 0; y = 0;
-      maxLineHeight = 0;
       for (i = 0; i < FONT_HIGHEST_KNOWN_CHAR; i++)
         {
@@ -710 +710 @@
                 maxLineHeight = tmpGlyph->height;
 
-              if (x + tmpGlyph->width > size)
+              if (x + tmpGlyph->advance > size)
                 {
                   x = 0;
@@ -718 +718 @@
               if (y + maxLineHeight + 1 > size)
                 break;
-              x += tmpGlyph->width + 1;
+              x += tmpGlyph->advance;
 
             }
@@ -727 +727 @@
         size *= 2;
     }
-  return size;
+    return size;
 }