Changeset 5370 in orxonox.OLD for trunk/src

Timestamp:

Oct 13, 2005, 12:45:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor nice-render update in the FONT

Location:

trunk/src/lib/graphics/text_engine

Files:

• font.cc (modified) (2 diffs)
• text.cc (modified) (2 diffs)

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

@@ -477 +477 @@
         SDL_FreeSurface(glyphSurf);
 
-        tmpRect.x += (int)(tmpGlyph->advance*this->renderSize);
+        tmpRect.x += (int)(tmpGlyph->advance*this->renderSize)+1;
 
               // Outputting Glyphs to BMP-files.
@@ -578 +578 @@
         if (y + maxLineHeight + 1 > size)
           break;
-        x += (int)(tmpGlyph->advance*this->renderSize);
+        x += (int)(tmpGlyph->advance*this->renderSize)+1;
 
       }

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

@@ -243 +243 @@
     {
       Glyph* tmpGlyph;
+      float posX = 0.0f;
       while (likely(*tmpText != '\0'))
       {
@@ -249 +250 @@
           glBegin(GL_QUADS);
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
-          glVertex2d(0, - tmpGlyph->bearingY * this->size);
+          glVertex2d(posX, - tmpGlyph->bearingY * this->size);
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-          glVertex2d(0, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
+          glVertex2d(posX, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-          glVertex2d(tmpGlyph->width*this->size, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
+          glVertex2d(posX+tmpGlyph->width*this->size, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-          glVertex2d(tmpGlyph->width*this->size, - tmpGlyph->bearingY*this->size);
+          glVertex2d(posX+tmpGlyph->width*this->size, - tmpGlyph->bearingY*this->size);
           glEnd();
           glEndList();
-          glTranslatef(glyphArray[*tmpText]->width*this->size, 0, 0);
+          posX += tmpGlyph->width*this->size;
         }
         tmpText++;