Changeset 9718 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine/font.h

Timestamp:

Sep 1, 2006, 11:56:54 PM (19 years ago)

Author:

bensch

Message:

more thoughts on Resources, and soon going to adapt… i think i've got a clue

File:

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

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

@@ -20 +20 @@
 {
   ObjectListDeclaration(Font);
-
+public:
+  typedef FontData::Glyph Glyph;
 public:
   Font();
@@ -40 +41 @@
 
   /** @returns a Pointer to the Array of Glyphs */
-  inline Glyph** getGlyphArray() const { return this->data->getGlyphArray(); };
+  inline const Glyph* const * const getGlyphArray() const { return this->data->getGlyphArray(); };
 
   inline int getMaxHeight() const { return data->getMaxHeight(); };
@@ -55 +56 @@
   static void initDefaultFont();
 
-  void setTexture(const TextureDataPointer& texDataPointer);
+  void setTexture(const TextureData::Pointer& texDataPointer);
 
 private:
-  FontDataPointer           data;                //!< A Data-Pointer to a Font.
+  FontData::Pointer         data;                //!< A Data-Pointer to a Font.
 
-  static FontDataPointer    defaultFontData;     //!< a default font, that is used, if other fonts were unable to be loaded.
+  static FontData::Pointer  defaultFontData;     //!< a default font, that is used, if other fonts were unable to be loaded.
 };