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

Timestamp:

Jun 24, 2006, 2:16:12 AM (18 years ago)

Author:

bensch

Message:

merged the new Font-Implementation back here
merged with svn merge ​https://svn.orxonox.net/orxonox/branches/fontdata . -r8752:HEAD
no conflicts, naturally

File:

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

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

@@ -48 +48 @@
 
 
-class FontData : public TextureData
+class FontData
 {
   friend class Font;
 public:
-  FontData();
   ~FontData();
 
@@ -65 +64 @@
 
 private:
+  FontData();
+
+private:
   TTF_Font*     fontTTF;             //!< The font we use for this.
   int           renderStyle;         //!< The Renderstyle
@@ -70 +72 @@
 
   Glyph**       glyphArray;          //!< An Array of all the Glyphs stored in the Array of Glyphs.
+
+  TextureDataPointer   texData;
 };
 
-typedef CountPointer<FontData> fontDataPointer;
+typedef CountPointer<FontData> FontDataPointer;
 
 #endif /* _FONT_DATA_H */