Changeset 8753 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

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

Location:

branches/fontdata/src/lib/graphics/text_engine

Files:

• font.cc (modified) (9 diffs)
• font.h (modified) (2 diffs)
• font_data.h (modified) (1 diff)
• text.cc (modified) (3 diffs)
• text_engine.cc (modified) (2 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

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

@@ -43 +43 @@
 
   /** @returns the default Font */
-  inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
+  //inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
+
+
 
   void createAsciiImage(const std::string& fileName, unsigned int size) const;
-  static void initDefaultFont();
-  static void removeDefaultFont();
 
-
+  void debug() const ;
 private:
   void init();
@@ -56 +56 @@
   bool createFastTexture();
 
+
   void initGlyphs(Uint16 from, Uint16 count);
   int findOptimalFastTextureSize();
 
-  void debug();
+
+  static FontDataPointer initDefaultFont();
 
 private:
-  static Font*  defaultFont;         //!< a default font, that is used, if other fonts were unable to be loaded.
+  static FontDataPointer    defaultFontData;     //!< a default font, that is used, if other fonts were unable to be loaded.
 
-  fontDataPointer data;
+  FontDataPointer           data;                //!< A Data-Pointer to a Font.
 };
 

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

@@ -72 +72 @@
 };
 
-typedef CountPointer<FontData> fontDataPointer;
+typedef CountPointer<FontData> FontDataPointer;
 
 #endif /* _FONT_DATA_H */

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

@@ -56 +56 @@
 Text::~Text()
 {
-  if (this->_font != NULL && this->_font != Font::getDefaultFont())
-    ResourceManager::getInstance()->unload(this->_font);
+/*  if (this->_font != NULL && this->_font != Font::getDefaultFont())
+    ResourceManager::getInstance()->unload(this->_font);*/
 }
 
@@ -175 +175 @@
 {
   Font* newFont = NULL;
-  Font* oldFont = this->_font;
+//  Font* oldFont = this->_font;
 
   // load a new Font
@@ -183 +183 @@
     if (newFont == NULL)
     {
-      newFont = Font::getDefaultFont();
+      //      newFont = Font::getDefaultFont();
       PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
     }
   }
-  if (newFont == NULL)
-    newFont = Font::getDefaultFont();
+//  if (newFont == NULL)
+//    newFont = Font::getDefaultFont();
   assert(newFont != NULL);
 
   // unloading the Font if we alrady have one loaded.
   this->_font = newFont;
-  if (oldFont != NULL && oldFont != Font::getDefaultFont())
-    ResourceManager::getInstance()->unload(oldFont);
+//   if (oldFont != NULL && oldFont != Font::getDefaultFont())
+//     ResourceManager::getInstance()->unload(oldFont);
 
   this->setupTextWidth();

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

@@ -76 +76 @@
     {
       Font* font = dynamic_cast<Font*>(fontList->back());
-      if (likely(font != Font::getDefaultFont()))
-        ResourceManager::getInstance()->unload(font, RP_GAME);
+      //if (likely(font != Font::getDefaultFont()))
+      //        ResourceManager::getInstance()->unload(font, RP_GAME);
     }
   }
@@ -108 +108 @@
   if (TTF_WasInit())
     {
-      Font::removeDefaultFont();
+//      Font::removeDefaultFont();
       TTF_Quit();
     }