Changeset 8761 in orxonox.OLD for trunk/src/lib/graphics/text_engine/font.h

Timestamp:

Jun 24, 2006, 2:16:12 AM (18 years ago)

Author:

bensch

Message:

merged the new Font-Implementation back here
merged with svn merge ​https://svn.orxonox.net/orxonox/branches/fontdata . -r8752:HEAD
no conflicts, naturally

File:

• trunk/src/lib/graphics/text_engine/font.h (modified) (3 diffs)

trunk/src/lib/graphics/text_engine/font.h

@@ -11 +11 @@
 #define _FONT_H
 
-#include "texture.h"
+#include "material.h"
 
 #include "font_data.h"
@@ -17 +17 @@
 
 //! A class to handle a Font of a certain ttf-File/image-file, Size.
-class Font : public Texture
+class Font : public Material /* TODO Material it should be */
 {
 
 public:
-  Font(const std::string& fontFile,
-       unsigned int renderSize);
+  Font();
+  Font(const std::string& fontFile, unsigned int renderSize);
   Font(const std::string& imageFile);
   Font(char** xpmArray);
   virtual ~Font();
 
-  //  font
-  bool loadFontFromTTF(const std::string& fontFile);
+  Font& operator=(const Font& font);
+  /** @brief compare two fonts @param font the comparator, @returns true if they match */
+  bool operator==(const Font& font) const { return this->data == font.data; };
+
+
+  /// LOADING new Fonts
+  bool loadFontFromTTF(const std::string& fontFile, unsigned int renderSize);
   bool loadFontFromSDL_Surface(SDL_Surface* surface);
 
@@ -42 +47 @@
   int getMaxDescent() const;
 
-  /** @returns the default Font */
-  inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
+  void createAsciiImage(const std::string& fileName, unsigned int size) const;
 
-  void createAsciiImage(const std::string& fileName, unsigned int size) const;
+  void debug() const;
+
+private:
+  void init();
+  void initGlyphs(Uint16 from, Uint16 count);
+  bool getGlyphMetrics(Glyph* glyph, Uint16 character);
   static void initDefaultFont();
-  static void removeDefaultFont();
+
+  int findOptimalFastTextureSize();
+  bool createFastTexture();
+
+  bool setTexture(GLuint texture);
 
 
 private:
-  void init();
-  bool getGlyphMetrics(Glyph* glyph, Uint16 character);
+  static FontDataPointer    defaultFontData;     //!< a default font, that is used, if other fonts were unable to be loaded.
 
-  bool createFastTexture();
-
-  void initGlyphs(Uint16 from, Uint16 count);
-  int findOptimalFastTextureSize();
-
-  void debug();
-
-private:
-  static Font*  defaultFont;         //!< a default font, that is used, if other fonts were unable to be loaded.
-
-  fontDataPointer data;
+  FontDataPointer           data;                //!< A Data-Pointer to a Font.
 };