Changeset 6310 for code/branches/presentation2

Timestamp:

Dec 9, 2009, 10:58:26 PM (15 years ago)

Author:

wirthmi

Message:

Added damage overlays

Location:

code/branches/presentation2/src/orxonox

Files:

• controllers/NewHumanController.cc (modified) (6 diffs)
• controllers/NewHumanController.h (modified) (2 diffs)
• overlays/OrxonoxOverlay.cc (modified) (2 diffs)
• overlays/OrxonoxOverlay.h (modified) (2 diffs)

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -67 +67 @@
         overlaySize_ = 0.08;
         arrowsSize_ = 0.4;
+
+        damageOverlayTime_ = 0.6;
+
         controlMode_ = 0;
         acceleration_ = 0;
         accelerating_ = false;
         firemode_ = -1;
+
         showArrows_ = true;
         showOverlays_ = false;
+        showDamageOverlay_ = true;
 
         //currentPitch_ = 1;
@@ -91 +96 @@
             centerOverlay_->hide();
 
-            if (showArrows_)
+            if ( showDamageOverlay_ )
+            {
+                damageOverlayTop_ = new OrxonoxOverlay(this);
+                damageOverlayTop_->setBackgroundMaterial("Orxonox/DamageOverlayTop");
+                damageOverlayTop_->setSize(Vector2(overlaySize_ * 2.5, overlaySize_ * 2.5));
+                damageOverlayTop_->setPosition(Vector2(0.5 - overlaySize_*2.5/2.0, 0.5 - overlaySize_*2.5/2.0));\
+                damageOverlayTop_->hide();
+
+                damageOverlayRight_ = new OrxonoxOverlay(this);
+                damageOverlayRight_->setBackgroundMaterial("Orxonox/DamageOverlayRight");
+                damageOverlayRight_->setSize(Vector2(overlaySize_ * 2.5, overlaySize_ * 2.5));
+                damageOverlayRight_->setPosition(Vector2(0.5 - overlaySize_*2.5/2.0, 0.5 - overlaySize_*2.5/2.0));\
+                damageOverlayRight_->hide();
+
+                damageOverlayBottom_ = new OrxonoxOverlay(this);
+                damageOverlayBottom_->setBackgroundMaterial("Orxonox/DamageOverlayBottom");
+                damageOverlayBottom_->setSize(Vector2(overlaySize_ * 2.5, overlaySize_ * 2.5));
+                damageOverlayBottom_->setPosition(Vector2(0.5 - overlaySize_*2.5/2.0, 0.5 - overlaySize_*2.5/2.0));\
+                damageOverlayBottom_->hide();
+
+                damageOverlayLeft_ = new OrxonoxOverlay(this);
+                damageOverlayLeft_->setBackgroundMaterial("Orxonox/DamageOverlayLeft");
+                damageOverlayLeft_->setSize(Vector2(overlaySize_ * 2.5, overlaySize_ * 2.5));
+                damageOverlayLeft_->setPosition(Vector2(0.5 - overlaySize_*2.5/2.0, 0.5 - overlaySize_*2.5/2.0));\
+                damageOverlayLeft_->hide();
+            }
+
+            if ( showArrows_ )
             {
                 arrowsOverlay1_ = new OrxonoxOverlay(this);
@@ -168 +200 @@
 
                 if ( !controlPaused_ ) {
-                    if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip")
+                    if (this->getControllableEntity() && (this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip" || this->getControllableEntity()->getIdentifier()->getName() == "Rocket"))
                         this->showOverlays();
 
@@ -180 +212 @@
                     else
                         hideArrows();
+
+                    if ( this->showDamageOverlay_ && ( this->damageOverlayTT_ > 0 || this->damageOverlayTR_ > 0 || this->damageOverlayTB_ > 0 || this->damageOverlayTL_ > 0 ) ) {
+                        this->damageOverlayTT_ -= dt;
+                        this->damageOverlayTR_ -= dt;
+                        this->damageOverlayTB_ -= dt;
+                        this->damageOverlayTL_ -= dt;
+                        if ( this->damageOverlayTT_ <= 0 )
+                            this->damageOverlayTop_->hide();
+                        if ( this->damageOverlayTR_ <= 0 )
+                            this->damageOverlayRight_->hide();
+                        if ( this->damageOverlayTB_ <= 0 )
+                            this->damageOverlayBottom_->hide();
+                        if ( this->damageOverlayTL_ <= 0 )
+                            this->damageOverlayLeft_->hide();
+                    }
                 }
             }
@@ -251 +298 @@
 
     void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {
-        Vector3 posA = multi_cast<Vector3>(contactpoint.getPositionWorldOnA());
-        //Vector3 posB = multi_cast<Vector3>(contactpoint.getPositionWorldOnB());
-        //posA and posB are almost identical
-
-        Vector3 relativeHit = this->getControllableEntity()->getWorldOrientation() * (posA - this->getControllableEntity()->getPosition());
-
-        COUT(0) << relativeHit << endl;
-        //COUT(0) << "Damage: " << damage << " Point A: " << posA << " Point B: " << posB << endl;
+        if ( showDamageOverlay_ ) {
+            Vector3 posA;
+            if ( originator )
+                posA = originator->getWorldPosition();
+            else
+                posA = multi_cast<Vector3>(contactpoint.getPositionWorldOnA());
+            //Vector3 posB = multi_cast<Vector3>(contactpoint.getPositionWorldOnB());
+            //posA and posB are almost identical
+
+            Vector3 relativeHit = this->getControllableEntity()->getWorldOrientation().UnitInverse() * (this->getControllableEntity()->getWorldPosition() - posA);
+
+            //back is z positive
+            //x is left positive
+            //y is down positive
+            relativeHit.normalise();
+            COUT(0) << relativeHit << endl;
+
+            float threshold = 0.3;
+            // && abs(relativeHit.y) < 0.5 
+            if ( relativeHit.x > threshold) // Left
+            {
+                this->damageOverlayLeft_->show();
+                this->damageOverlayTL_ = this->damageOverlayTime_;
+                //this->damageOverlayLeft_->setBackgroundAlpha(0.3);
+            }
+            if ( relativeHit.x < -threshold) //Right
+            {
+                this->damageOverlayRight_->show();
+                this->damageOverlayTR_ = this->damageOverlayTime_;
+                //this->damageOverlayRight_->setBackgroundAlpha(0.3);
+            }
+            if ( relativeHit.y > threshold) //Top
+            {
+                this->damageOverlayTop_->show();
+                this->damageOverlayTT_ = this->damageOverlayTime_;
+                //this->damageOverlayTop_->setBackgroundAlpha(0.3);
+            }
+            if ( relativeHit.y < -threshold) //Bottom
+            {
+                this->damageOverlayBottom_->show();
+                this->damageOverlayTB_ = this->damageOverlayTime_;
+                //this->damageOverlayBottom_->setBackgroundAlpha(0.3);
+            }
+
+        }
     }
 
@@ -485 +569 @@
         this->centerOverlay_->hide();
 
+        if ( showDamageOverlay_ ) {
+            this->damageOverlayTop_->hide();
+            this->damageOverlayRight_->hide();
+            this->damageOverlayBottom_->hide();
+            this->damageOverlayLeft_->hide();
+        }
+
         this->hideArrows();
     }

code/branches/presentation2/src/orxonox/controllers/NewHumanController.h

@@ -81 +81 @@
             OrxonoxOverlay*             crossHairOverlay_;
             OrxonoxOverlay*             centerOverlay_;
+
+            OrxonoxOverlay*             damageOverlayTop_;
+            OrxonoxOverlay*             damageOverlayRight_;
+            OrxonoxOverlay*             damageOverlayBottom_;
+            OrxonoxOverlay*             damageOverlayLeft_;
+            float                       damageOverlayTime_;
+            float                       damageOverlayTT_;
+            float                       damageOverlayTR_;
+            float                       damageOverlayTB_;
+            float                       damageOverlayTL_;
+
             OrxonoxOverlay*             arrowsOverlay1_;
             OrxonoxOverlay*             arrowsOverlay2_;
             OrxonoxOverlay*             arrowsOverlay3_;
             OrxonoxOverlay*             arrowsOverlay4_;
+
             float                       overlaySize_;
             float                       arrowsSize_;
@@ -91 +103 @@
             int                         firemode_;
             bool                        showArrows_;
+            bool                        showDamageOverlay_;
             bool                        showOverlays_;
             ClassTreeMask               targetMask_;

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

@@ -39 +39 @@
 #include <OgrePanelOverlayElement.h>
 #include <OgreRenderWindow.h>
+#include <OgreMaterialManager.h>
+#include <OgreTechnique.h>
+#include <OgrePass.h>
 
 #include "util/Convert.h"
@@ -370 +373 @@
         }
     }
+
+    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);
+    }
 }

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

@@ -158 +158 @@
         const std::string& getBackgroundMaterial() const;
 
+        void setBackgroundAlpha(float alpha);
+
         virtual void changedVisibility();
 
@@ -205 +207 @@
         BaseObject* owner_;
         OverlayGroup* group_;
+        Ogre::Pass* backgroundAlphaPass_;
   };