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

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.h (modified) (2 diffs)

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.
 };