Changeset 5373 in orxonox.OLD

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

Files:

• graphics/importer/material.cc (modified) (2 diffs)
• gui/gl_gui/glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• shell/shell.cc (modified) (2 diffs)
• shell/shell.h (modified) (1 diff)

trunk/src/lib/graphics/importer/material.cc

@@ -91 +91 @@
     {
       glEnable(GL_BLEND);
-      glColor4f(1.0f, 1.0f, 1.0f, this->transparency);
+      glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), this->transparency);
       glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     }
@@ -97 +97 @@
     {
       glDisable(GL_BLEND);
-      glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+      glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), 1);
     }
 

trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc

@@ -38 +38 @@
   this->backMat = new Material("load_screen");
   this->barMat = new Material("bar");
+  this->barMat->setDiffuse(1,1,1);
+  this->backMat->setDiffuse(1,1,1);
   this->maxValue = 10;
   this->currentValue = 0;

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