Changeset 8754 in orxonox.OLD for branches/fontdata/src/lib/graphics/text_engine/text.h

Timestamp:

Jun 23, 2006, 6:58:01 PM (19 years ago)

Author:

bensch

Message:

better, but still not running, yet

File:

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

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

@@ -9 +9 @@
 #include "element_2d.h"
 #include "color.h"
+#include "font.h"
 
 #define  TEXT_ALIGN_LEFT             E2D_ALIGN_LEFT
@@ -20 +21 @@
 
 // FORWARD DECLARATION
-class Font;
 struct SDL_Surface;
 
@@ -58 +58 @@
 
     /** @returns the pointer to the stored Font (not changeable) */
-    inline const Font* const font() const { return this->_font; };
+    inline const Font& font() const { return this->_font; };
     /** @returns the Blending Value [0 invisible 1.0 full visible */
     inline float blending() const { return this->_color.a(); };
@@ -76 +76 @@
 
   private:
-    Font*             _font;           //!< Font of this text
+    Font              _font;           //!< Font of this text
 
     std::string       _text;           //!< The text to display