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

Timestamp:

Aug 25, 2005, 1:26:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: color is now a parameter of text not font

File:

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

trunk/src/lib/graphics/text_engine.h

@@ -34 +34 @@
 class PNode;
 class Font;
-template<class T> class tList;
 
 #define  TEXT_ALIGN_LEFT             E2D_ALIGN_LEFT
@@ -113 +112 @@
   inline void setBlending(float blending) { this->blending = blending; };
 
-  // Static Text
-  void setColor(Uint8 r, Uint8 g, Uint8 b);
+  /** sets the Color of the Text to render (values in [0-1]) @param r red @param g green @param b blue */
+  void setColor(float r, float g, float b) { this->color = Vector(r,g,b); };
 
   void createTexture();
@@ -133 +132 @@
   int               type;           //!< The type of this Font.
   char*             text;           //!< The text to display
-  SDL_Color         color;          //!< The color of the font.
+  Vector            color;          //!< The color of the font.
   float             blending;       //!< The blending intensity.
 
@@ -152 +151 @@
  public:
   Font(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);
+       unsigned int fontSize = FONT_DEFAULT_SIZE);
 
   virtual ~Font();
@@ -162 +158 @@
   bool setFont(const char* fontFile);
   void setSize(unsigned int fontSize);
-  void setFastColor(Uint8 r, Uint8 g, Uint8 b);
   void setStyle(const char* renderStyle);
 
   /** @returns a Pointer to the Array of Glyphs */
-  inline Glyph** getGlyphArray() const {return glyphArray;}
+  inline Glyph** getGlyphArray() const { return glyphArray; };
   /** @returns the texture to the fast-texture */
   inline GLuint getFastTextureID() const {return fastTextureID;}
@@ -195 +190 @@
   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;            //!< A list of texts this Font is mapped to.
@@ -213 +207 @@
   Text* createText(const char* fontFile,
                    unsigned int fontSize = FONT_DEFAULT_SIZE,
-                   int textType = TEXT_DYNAMIC,
-                   Uint8 r = FONT_DEFAULT_COLOR_R,
-                   Uint8 g = FONT_DEFAULT_COLOR_G,
-                   Uint8 b = FONT_DEFAULT_COLOR_B);
+                   int textType = TEXT_DYNAMIC);
 
   void debug() const;
@@ -228 +219 @@
   static void disableFonts();
   static bool checkVersion();
-
- private:
-  //  tList<Font>* fontList;
-
 };