Changeset 8765 in orxonox.OLD for trunk/src/lib/graphics/text_engine/font_data.h

Timestamp:

Jun 24, 2006, 3:49:33 AM (19 years ago)

Author:

bensch

Message:

trunk: much better loading of the Font

File:

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

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

@@ -59 +59 @@
   bool loadFontFromSDL_Surface(SDL_Surface* surface);
 
-  void setStyle(const std::string& renderStyle);
+  void setStyle(TTF_Font* font, const std::string& renderStyle);
 
 
@@ -65 +65 @@
   /** @returns a Pointer to the Array of Glyphs */
   inline Glyph** getGlyphArray() const { return this->glyphArray; };
-  /** @returns the a pointer to the TTF */
-  inline TTF_Font* getTTF() const { return this->fontTTF; };
 
-  int getMaxHeight() const;
-  int getMaxAscent() const;
-  int getMaxDescent() const;
+  int getMaxHeight() const { return maxHeight; };
+  int getMaxAscent() const { return maxAscent; };
+  int getMaxDescent() const { return maxDescent; };
 
 
@@ -82 +80 @@
   FontData();
 
-  void initGlyphs(Uint16 from, Uint16 count);
-  bool getGlyphMetrics(Glyph* glyph, Uint16 character);
+  void initGlyphs(TTF_Font* font, Uint16 from, Uint16 count);
+  bool getGlyphMetrics(TTF_Font* font, Glyph* glyph, Uint16 character);
 
   int findOptimalFastTextureSize();
-  bool createFastTexture();
+  bool createFastTexture(TTF_Font* font);
 
 private:
-  TTF_Font*     fontTTF;             //!< The font we use for this.
+  std::string   fontFile;            //!< The FileName the Font was loaded from.
+
   int           renderStyle;         //!< The Renderstyle
   unsigned int  renderSize;          //!< How big the Font should be rendered.
 
   Glyph**       glyphArray;          //!< An Array of all the Glyphs stored in the Array of Glyphs.
+
+  int           maxHeight;           //!< Max Height of the Font.
+  int           maxAscent;           //!< Max Ascent of the Font.
+  int           maxDescent;          //!< Max Desent of the Font.
 
   TextureDataPointer   texData;