Changeset 8756 in orxonox.OLD for branches/fontdata/src/lib/graphics/text_engine/font.cc

Timestamp:

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

Author:

bensch

Message:

orxonox/font: ok, the font is rendering again

File:

• branches/fontdata/src/lib/graphics/text_engine/font.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)