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

Timestamp:

Jun 24, 2006, 3:49:33 AM (19 years ago)

Author:

bensch

Message:

trunk: much better loading of the Font

File:

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

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

@@ -192 +192 @@
 void Font::setStyle(const std::string& renderStyle)
 {
-  this->data->setStyle(renderStyle);
+  /// FIXME
+  //this->data->setStyle(renderStyle);
 }
 
@@ -207 +208 @@
  * @param fileName the File to write the image into.
  */
-void Font::createAsciiImage(const std::string& fileName, unsigned int size) const
-{
-  if (this->data->fontTTF == NULL)
+void Font::createAsciiImage(const std::string& ttfFile, const std::string& fileName, unsigned int size)
+{
+  TTF_Font* fontTTF = TTF_OpenFont(ttfFile.c_str(), size);
+
+  if (fontTTF == NULL)
     return;
-  int height = this->getMaxHeight();
+  int height = TTF_FontHeight(fontTTF);
 
   //
@@ -241 +244 @@
     {
       SDL_Surface* glyphSurf = NULL;
-      if (likely(this->data->fontTTF != NULL))
-      {
-        SDL_Color white = {255, 255, 255};
-        glyphSurf = TTF_RenderGlyph_Blended(this->data->fontTTF, posX+size*posY, white);
-      }
+      SDL_Color white = {255, 255, 255};
+      glyphSurf = TTF_RenderGlyph_Blended(fontTTF, posX+size*posY, white);
+
       if( glyphSurf != NULL )
       {
@@ -259 +260 @@
   SDL_SaveBMP(tmpSurf, fileName.c_str());
   SDL_FreeSurface(tmpSurf);
+
+  TTF_CloseFont(fontTTF);
 }
 
@@ -273 +276 @@
   PRINT(0)("TEST %p and %p\n", this->data.get(), this->data->texData.get());
   // print the loaded font's style
-  int style = TTF_STYLE_NORMAL;
+/*  int style = TTF_STYLE_NORMAL;
   if (likely(this->data->fontTTF != NULL))
     style = TTF_GetFontStyle(this->data->fontTTF);
@@ -286 +289 @@
       PRINTF(0)(" italic");
     if(style&TTF_STYLE_UNDERLINE)
-      PRINTF(0)(" underline");
-  }
+      PRINTF(0)(" underline");*/
+//  }
   PRINTF(0)("\n");
 }