Changeset 7431 in orxonox.OLD

Timestamp:

Apr 29, 2006, 2:09:26 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Font is PERFECT

Location:

trunk/src/lib/graphics/text_engine

Files:

• font.cc (modified) (3 diffs)
• text.cc (modified) (1 diff)

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

@@ -381 +381 @@
                      &adv) == -1)
       return false;
-
     glyph->minX = (float)miX / (float)this->renderSize;
     glyph->maxX = (float)maX / (float)this->renderSize;
@@ -393 +392 @@
     glyph->bearingX = (glyph->advance - glyph->width) / 2;
     glyph->bearingY = glyph->maxY;
+
+    //printf("%c:: %d %d %d %d %d\n", character, miX, maX, miY, maY, adv);
+
     return true;
   }
@@ -471 +473 @@
       {
         SDL_SetAlpha(glyphSurf, 0, 0);
-        int tmp = tmpRect.y;
+        int tmpY = tmpRect.y;
         tmpRect.y += this->getMaxAscent()-(int)((float)tmpGlyph->bearingY*this->renderSize);
         SDL_BlitSurface(glyphSurf, NULL, tmpSurf, &tmpRect);
-        tmpRect.y = tmp;
-
-        tmpGlyph->texCoord[0] = (float)((float)tmpRect.x + tmpGlyph->minX*(float)this->renderSize)/(float)tmpSurf->w;
-        tmpGlyph->texCoord[1] = (float)((float)tmpRect.x + tmpGlyph->maxX*(float)this->renderSize)/(float)tmpSurf->w;
+        tmpRect.y = tmpY;
+
+        tmpGlyph->texCoord[0] = (float)((float)tmpRect.x )/(float)tmpSurf->w;
+        tmpGlyph->texCoord[1] = (float)((float)tmpRect.x + tmpGlyph->width*(float)this->renderSize)/(float)tmpSurf->w;
         tmpGlyph->texCoord[2] = (float)(tmpRect.y)/(float)tmpSurf->w;
         tmpGlyph->texCoord[3] = (float)((float)tmpRect.y+(float)this->getMaxHeight())/(float)tmpSurf->w;
         SDL_FreeSurface(glyphSurf);
-        tmpRect.x += glyphSurf->w+1; //(int)(tmpGlyph->advance * this->renderSize);
+        tmpRect.x += (int)(tmpGlyph->width * this->renderSize) + 1;
       }
     }
   }
   // outputting the GLYPH-table
-//      char outName[1024];
-//      sprintf( outName, "%s-glyphs.bmp", this->getName());
-//      SDL_SaveBMP(tmpSurf, outName);
+      char outName[1024];
+      sprintf( outName, "%s-glyphs.bmp", this->getName());
+      SDL_SaveBMP(tmpSurf, outName);
 
   if (this->setSurface(tmpSurf))

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

@@ -164 +164 @@
       {
         glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-        glVertex2d(posX+tmpGlyph->advance*this->getSizeY2D(), 0);
+        glVertex2d(posX+tmpGlyph->maxX*this->getSizeY2D(), 0);
 
         glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-        glVertex2d(posX+tmpGlyph->advance*this->getSizeY2D(), this->getSizeY2D());
+        glVertex2d(posX+tmpGlyph->maxX*this->getSizeY2D(), this->getSizeY2D());
 
         glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);