Changeset 8990 in orxonox.OLD

Timestamp:

Jul 1, 2006, 6:09:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Functionality to widget, so one can set a foreground texture, for Widgets requesting it.

Location:

trunk/src

Files:

• lib/gui/gl/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• util/hud.cc (modified) (2 diffs)
• util/hud.h (modified) (3 diffs)
• world_entities/elements/glgui_energywidget.cc (modified) (1 diff)

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

@@ -651 +651 @@
     else
       this->setForegroundColor(Color(r,g,b,a));
+  }
+
+
+    /**
+   * @brief sets the Foreground Texture for all States.
+   * @param texture the Texture.
+     */
+  void GLGuiWidget::setForegroundTexture(const Texture& texture)
+  {
+    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
+      setForegroundTexture(texture, (OrxGui::State)i);
+  }
+
+  /**
+   * @brief sets the Foreground Texture to all States.
+   * @param textureName the Texture's fileName.
+   */
+  void GLGuiWidget::setForegroundTexture(const std::string& textureName)
+  {
+    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
+      _style[i]._foreground.setDiffuseMap(textureName);
+    this->_currentStyle._foreground.setDiffuseMap(textureName);
+  }
+
+  /**
+   * @brief sets the Foreground Texture.
+   * @param texture the Texture.
+   * @param state the State to setup.
+   */
+  void GLGuiWidget::setForegroundTexture(const Texture& texture, OrxGui::State state)
+  {
+    _style[state]._background.setDiffuseMap(texture);
+    if (state == _state)
+      _currentStyle._background.setDiffuseMap(texture);
+  }
+
+
+
+  /**
+   * @brief sets the Foreground Texture.
+   * @param texture the Texture.
+   * @param stateName the State to setup.
+   */
+  void GLGuiWidget::setForegroundTexture(const std::string& textureName, const std::string& stateName)
+  {
+    OrxGui::State state;
+    if (getState(stateName, &state))
+      ; /// FIXME this->setForegroundTexture(textureName, state);
+    else
+      ; ///    this->setForegroundTexture(textureName);
   }
 

trunk/src/lib/gui/gl/glgui_widget.h

@@ -192 +192 @@
     void setForegroundColorS(float r, float g, float b, float a, const std::string& stateName);
 
+    void setForegroundTexture(const Texture& texture);
+    void setForegroundTexture(const std::string& textureName);
+    void setForegroundTexture(const Texture& texture, OrxGui::State state);
+    void setForegroundTexture(const std::string& textureName, const std::string& stateName);
+
     void loadBackgroundMaterial(const Material& material);
     void loadBackgroundMaterial(const Material& material, OrxGui::State state);

trunk/src/util/hud.cc

@@ -49 +49 @@
   notifier->setAbsCoor2D(100,100);
 
+  this->subscribeEvent(ES_ALL, EV_VIDEO_RESIZE);
 
 
@@ -192 +193 @@
 }
 
-
-void Hud::tick(float dt)
-{
-  if (this->resY != State::getResY() || this->resX != State::getResX())
-  {
+void Hud::draw() const
+{
+  //  GLGuiWidget::draw();
+}
+
+
+void Hud::process(const Event &event)
+{
+  if (event.type == EV_VIDEO_RESIZE)
     this->updateResolution();
-  }
-
-}
-
-void Hud::draw() const
-{
-  //  GLGuiWidget::draw();
-}
-
-
+}
+
+

trunk/src/util/hud.h

@@ -8 +8 @@
 
 #include "element_2d.h"
+#include "event_listener.h"
 // FORWARD DECLARATION
 class TiXmlElement;
@@ -20 +21 @@
 
 //! A class that renders a HUD (Heads Up Display for User Information).
-class Hud : public Element2D
+class Hud : public Element2D, public EventListener
 {
 
@@ -44 +45 @@
   void updateWeaponManager();
 
-  void tick(float dt);
   void draw() const;
+  virtual void process(const Event &event);
+
 
   private:

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -39 +39 @@
     this->_bar.setBackgroundTexture(Texture());
     this->_bar.setBackgroundColor(Color(0,0,0,0));
+    this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
     this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
   }