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

Timestamp:

Nov 24, 2005, 8:24:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: font is a Texture now (this is a procedural texture)

File:

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

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

@@ -11 +11 @@
 #define _FONT_H
 
-#include "base_object.h"
+#include "texture.h"
 
 #include "glincl.h"
@@ -52 +52 @@
 
 //! A class to handle a Font of a certain ttf-File/image-file, Size.
-class Font : public BaseObject
+class Font : public Texture
 {
   public:
@@ -63 +63 @@
     void init();
 
-  // font
+  //  font
     bool loadFontFromTTF(const char* fontFile);
     bool loadFontFromSDL_Surface(SDL_Surface* surface);
@@ -71 +71 @@
     /** @returns a Pointer to the Array of Glyphs */
     inline Glyph** getGlyphArray() const { return this->glyphArray; };
-    /** @returns the texture to the fast-texture */
-    inline GLuint getFastTextureID() const { return this->fastTextureID; };
+    /** @returns the a pointer to the TTF */
+    inline TTF_Font* getTTF() const { return this->fontTTF; };
+
+
     /** @returns the default Font */
     inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
-    /** @returns the a pointer to the TTF */
-    inline TTF_Font* getTTF() const { return this->fontTTF; };
 
     void createAsciiImage(const char* fileName);
     static void initDefaultFont();
     static void removeDefaultFont();
-
 
   private:
@@ -89 +88 @@
     Glyph* getGlyphMetrics(Uint16 character);
 
-    GLuint createFastTexture();
+    bool createFastTexture();
 
     void initGlyphs(Uint16 from, Uint16 count);
@@ -104 +103 @@
 
     Glyph**       glyphArray;          //!< An Array of all the Glyphs stored in the Array of Glyphs.
-    GLuint        fastTextureID;       //!< The fast textureID.
 };