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

Timestamp:

Jun 24, 2006, 3:12:14 AM (19 years ago)

Author:

bensch

Message:

load-implementation of font in font-data

File:

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

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

@@ -32 +32 @@
   bool operator==(const Font& font) const { return this->data == font.data; };
 
-
   /// LOADING new Fonts
   bool loadFontFromTTF(const std::string& fontFile, unsigned int renderSize);
@@ -44 +43 @@
   inline TTF_Font* getTTF() const { return this->data->getTTF(); };
 
-  int getMaxHeight() const;
-  int getMaxAscent() const;
-  int getMaxDescent() const;
+  inline int getMaxHeight() const { return data->getMaxHeight(); };
+  inline int getMaxAscent() const { return data->getMaxAscent(); };
+  inline int getMaxDescent() const { return data->getMaxDescent(); };
+
 
   void createAsciiImage(const std::string& fileName, unsigned int size) const;
@@ -54 +54 @@
 private:
   void init();
-  void initGlyphs(Uint16 from, Uint16 count);
-  bool getGlyphMetrics(Glyph* glyph, Uint16 character);
   static void initDefaultFont();
 
-  int findOptimalFastTextureSize();
-  bool createFastTexture();
-
-  bool setTexture(GLuint texture);
-
+  void setTexture(const TextureDataPointer& texDataPointer);
 
 private: