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

Timestamp:

Jun 23, 2006, 8:24:28 PM (19 years ago)

Author:

bensch

Message:

better with fonts

File:

• branches/fontdata/src/lib/graphics/text_engine/font.h (modified) (6 diffs)

branches/fontdata/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 BaseObject /* TODO Material it should be */
 {
 
 public:
   Font();
-  Font(const std::string& fontFile,
-       unsigned int renderSize);
+  Font(const std::string& fontFile, unsigned int renderSize);
   Font(const std::string& imageFile);
   Font(char** xpmArray);
@@ -31 +30 @@
   bool operator==(const Font& font) const { return this->data == font.data; };
 
-  //  font
+
+  /// LOADING new Fonts
   bool loadFontFromTTF(const std::string& fontFile);
   bool loadFontFromSDL_Surface(SDL_Surface* surface);
@@ -42 +42 @@
   inline TTF_Font* getTTF() const { return this->data->getTTF(); };
 
+  inline GLuint getTexture() const { return this->data->getTexture(); };
+
+
   int getMaxHeight() const;
   int getMaxAscent() const;
@@ -49 +52 @@
   //inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
-
-
   void createAsciiImage(const std::string& fileName, unsigned int size) const;
 
   void debug() const ;
+
 private:
   void init();
@@ -60 +62 @@
   bool createFastTexture();
 
-
   void initGlyphs(Uint16 from, Uint16 count);
   int findOptimalFastTextureSize();
 
-
-  static FontDataPointer initDefaultFont();
+  static void initDefaultFont();
 
 private: