Changeset 3769 in orxonox.OLD for orxonox/branches/textEngine/src/lib/graphics/font/text_engine.h

Timestamp:

Apr 9, 2005, 10:32:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: compiling again, many movements… still working

File:

• orxonox/branches/textEngine/src/lib/graphics/font/text_engine.h (modified) (9 diffs)

orxonox/branches/textEngine/src/lib/graphics/font/text_engine.h

@@ -93 +93 @@
 {
  public:
-  Text(void);
+  Text(Font* font, int type = TEXT_DYNAMIC);
   ~Text(void);
 
@@ -101 +101 @@
   void setText(const char* text);
   void setPosition(int x, int y);
+
+  // Static Text
+  void setColor(Uint8 r, Uint8 g, Uint8 b);
+  void setStyle(char* renderStyle);
+  void createTexture();
+
+  // Dynamic Text
+  
+
 
   virtual void draw(void);
@@ -113 +122 @@
   GLuint texture;                //!< A GL-texture to hold the text
   TexCoord texCoord;             //!< Texture-coordinates \todo fix this to have a struct
-  SDL_Rect posSize;          //!< An SDL-Rectangle representing the position and size of the Text on the screen.
+  SDL_Rect posSize;              //!< An SDL-Rectangle representing the position and size of the Text on the screen.
   
   PNode* bindNode;               //!< A node the Text is bind to. (if NULL thr node will not be bound to anything.)
@@ -124 +133 @@
 class Font
 {
+  friend class Text;
  public:
   Font(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE,
@@ -132 +142 @@
   bool setFont(const char* fontFile);
   void setSize(unsigned int fontSize);
-  void setColor(Uint8 r, Uint8 g, Uint8 b);
+  void setFastColor(Uint8 r, Uint8 g, Uint8 b);
   void setStyle(char* renderStyle);
 
   inline Glyph** getGlyphArray(void) {return glyphArray;}
   inline GLuint getFastTextureID(void) {return fastTextureID;}
-  void createTexture(void);
   
   
@@ -148 +157 @@
   char* fontFile;                   //!< The fontfile from whitch the font was loaded.
   unsigned int fontSize;            //!< The size of the font in pixels. each Font has one size.
-  int renderStyle;               //!< The Renderstyle
+  int renderStyle;                  //!< The Renderstyle
   
   Glyph** glyphArray;               //!< An Array of all the Glyphs stored in the Array of Glyphs.
   GLuint fastTextureID;             //!< The fast textureID.
+  SDL_Color fastColor;              //!< A Color for the fast Texture.
 
   tList<Text>* textList;
-  Text* currentText;
 
   int getMaxHeight(void);
@@ -166 +175 @@
 
   GLuint createFastTexture();
-  GLuint loadTexture(SDL_Surface* surface, TexCoord* texCoord);
 
   void initGlyphs(Uint16 from, Uint16 count);
   int findOptimalFastTextureSize(void);
-  static int powerOfTwo(int input);
 
   void debug(void);
 
 };
+GLuint loadTexture(SDL_Surface* surface, TexCoord* texCoord);
+int powerOfTwo(int input);
 
 
@@ -187 +196 @@
   virtual ~TextEngine(void);
 
+  Text* createText(const char* fontFile,
+                   unsigned int fontSize = FONT_DEFAULT_SIZE,
+                   Uint8 r = FONT_DEFAULT_COLOR_R,
+                   Uint8 g = FONT_DEFAULT_COLOR_G,
+                   Uint8 b = FONT_DEFAULT_COLOR_B);
+
+  void draw(void);
+
+ private:
+  TextEngine(void);
+  static TextEngine* singletonRef;
+
   // general
   static void enableFonts(void);
@@ -192 +213 @@
   static bool checkVersion(void);
 
- private:
-  TextEngine(void);
-  static TextEngine* singletonRef;
-
-  tList<Font>* fontList;
+
+  //  tList<Font>* fontList;
+  tList<Text>* textList;
 
 };