Changeset 6312

Timestamp:

Dec 9, 2009, 11:23:29 PM (14 years ago)

Author:

wirthmi

Message:

Fixes for damage overlay

File:

• code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) (2 diffs)

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

@@ -298 +298 @@
 
     void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {
-        if ( showDamageOverlay_ ) {
+        if ( this->showDamageOverlay_ && !this->controlPaused_ && this->controllableEntity_ && !this->controllableEntity_->isInMouseLook() ) {
             Vector3 posA;
             if ( originator )
@@ -331 +331 @@
             if ( relativeHit.y > threshold) //Top
             {
+                this->damageOverlayBottom_->show();
+                this->damageOverlayTB_ = this->damageOverlayTime_;
+                //this->damageOverlayTop_->setBackgroundAlpha(0.3);
+            }
+            if ( relativeHit.y < -threshold) //Bottom
+            {
                 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);
             }