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

Timestamp:

Oct 13, 2005, 12:00:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: rendering font with RenderSize, but not with TextSize. This makes the Font more controllable

File:

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

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

@@ -36 +36 @@
  * @param fontSize the Size of the Font in Pixels
  */
-Font::Font(const char* fontFile, unsigned int fontSize)
+Font::Font(const char* fontFile, unsigned int renderSize)
 {
   this->init();
 
-  this->setSize(fontSize);
+  this->renderSize = renderSize;
   this->setStyle("c");
 
   if (fontFile != NULL)
-    this->loadFont(fontFile);
+    this->loadFontFromTTF(fontFile);
 }
 
@@ -118 +118 @@
 
   // erease this font out of the memory.
-  if (likely(this->font != NULL))
-    TTF_CloseFont(this->font);
+  if (likely(this->fontTTF != NULL))
+    TTF_CloseFont(this->fontTTF);
 }
 
@@ -129 +129 @@
   this->setClassID(CL_FONT, "Font");
   // setting default values.
-  this->font = NULL;
+  this->fontTTF = NULL;
   this->glyphArray = NULL;
   this->fastTextureID = 0;
@@ -140 +140 @@
  * @returns true if loaded, false if something went wrong, or if a font was loaded before.
  */
-bool Font::loadFont(const char* fontFile)
+bool Font::loadFontFromTTF(const char* fontFile)
 {
   // checking for existent Font.
-  if (this->font != NULL)
-  {
-    TTF_CloseFont(this->font);
-    this->font = NULL;
+  if (this->fontTTF != NULL)
+  {
+    TTF_CloseFont(this->fontTTF);
+    this->fontTTF = NULL;
   }
   if (this->fastTextureID != 0)
@@ -156 +156 @@
 
   this->setName(fontFile);
-  this->font = TTF_OpenFont(this->getName(), this->fontSize);
-
-  if(this->font != NULL)
+  this->fontTTF = TTF_OpenFont(this->getName(), this->renderSize);
+
+  if(this->fontTTF != NULL)
   {
     this->fastTextureID = this->createFastTexture();
@@ -184 +184 @@
     return false;
 
-  if (this->font != NULL)
-  {
-    TTF_CloseFont(this->font);
-    this->font = NULL;
+  if (this->fontTTF != NULL)
+  {
+    TTF_CloseFont(this->fontTTF);
+    this->fontTTF = NULL;
   }
   if (this->fastTextureID != 0)
@@ -214 +214 @@
       tmpGlyph->texCoord[2] = cy+0.001f;
       tmpGlyph->texCoord[3] = cy+0.0625f;
-      tmpGlyph->width = 16;
-      tmpGlyph->bearingX = 16;
-      tmpGlyph->bearingY = 16;
-      tmpGlyph->height = 16;
+      tmpGlyph->width = 1;
+      tmpGlyph->bearingX = 1;
+      tmpGlyph->bearingY = 1;
+      tmpGlyph->height = 1;
     }
   }
@@ -241 +241 @@
     this->renderStyle |= TTF_STYLE_UNDERLINE;
 
-  if (likely(this->font != NULL))
-    TTF_SetFontStyle(this->font, this->renderStyle);
+  if (likely(this->fontTTF != NULL))
+    TTF_SetFontStyle(this->fontTTF, this->renderStyle);
 //  else
 //    PRINTF(2)("Font was not initialized, please do so before setting the Font-Style.\n");
 }
 
-/**
- *  Sets a new Size to the font
- * @param fontSize The new Size in pixels.
- */
-void Font::setSize(unsigned int fontSize)
-{
-  this->fontSize = fontSize;
-}
-
 Font* Font::defaultFont = NULL;
 
 void Font::createAsciiImage(const char* fileName)
 {
-  if (this->font == NULL)
+  if (this->fontTTF == NULL)
     return;
   int height = this->getMaxHeight();
@@ -294 +285 @@
     {
       SDL_Surface* glyphSurf = NULL;
-      if (likely(this->font != NULL))
+      if (likely(this->fontTTF != NULL))
       {
         SDL_Color white = {255, 255, 255};
-        glyphSurf = TTF_RenderGlyph_Blended(this->font, posX+16*posY, white);
+        glyphSurf = TTF_RenderGlyph_Blended(this->fontTTF, posX+16*posY, white);
       }
       if( glyphSurf != NULL )
@@ -339 +330 @@
 int Font::getMaxHeight()
 {
-  if (likely (this->font != NULL))
-    return TTF_FontHeight(this->font);
+  if (likely (this->fontTTF != NULL))
+    return TTF_FontHeight(this->fontTTF);
   else
     return 0;
@@ -352 +343 @@
 int Font::getMaxAscent()
 {
-  if (likely(this->font != NULL))
-    return TTF_FontAscent(this->font);
+  if (likely(this->fontTTF != NULL))
+    return TTF_FontAscent(this->fontTTF);
   else
     return 0;
@@ -365 +356 @@
 int Font::getMaxDescent()
 {
-  if (likely(this->font != NULL))
-    return TTF_FontDescent(this->font);
+  if (likely(this->fontTTF != NULL))
+    return TTF_FontDescent(this->fontTTF);
   else
     return 0;
@@ -384 +375 @@
   Glyph* rg = new Glyph;
   rg->character = character;
-  if (likely (this->font!= NULL))
-    TTF_GlyphMetrics(this->font, rg->character,
-                     &rg->minX, &rg->maxX,
-                     &rg->minY, &rg->maxY,
-                     &rg->advance);
+  if (likely (this->fontTTF!= NULL))
+  {
+    int miX, maX, miY, maY, adv;
+    TTF_GlyphMetrics(this->fontTTF, rg->character,
+                     &miX, &maX,
+                     &miY, &maY,
+                     &adv);
+    rg->minX = (float)miX / (float)this->renderSize;
+    rg->maxX = (float)maX / (float)this->renderSize;
+    rg->minY = (float)miY / (float)this->renderSize;
+    rg->maxY = (float)maY / (float)this->renderSize;
+    rg->advance = (float)adv / (float)this->renderSize;
+  }
   rg->height = rg->maxY - rg->minY;
   rg->width = rg->maxX - rg->minX;
@@ -412 +411 @@
 
   this->initGlyphs(32, numberOfGlyphs);
-  this->glyphArray[32]->width = fontSize/2; //!< @todo find out the real size of a Space
+  this->glyphArray[32]->width = .5f; //!< @todo find out the real size of a Space
 
   int rectSize = this->findOptimalFastTextureSize();
@@ -447 +446 @@
     if (tmpGlyph = this->glyphArray[i])
     {
-      if (tmpGlyph->height > maxLineHeight)
-        maxLineHeight = tmpGlyph->height;
-
-      if (tmpRect.x+tmpGlyph->advance > tmpSurf->w)
+      if (tmpGlyph->height*this->renderSize > maxLineHeight)
+        maxLineHeight = (int)(tmpGlyph->height*this->renderSize);
+
+      if (tmpRect.x+tmpGlyph->advance*this->renderSize > tmpSurf->w)
       {
         tmpRect.x = 0;
@@ -462 +461 @@
       }
           // reading in the new Glyph
-      if (likely(this->font != NULL))
+      if (likely(this->fontTTF != NULL))
       {
         SDL_Color white = {255, 255, 255};
-        glyphSurf = TTF_RenderGlyph_Blended(this->font, i, white);
+        glyphSurf = TTF_RenderGlyph_Blended(this->fontTTF, i, white);
       }
       if( glyphSurf != NULL )
@@ -473 +472 @@
         SDL_BlitSurface(glyphSurf, NULL, tmpSurf, &tmpRect);
         tmpGlyph->texCoord[0] = (float)tmpRect.x/(float)tmpSurf->w;
-        tmpGlyph->texCoord[1] = (float)(tmpRect.x + tmpGlyph->advance)/(float)tmpSurf->w;
+        tmpGlyph->texCoord[1] = (float)(tmpRect.x + tmpGlyph->advance*this->renderSize)/(float)tmpSurf->w;
         tmpGlyph->texCoord[2] = (float)(tmpRect.y)/(float)tmpSurf->w;
-        tmpGlyph->texCoord[3] = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
+        tmpGlyph->texCoord[3] = (float)(tmpRect.y+tmpGlyph->height*this->renderSize)/(float)tmpSurf->w;
         SDL_FreeSurface(glyphSurf);
 
-        tmpRect.x += tmpGlyph->advance;
+        tmpRect.x += (int)(tmpGlyph->advance*this->renderSize);
 
               // Outputting Glyphs to BMP-files.
-/*
+        /*
         char outname[512];
         if (i < 10)
@@ -489 +488 @@
         else
         sprintf( outname, "%s-glyph-%d.bmp", this->getName(), i );
-        SDL_SaveBMP(tmpSurf, outname);*/
-
+        SDL_SaveBMP(tmpSurf, outname);
+        */
       }
     }
@@ -568 +567 @@
       {
               // getting the height of the highest Glyph in the Line.
-        if (tmpGlyph->height > maxLineHeight)
-          maxLineHeight = tmpGlyph->height;
-
-        if (x + tmpGlyph->advance > size)
+        if (tmpGlyph->height*this->renderSize > maxLineHeight)
+          maxLineHeight = (int)(tmpGlyph->height*this->renderSize);
+
+        if (x + tmpGlyph->advance*this->renderSize > size)
         {
           x = 0;
@@ -579 +578 @@
         if (y + maxLineHeight + 1 > size)
           break;
-        x += tmpGlyph->advance;
+        x += (int)(tmpGlyph->advance*this->renderSize);
 
       }
@@ -599 +598 @@
   // print the loaded font's style
   int style;
-  if (likely(this->font != NULL))
-    style = TTF_GetFontStyle(this->font);
+  if (likely(this->fontTTF != NULL))
+    style = TTF_GetFontStyle(this->fontTTF);
   PRINTF(0)("The font style is:");
   if(style==TTF_STYLE_NORMAL)