Changeset 8757 in orxonox.OLD for branches

Timestamp:

Jun 23, 2006, 8:41:13 PM (18 years ago)

Author:

bensch

Message:

font: looks same as before

File:

• branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) (5 diffs)

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

@@ -33 +33 @@
   : data(Font::defaultFontData)
 {
-  printf("Font()\n");
   this->init();
 
@@ -46 +45 @@
   : data(Font::defaultFontData)
 {
-  printf("Font(const std::string& fontFile, unsigned int renderSize)\n");
   this->init();
-
-  assert(data.get() != NULL);
-
-  this->setStyle("c");
 
   if (!fontFile.empty())
@@ -64 +58 @@
   : data(Font::defaultFontData)
 {
-  printf("Font(const std::string& imageFile)\n");
   this->init();
 
@@ -90 +83 @@
   : data(Font::defaultFontData)
 {
-  printf("Font(char** xpmArray)\n");
-
   this->init();
   this->setName("XPM-array-font");
@@ -156 +147 @@
   this->setName(fontFile);
   this->data->fontTTF = TTF_OpenFont(fontFile.c_str(), renderSize);
+  this->data->renderSize = renderSize;
 
   if(this->data->fontTTF != NULL)
   {
+    this->setStyle("c");
     this->createFastTexture();
     if (this->getTexture() != 0)