Changeset 6349 in orxonox.OLD for trunk/src

Timestamp:

Dec 30, 2005, 5:32:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor fix in the TextEngine

Location:

trunk/src/lib/graphics/text_engine

Files:

• font.cc (modified) (6 diffs)
• font.h (modified) (1 diff)
• text.cc (modified) (1 diff)

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

@@ -247 +247 @@
  * @param fileName the File to write the image into.
  */
-void Font::createAsciiImage(const char* fileName)
+void Font::createAsciiImage(const char* fileName, uint size) const
 {
   if (this->fontTTF == NULL)
@@ -258 +258 @@
   SDL_Rect tmpRect; // this represents a Rectangle for blitting.
   SDL_Surface* tmpSurf =  SDL_CreateRGBSurface(SDL_SWSURFACE,
-                                               height*16, height*16,
+                                               height*size, height*size,
                                                32,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
@@ -286 +286 @@
       {
         SDL_Color white = {255, 255, 255};
-        glyphSurf = TTF_RenderGlyph_Blended(this->fontTTF, posX+16*posY, white);
+        glyphSurf = TTF_RenderGlyph_Blended(this->fontTTF, posX+size*posY, white);
       }
       if( glyphSurf != NULL )
@@ -326 +326 @@
  * @returns the maximum height of the Font, if the font was initialized, 0 otherwise
  */
-int Font::getMaxHeight()
+int Font::getMaxHeight() const
 {
   if (likely (this->fontTTF != NULL))
@@ -339 +339 @@
    the ascent is the pixels of the font above the baseline
  */
-int Font::getMaxAscent()
+int Font::getMaxAscent() const
 {
   if (likely(this->fontTTF != NULL))
@@ -352 +352 @@
    the descent is the pixels of the font below the baseline
  */
-int Font::getMaxDescent()
+int Font::getMaxDescent() const
 {
   if (likely(this->fontTTF != NULL))

trunk/src/lib/graphics/text_engine/font.h

@@ -78 +78 @@
     inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
-    void createAsciiImage(const char* fileName);
+    void createAsciiImage(const char* fileName, uint size) const;
     static void initDefaultFont();
     static void removeDefaultFont();
 
   private:
-    int getMaxHeight();
-    int getMaxAscent();
-    int getMaxDescent();
+    int getMaxHeight() const;
+    int getMaxAscent() const;
+    int getMaxDescent() const;
     Glyph* getGlyphMetrics(Uint16 character);
 

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

@@ -199 +199 @@
     Glyph* tmpGlyph;
     float posX = 0.0f;
+
+    glBegin(GL_QUADS);
     while (likely(*tmpText != '\0'))
     {
       if(likely((tmpGlyph = glyphArray[*tmpText]) != NULL))
       {
-        glBegin(GL_QUADS);
+        glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
+        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), 0);
+
+        glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
+        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), this->getSizeY2D());
+
+        glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
+        glVertex2d(posX, this->getSizeY2D());
 
         glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
         glVertex2d(posX, 0);
 
-        glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-        glVertex2d(posX, this->getSizeY2D());
-
-        glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), this->getSizeY2D());
-
-        glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), 0);
-
-        glEnd();
-        glEndList();
         posX += tmpGlyph->advance * this->getSizeY2D();
       }
       ++tmpText;
     }
+    glEnd();
   }