Changeset 5121 in orxonox.OLD

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

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/text_engine.cc (modified) (16 diffs)
• lib/graphics/text_engine.h (modified) (8 diffs)
• util/resource_manager.cc (modified) (2 diffs)
• util/resource_manager.h (modified) (1 diff)
• util/shell.cc (modified) (2 diffs)
• util/track/track_manager.cc (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -464 +464 @@
 if (this->geTextCFPS == NULL)
 {
-  this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
+  this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC);
   this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
   this->geTextCFPS->setAbsCoor2D(5, 5);
@@ -470 +470 @@
 if (this->geTextMaxFPS == NULL)
 {
-      this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
+      this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC);
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMaxFPS->setAbsCoor2D(5, 35);
@@ -476 +476 @@
 if (this->geTextMinFPS == NULL)
 {
-      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
+      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC);
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMinFPS->setAbsCoor2D(5, 65);

trunk/src/lib/graphics/text_engine.cc

@@ -60 +60 @@
   this->texture = 0;
   this->blending = 1.0f;
+  this->color = Vector(1.0, 1.0, 1.0);
   this->setType(type);
 
@@ -75 +76 @@
 
   if (this->text)
-    delete []this->text;
+    delete[] this->text;
 }
 
@@ -130 +131 @@
 
 /**
- *  sets a new color to the font
- * @param r Red
- * @param g Green
- * @param b Blue
-*/
-void Text::setColor(Uint8 r, Uint8 g, Uint8 b)
-{
-  this->color.r = r;
-  this->color.g = g;
-  this->color.b = b;
-}
-
-/**
  *  creates a texture out of the given parameters
 
@@ -154 +142 @@
     glDeleteTextures(1, &this->texture);
   if (likely(this->font != NULL))
+  {
+    SDL_Color theColor = { (int)(this->color.x*255), (int)(this->color.y*255), (int)(this->color.z*255) };
     tmpSurf = TTF_RenderText_Blended(this->font->font,
                                      this->text,
-                                     this->color);
+                                     theColor);
+  }
   if (tmpSurf)
     this->texture = loadTexture(tmpSurf, &this->texCoord);
@@ -179 +170 @@
   // drawing this Text.
   // setting the Blending effects
-  glColor4f(1.0f,1.0f,1.0f, this->blending);
+  glColor4f(this->color.x, this->color.y, this->color.z, this->blending);
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+
+  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 
   if(type == TEXT_STATIC)
@@ -234 +227 @@
     PRINT(0)("is bind to %s; ref=%p\n", this->getBindNode()->getName(), this->getBindNode());
   PRINT(0)("Relative Position: (%d::%d)\n", this->posSize.x, this->posSize.y);
-  PRINT(0)("Color: %d %d %d\n", this->color.r, this->color.g, this->color.b);
+  PRINT(0)("Color: %0.2f %0.2f %0.2f\n", this->color.x, this->color.y, this->color.z);
 }
 
@@ -349 +342 @@
  * @param b Blue value of the Font.
 */
-Font::Font(const char* fontFile, unsigned int fontSize, Uint8 r, Uint8 g, Uint8 b)
+Font::Font(const char* fontFile, unsigned int fontSize)
 {
   this->setClassID(CL_FONT, "Font");
@@ -364 +357 @@
   this->setStyle("c");//TTF_STYLE_NORMAL);
 
-  this->setFastColor(r, g, b);
-
   this->fastTextureID = this->createFastTexture();
 }
@@ -381 +372 @@
       for (int i = 0; i < FONT_HIGHEST_KNOWN_CHAR; i++)
         delete this->glyphArray[i];
-      delete []this->glyphArray;
+      delete[] this->glyphArray;
     }
 
@@ -448 +439 @@
 {
   this->fontSize = fontSize;
-}
-
-/**
- *  sets a new color to the font
- * @param r Red
- * @param g Green
- * @param b Blue
-*/
-void Font::setFastColor(Uint8 r, Uint8 g, Uint8 b)
-{
-  this->fastColor.r = r;
-  this->fastColor.g = g;
-  this->fastColor.b = b;
 }
 
@@ -538 +516 @@
 
   this->initGlyphs(32, numberOfGlyphs);
-  this->glyphArray[32]->width = fontSize/3; //!< @todo find out the real size of a Space
+  this->glyphArray[32]->width = fontSize/2; //!< @todo find out the real size of a Space
 
   int rectSize = this->findOptimalFastTextureSize();
@@ -589 +567 @@
           // reading in the new Glyph
           if (likely(this->font != NULL))
-            glyphSurf = TTF_RenderGlyph_Blended(this->font, i, this->fastColor);
+          {
+            SDL_Color white = {255, 255, 255};
+            glyphSurf = TTF_RenderGlyph_Blended(this->font, i, white);
+          }
           if( glyphSurf != NULL )
             {
@@ -598 +579 @@
               tmpTexCoord.minU = (float)tmpRect.x/(float)tmpSurf->w;
               tmpTexCoord.maxU = (float)(tmpRect.x +1 + tmpGlyph->width)/(float)tmpSurf->w;
-              tmpTexCoord.minV = (float)tmpRect.y/(float)tmpSurf->w;
+              tmpTexCoord.minV = (float)(tmpRect.y)/(float)tmpSurf->w;
               tmpTexCoord.maxV = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
               tmpGlyph->displayList = glGenLists(1);
@@ -691 +672 @@
   int x,y; // the counters
   int maxLineHeight;
-  int size = 32;      // starting Value, we have to start somewhere 32 seems reasonable.
+  unsigned int size = 32;  // starting Value, we have to start somewhere 32 seems reasonable. (take any small enough 2^i number)
   bool sizeOK = false;
   Glyph* tmpGlyph;
@@ -815 +796 @@
    @see Text::Text
 */
-Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, int textType, Uint8 r, Uint8 g, Uint8 b)
+Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, int textType)
 {
   Font* tmpFont;
@@ -821 +802 @@
   Vector tmpVec;
 
-  tmpVec = Vector(r, g, b);
-  tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize, &tmpVec);
+  tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
   if (!tmpFont)
     {

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;
-
 };
 

trunk/src/util/resource_manager.cc

@@ -319 +319 @@
             else
               tmpResource->ttfSize = FONT_DEFAULT_SIZE;
-            if (param2)
-              {
-                Vector* tmpVec = (Vector*)param2;
-                tmpResource->ttfColorR = (int)tmpVec->x;
-                tmpResource->ttfColorG = (int)tmpVec->y;
-                tmpResource->ttfColorB = (int)tmpVec->z;
-              }
-            else
-              {
-                tmpResource->ttfColorR = FONT_DEFAULT_COLOR_R;
-                tmpResource->ttfColorG = FONT_DEFAULT_COLOR_G;
-                tmpResource->ttfColorB = FONT_DEFAULT_COLOR_B;
-              }
 
           if(isFile(fullName))
             tmpResource->pointer = new Font(fullName,
-                                            tmpResource->ttfSize,
-                                            tmpResource->ttfColorR,
-                                            tmpResource->ttfColorG,
-                                            tmpResource->ttfColorB);
+                                            tmpResource->ttfSize);
           else
             PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName);
@@ -560 +544 @@
               else if (enumRes->ttfSize == *(int*)param1)
                 subMatch = true;
-              if(subMatch)
-                {
-                  Vector* tmpVec = (Vector*)param2;
-                  if (!param2)
-                    {
-                      if(enumRes->ttfColorR == FONT_DEFAULT_COLOR_R &&
-                         enumRes->ttfColorG == FONT_DEFAULT_COLOR_G &&
-                         enumRes->ttfColorB == FONT_DEFAULT_COLOR_B )
-                        match = true;
-                    }
-                  else if (enumRes->ttfColorR == (int)tmpVec->x &&
-                           enumRes->ttfColorG == (int)tmpVec->y &&
-                           enumRes->ttfColorB == (int)tmpVec->z )
-                    match = true;
-                }
               break;
 #endif /* NO_TEXT */

trunk/src/util/resource_manager.h

@@ -79 +79 @@
 #ifndef NO_TEXT
   unsigned int      ttfSize;           //!< the size of the ttf-font (TTF)
-  unsigned char     ttfColorR;         //!< red Color (TTF)
-  unsigned char     ttfColorG;         //!< green Color (TTF)
-  unsigned char     ttfColorB;         //!< blue Color (TTF)
 #endif /* NO_TEXT */
 };

trunk/src/util/shell.cc

@@ -158 +158 @@
   if (this->inputLineText == NULL)
     delete this->inputLineText;
-  this->inputLineText = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
+  this->inputLineText = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC);
+  this->inputLineText->setColor(1, 0, 0);
   this->inputLineText->setAlignment(TEXT_ALIGN_LEFT);
   this->inputLineText->setText(NULL);
@@ -183 +184 @@
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
   {
-    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
+    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC);
+    this->bufferText[i]->setColor(1, 0, 0);
     this->bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
     this->bufferText[i]->setRelCoor2D(calculateLinePosition(i));

trunk/src/util/track/track_manager.cc

@@ -380 +380 @@
   this->setBindSlave(this->trackNode);
   // initializing the Text
-  this->trackText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
+  this->trackText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC);
   this->trackText->setAlignment(E2D_ALIGN_SCREEN_CENTER);
   // initializing the Animation for the Text.