Changeset 5373 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Oct 13, 2005, 12:45:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the Shell's background-render pathc is in the Material

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (2 diffs)
• shell.h (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -219 +219 @@
 {
   this->backgroundMaterial->setDiffuse(r, g, b);
-  this->backgroundColor[0] = r;
-  this->backgroundColor[1] = g;
-  this->backgroundColor[2] = b;
-  this->backgroundColor[3] = a;
   this->backgroundMaterial->setTransparency(a);
 }
@@ -445 +441 @@
 
   this->backgroundMaterial->select();
-  glColor4f(*(this->backgroundColor),
-            *(this->backgroundColor+1),
-            *(this->backgroundColor+2),
-            *(this->backgroundColor+3));
-
 
   glBegin(GL_TRIANGLE_STRIP);

trunk/src/lib/shell/shell.h

@@ -97 +97 @@
     char*                    fontFile;               //!< The file containing the font.
     Material*                backgroundMaterial;     //!< A material for the background.
-    float                    backgroundColor[4];     //!< The color of the background [r,g,b,a].
 
     // HANDLING TEXT INPUT