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

Timestamp:

Jun 23, 2006, 10:20:35 PM (19 years ago)

Author:

bensch

Message:

font is a Material now

File:

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

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

@@ -17 +17 @@
 
 //! A class to handle a Font of a certain ttf-File/image-file, Size.
-class Font : public BaseObject /* TODO Material it should be */
+class Font : public Material /* TODO Material it should be */
 {
 
@@ -27 +27 @@
   virtual ~Font();
 
-  Font& operator=(const Font& font) { this->data = font.data; return *this; };
+  Font& operator=(const Font& font);
   bool operator==(const Font& font) const { return this->data == font.data; };
 
@@ -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;
@@ -52 +49 @@
   //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 ;
+  void debug() const;
 
 private:
   void init();
+  void initGlyphs(Uint16 from, Uint16 count);
   bool getGlyphMetrics(Glyph* glyph, Uint16 character);
+  static void initDefaultFont();
 
+  int findOptimalFastTextureSize();
   bool createFastTexture();
 
-  void initGlyphs(Uint16 from, Uint16 count);
-  int findOptimalFastTextureSize();
+  bool setTexture(GLuint texture);
 
-  static void initDefaultFont();
 
 private: