Changeset 7932

Timestamp:

Feb 20, 2011, 4:53:43 PM (14 years ago)

Author:

bknecht

Message:

The boost bar is now flashing red when the boost is cooling down. However the solution in OrxonoxOverlay is a bit questionable and could probably be solved less hacky…

Location:

code/branches/hudimprovements

Files:

• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/hud/HUDBar.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDBar.h (modified) (1 diff)
• src/modules/overlays/hud/HUDBoostBar.cc (modified) (2 diffs)
• src/modules/overlays/hud/HUDBoostBar.h (modified) (1 diff)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (3 diffs)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (2 diffs)

code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo

@@ -67 +67 @@
     <HUDBoostBar
      name          = "BoostBar1"
-     background    = "Orxonox/BarBackground"
+     backgroundtex = "bar1.png"
      size          = "0.35, 0.05"
      position      = "0.0 , 1.0 "

code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.cc

@@ -26 +26 @@
  *      Fabian 'x3n' Landau
  *      Reto Grieder
+ *      Benjamin Knecht
  *
  */

code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.h

@@ -26 +26 @@
  *      Fabian 'x3n' Landau
  *      Reto Grieder
+ *      Benjamin Knecht
  *
  */

code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc

@@ -43 +43 @@
 
         this->owner_ = 0;
+        this->flashInterval_ = 0.25f;
+        this->flashDt_ = 0.0f;
     }
 
@@ -55 +57 @@
         if (this->owner_)
         {
-            this->show();
+            if (this->owner_->isBoostCoolingDown())
+            {
+                this->setBackgroundColour(ColourValue(0.7f, 0.2f, 0.2f));
+                if (this->flashDt_ <= 0.0f)
+                {
+                    this->flashDt_ = this->flashInterval_;
+                    this->setVisible(!this->isVisible());
+                }
+                else
+                    this->flashDt_ -= dt;
+            }
+            else
+            {
+                this->flashDt_ = 0.0f;
+                this->show();
+                this->setBackgroundColour(ColourValue(0.2f, 0.7f, 0.2f));
+            }
+
             float value = this->owner_->getBoostPower() / this->owner_->getInitialBoostPower();
             this->setValue(value);

code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h

@@ -47 +47 @@
 
     private:
-        SpaceShip* owner_;
+        SpaceShip*  owner_;
+        float       flashInterval_;
+        float       flashDt_;
     };
 }

code/branches/hudimprovements/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -136 +136 @@
         XMLPortParam(OrxonoxOverlay, "correctaspect", setAspectCorrection,   getAspectCorrection,   xmlelement, mode);
         XMLPortParam(OrxonoxOverlay, "background",    setBackgroundMaterial, getBackgroundMaterial, xmlelement, mode);
+        XMLPortParam(OrxonoxOverlay, "backgroundtex", setBackgroundTexture,  getBackgroundTexture,  xmlelement, mode);
     }
 
@@ -162 +163 @@
         if (this->background_)
             return this->background_->getMaterialName();
+        else
+            return BLANKSTRING;
+    }
+
+    //! Sets the background texture name and creates a new material if necessary
+    void OrxonoxOverlay::setBackgroundTexture(const std::string& texture)
+    {
+        if (this->background_ && this->background_->getMaterial().isNull() && !texture.empty())
+        {
+            // create new material
+            const std::string& materialname = "generated_material" + getUniqueNumberString();
+            Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialname, "General"));
+            material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
+            Ogre::TextureUnitState* textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState();
+            textureUnitState_->setTextureName(texture);
+            textureUnitState_->setNumMipmaps(0);
+            this->background_->setMaterialName(materialname);
+        }
+    }
+
+    //! Returns the the texture name of the background
+    const std::string& OrxonoxOverlay::getBackgroundTexture() const
+    {
+        if (this->background_)
+        {
+            Ogre::TextureUnitState* tempTx = this->background_->getMaterial()->getTechnique(0)->getPass(0)->getTextureUnitState(0);
+            return tempTx->getTextureName();
+        }
         else
             return BLANKSTRING;
@@ -385 +414 @@
     }
 
-    void OrxonoxOverlay::setBackgroundAlpha(float alpha) {
+    void OrxonoxOverlay::setBackgroundAlpha(float alpha)
+    {
         Ogre::MaterialPtr ptr = this->background_->getMaterial();
         Ogre::TextureUnitState* tempTx = ptr->getTechnique(0)->getPass(0)->getTextureUnitState(0);
         tempTx->setAlphaOperation(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, alpha);
     }
+
+    void OrxonoxOverlay::setBackgroundColour(ColourValue colour)
+    {
+        Ogre::MaterialPtr ptr = this->background_->getMaterial();
+        Ogre::TextureUnitState* tempTx = ptr->getTechnique(0)->getPass(0)->getTextureUnitState(0);
+        tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour);
+    }
 }

code/branches/hudimprovements/src/orxonox/overlays/OrxonoxOverlay.h

@@ -159 +159 @@
         const std::string& getBackgroundMaterial() const;
 
+        void setBackgroundTexture(const std::string& texture);
+        const std::string& getBackgroundTexture() const;
+
         void setBackgroundAlpha(float alpha);
+
+        void setBackgroundColour(ColourValue colour);
 
         virtual void changedVisibility();

code/branches/hudimprovements/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -74 +74 @@
                 { return this->bBoost_; }
 
-            inline float getBoostPower()
+            inline float getBoostPower() const
                 { return this->boostPower_; }
-            inline float getInitialBoostPower()
+            inline float getInitialBoostPower() const
                 { return this->initialBoostPower_; }
 
@@ -88 +88 @@
             inline bool getPermanentBoost() const
                 { return this->bPermanentBoost_; }
+
+            inline bool isBoostCoolingDown() const
+                { return bBoostCooldown_; }
 
         protected: