Changeset 5121 in orxonox.OLD for trunk/src/util

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/util

Files:

• resource_manager.cc (modified) (2 diffs)
• resource_manager.h (modified) (1 diff)
• shell.cc (modified) (2 diffs)
• track/track_manager.cc (modified) (1 diff)

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.