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

Timestamp:

Oct 7, 2005, 6:17:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManage-fixes

File:

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

trunk/src/lib/graphics/text_engine.h

@@ -105 +105 @@
 class Text : public Element2D
 {
+  friend class TextEngine;
  public:
-   Text(Font* font = NULL, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
+   Text(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
   ~Text();
 
-  void setFont(Font* font);
+  void init();
+
   void setFont(const char* fontFile, unsigned int fontSize);
   void setType(TEXT_RENDER_TYPE type);
@@ -128 +130 @@
 
  private:
-  static GLuint loadTexture(SDL_Surface* surface, TexCoord* texCoord);
-  static int powerOfTwo(int input);
+   Text(Font* font = NULL, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
+   void setFont(Font* font);
+
+   static GLuint loadTexture(SDL_Surface* surface, TexCoord* texCoord);
+   static int powerOfTwo(int input);
 
  private: