Changeset 10225 in orxonox.OLD for branches/gui/src/lib

Timestamp:

Jan 10, 2007, 5:59:05 PM (18 years ago)

Author:

patrick

Message:

texture problem solved, now all backgrounds are shown

File:

• branches/gui/src/lib/gui/gl/glgui_widget.cc (modified) (3 diffs)

branches/gui/src/lib/gui/gl/glgui_widget.cc

@@ -112 +112 @@
 
 
-
-    this->setBackgroundColor(Color(0, 0, 0, 0.5));
+    this->setBackgroundColor(Color(0, 0, 0, 0.0));
     this->setBackgroundColor(Color(0, 0, 0, 0), OrxGui::Selected);
 
 
-    this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
-    this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
-    this->_style[2]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
-    this->_style[3]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
+    this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+    this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+    this->_style[2]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+    this->_style[3]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 
     this->setForegroundColor(Color(.8, .8, 1, 1), OrxGui::Normal);
@@ -572 +571 @@
   void GLGuiWidget::setBackgroundTexture(const std::string& textureName)
   {
-    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
+    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i) {
       _style[i]._background.setDiffuseMap(textureName);
+      _style[i]._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+    }
     this->_currentStyle._background.setDiffuseMap(textureName);
+    this->_currentStyle._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
   }
 
@@ -585 +587 @@
   {
     _style[state]._background.setDiffuseMap(texture);
-    if (state == _state)
+    _style[state]._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+
+    if (state == _state) {
       _currentStyle._background.setDiffuseMap(texture);
+      _currentStyle._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+    }
   }