Changeset 8756 in orxonox.OLD

Timestamp:

Jun 23, 2006, 8:34:56 PM (18 years ago)

Author:

bensch

Message:

orxonox/font: ok, the font is rendering again

Location:

branches/fontdata/src/lib/graphics/text_engine

Files:

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

branches/fontdata/src/lib/graphics/text_engine/font.cc

@@ -50 +50 @@
 
   assert(data.get() != NULL);
-  this->data->renderSize = renderSize;
+
   this->setStyle("c");
 
   if (!fontFile.empty())
-    this->loadFontFromTTF(fontFile);
+    this->loadFontFromTTF(fontFile, renderSize);
 }
 
@@ -150 +150 @@
  * @returns true if loaded, false if something went wrong, or if a font was loaded before.
  */
-bool Font::loadFontFromTTF(const std::string& fontFile)
+bool Font::loadFontFromTTF(const std::string& fontFile, unsigned int renderSize)
 {
   this->data = FontDataPointer (new FontData());
 
   this->setName(fontFile);
-  this->data->fontTTF = TTF_OpenFont(this->getName(), this->data->renderSize);
+  this->data->fontTTF = TTF_OpenFont(fontFile.c_str(), renderSize);
 
   if(this->data->fontTTF != NULL)

branches/fontdata/src/lib/graphics/text_engine/font.h

@@ -32 +32 @@
 
   /// LOADING new Fonts
-  bool loadFontFromTTF(const std::string& fontFile);
+  bool loadFontFromTTF(const std::string& fontFile, unsigned int renderSize);
   bool loadFontFromSDL_Surface(SDL_Surface* surface);
 

branches/fontdata/src/lib/graphics/text_engine/font_data.cc

@@ -30 +30 @@
   this->fontTTF = NULL;
   this->glyphArray = NULL;
+  this->renderStyle = TTF_STYLE_NORMAL;
+  this->renderSize = FONT_DEFAULT_RENDER_SIZE;
 }
 

branches/fontdata/src/lib/graphics/text_engine/text.cc

@@ -179 +179 @@
     if (newFont == NULL)
     {
-      //      newFont = Font::getDefaultFont();
+//      newFont = &Font::();
       PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
     }
@@ -188 +188 @@
 
   // unloading the Font if we alrady have one loaded.
+
   this->_font = *newFont;
 //   if (oldFont != NULL && oldFont != Font::getDefaultFont())