Changeset 8594 in orxonox.OLD

Timestamp:

Jun 19, 2006, 11:58:03 PM (18 years ago)

Author:

bensch

Message:

typo

Location:

branches/gui/src/lib

Files:

• gui/gl/glgui_style.cc (modified) (4 diffs)
• gui/gl/glgui_style.h (modified) (1 diff)
• gui/gl/glgui_widget.cc (modified) (3 diffs)
• util/filesys/file.cc (modified) (1 diff)
• util/filesys/file.h (modified) (1 diff)

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

@@ -30 +30 @@
   GLGuiStyle::GLGuiStyle (const TiXmlElement* root)
   {
-    _font = NULL;
+    this->_font = NULL;
     this->_currentState = OrxGui::Normal;
     this->_animationCycle = -1.0;
@@ -327 +327 @@
   }
 
+    /**
+     * @brief sets the Background Texture to all States.
+     * @param textureName the Texture's fileName.
+     */
+  void GLGuiStyle::setBackgroundTexture(const std::string& textureName)
+  {
+    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
+      _style[i]._background.setDiffuseMap(textureName);
+  }
+
   /**
    * @brief sets the Background Texture.
@@ -336 +346 @@
     _style[state]._background.setDiffuseMap(texture);
   }
+
 
 
@@ -492 +503 @@
 
 
+  void GLGuiStyle::tick(float dt)
+  {
+
+  }
+
+  void GLGuiStyle::switchState(OrxGui::State state)
+  {
+    this->_currentStyle = this->_style[state];
+    this->_currentState = state;
+    printf("Switching to state %s\n", OrxGui::StateString[state].c_str());
+  }
+
+
   /**
    * @param stateName the Name of a State.

branches/gui/src/lib/gui/gl/glgui_style.h

@@ -117 +117 @@
 
     void setBackgroundTexture(const Texture& texture);
+    void setBackgroundTexture(const std::string& textureName);
     void setBackgroundTexture(const Texture& texture, OrxGui::State state);
     void setBackgroundTexture(const std::string& textureName, const std::string& stateName);

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

@@ -67 +67 @@
     this->_pushed = false;
     this->_state = OrxGui::Normal;
+    this->_toFrontColor = NULL;
+
+    this->style().setBackgroundColor(Color(0, 0, 0, 1));
+
+    this->style().setForegroundColor(Color(1, 0, 0, 1), OrxGui::Normal);
+    this->style().setForegroundColor(Color(0, 1, 0, 1), OrxGui::Selected);
+    this->style().setForegroundColor(Color(0, 0, 1, 1), OrxGui::Focused);
+    this->style().setForegroundColor(Color(.1, .1, .1, 1), OrxGui::Insensitive);
 
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
-/*    this->_backMat.setDiffuseColor(Color(1.0, 0.5, 0.4, 1.0));
-    this->_backMat.setDiffuseMap("gui_element_background.png");
-    this->_frontColor = Color(1.0, 0.0, 0.0);*/
-    this->_toFrontColor = NULL;
+    this->style().setBackgroundTexture("gui_element_background.png");
   }
 
@@ -115 +120 @@
     return this->focusOverWidget(cursor->getAbsCoor2D());
   }
+
+
 
   void GLGuiWidget::setFrontColor(const Color& frontColor, bool instantaniously)
@@ -164 +171 @@
   void GLGuiWidget::clicking(const Vector2D& pos)
   {
-    this->setFrontColor(Color(0, 0, 1));
-
+    this->style().switchState(OrxGui::Selected);
   }
 
   void GLGuiWidget::releasing(const Vector2D& pos)
   {
-    this->setFrontColor(Color(0,1,0));
-
+    this->style().switchState(OrxGui::Normal);
   }
 
   void GLGuiWidget::receivedFocus()
   {
-    this->setFrontColor(Color(0, 1, 0));
+    this->style().switchState(OrxGui::Focused);
   }
 
   void GLGuiWidget::removedFocus()
   {
-    this->setFrontColor(Color(1, 0, 0));
+    this->style().switchState(OrxGui::Normal);
 
   }

branches/gui/src/lib/util/filesys/file.cc

@@ -205 +205 @@
 
 /// FIXME NEXT THREE FUNCTIONS
-bool File::isReadeable() const
+bool File::isReadable() const
 {
 #ifndef __WIN32__

branches/gui/src/lib/util/filesys/file.h

@@ -51 +51 @@
   bool isFile() const;
   bool isDirectory() const;
-  bool isReadeable() const;
+  bool isReadable() const;
   bool isWriteable() const;
   bool isExecutable() const;