Changeset 5124 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/text_engine.cc (modified) (11 diffs)
• lib/graphics/text_engine.h (modified) (2 diffs)
• util/shell.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -466 +466 @@
   this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
   this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
-  this->geTextCFPS->setAbsCoor2D(5, 5);
+  this->geTextCFPS->setAbsCoor2D(5, 15);
 }
 if (this->geTextMaxFPS == NULL)
@@ -472 +472 @@
       this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
-      this->geTextMaxFPS->setAbsCoor2D(5, 35);
+      this->geTextMaxFPS->setAbsCoor2D(5, 40);
 }
 if (this->geTextMinFPS == NULL)

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

trunk/src/lib/graphics/text_engine.h

@@ -158 +158 @@
 
   // font
-  bool setFont(const char* fontFile);
+  bool loadFont(const char* fontFile);
   void setSize(unsigned int fontSize);
   void setStyle(const char* renderStyle);
@@ -165 +165 @@
   inline Glyph** getGlyphArray() const { return glyphArray; };
   /** @returns the texture to the fast-texture */
-  inline GLuint getFastTextureID() const {return fastTextureID;}
+  inline GLuint getFastTextureID() const { return fastTextureID; };
 
  private:

trunk/src/util/shell.cc

@@ -163 +163 @@
   this->inputLineText->setText(NULL);
   this->inputLineText->setParent2D(this);
-  this->inputLineText->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize);
+  this->inputLineText->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
 
   this->setBufferDisplaySize(this->bufferDisplaySize);
@@ -746 +746 @@
 Vector Shell::calculateLinePosition(unsigned int lineNumber)
 {
-  return Vector(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber -1), 0);
+  return Vector(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber -1) + this->textSize, 0);
 }