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

Timestamp:

Jun 23, 2006, 6:38:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: non-compiling new Version of the Data-Font

File:

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

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

@@ -27 +27 @@
 
 #include "debug.h"
-#include "stdlibincl.h"
 #include "compiler.h"
-using namespace std;
+
 
 /**
@@ -37 +36 @@
  */
 Font::Font(const std::string& fontFile, unsigned int renderSize)
-  : data(new FontData())
+  : data(Font::defaultFontData)
 {
   this->init();
@@ -54 +53 @@
  */
 Font::Font(const std::string& imageFile)
-  : data(new FontData())
+  : data(Font::defaultFontData)
 {
   this->init();
+
   this->setName(imageFile);
   //  this->setSize(fontSize);
@@ -78 +78 @@
  */
 Font::Font(char** xpmArray)
-  : data(new FontData())
+  : data(Font::defaultFontData)
 {
   this->init();
@@ -111 +111 @@
 {
   this->setClassID(CL_FONT, "Font");
-}
+  if (Font::defaultFontData.get() == NULL)
+    Font::defaultFontData = initDefaultFont();
+}
+
+FontDataPointer Font::defaultFontData = FontDataPointer(NULL); //initDefaultFont();
 
 
@@ -121 +125 @@
 bool Font::loadFontFromTTF(const std::string& fontFile)
 {
-  // checking for existent Font.
-  if (this->data->fontTTF != NULL)
-  {
-    TTF_CloseFont(this->data->fontTTF);
-    this->data->fontTTF = NULL;
-  }
-
+  this->data = FontDataPointer (new FontData());
 
   this->setName(fontFile);
@@ -223 +221 @@
   //    PRINTF(2)("Font was not initialized, please do so before setting the Font-Style.\n");
 }
-
-Font* Font::defaultFont = NULL;
 
 /**
@@ -288 +284 @@
  * @brief initializes the default font
  */
-void Font::initDefaultFont()
-{
-  if (Font::defaultFont == NULL)
-    Font::defaultFont = new Font(font_xpm);
-}
-
-/**
- * @brief deletes the default font
- */
-void Font::removeDefaultFont()
-{
-  if (Font::defaultFont != NULL)
-    delete Font::defaultFont;
-  Font::defaultFont = NULL;
-}
-
+FontDataPointer Font::initDefaultFont()
+{
+  return Font(font_xpm).data;
+}
 
 /**
@@ -569 +553 @@
  * @brief a simple function to get some interesting information about this class
  */
-void Font::debug()
+void Font::debug() const
 {
   // print the loaded font's style