Changeset 6289 for code/branches/presentation2

Timestamp:

Dec 9, 2009, 2:43:47 PM (15 years ago)

Author:

wirthmi

Message:

Fixed bug: overlays hide when ingame menu is brought up

File:

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

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

@@ -92 +92 @@
             {
                 arrowsOverlay1_ = new OrxonoxOverlay(this);
-                arrowsOverlay1_->setBackgroundMaterial("Orxonox/CenterOverlay");
+                arrowsOverlay1_->setBackgroundMaterial("Orxonox/DirectionArrows1");
                 arrowsOverlay1_->setSize(Vector2(0.02727, 0.36 * arrowsSize_));
                 arrowsOverlay1_->setPickPoint(Vector2(0.5, 0.5));
@@ -99 +99 @@
     
                 arrowsOverlay2_ = new OrxonoxOverlay(this);
-                arrowsOverlay2_->setBackgroundMaterial("Orxonox/CenterOverlay");
+                arrowsOverlay2_->setBackgroundMaterial("Orxonox/DirectionArrows2");
                 arrowsOverlay2_->setSize(Vector2(0.02727, 0.59 * arrowsSize_));
                 arrowsOverlay2_->setPickPoint(Vector2(0.5, 0.5));
@@ -106 +106 @@
     
                 arrowsOverlay3_ = new OrxonoxOverlay(this);
-                arrowsOverlay3_->setBackgroundMaterial("Orxonox/CenterOverlay");
+                arrowsOverlay3_->setBackgroundMaterial("Orxonox/DirectionArrows3");
                 arrowsOverlay3_->setSize(Vector2(0.02727, 0.77 * arrowsSize_));
                 arrowsOverlay3_->setPickPoint(Vector2(0.5, 0.5));
@@ -113 +113 @@
     
                 arrowsOverlay4_ = new OrxonoxOverlay(this);
-                arrowsOverlay4_->setBackgroundMaterial("Orxonox/CenterOverlay");
+                arrowsOverlay4_->setBackgroundMaterial("Orxonox/DirectionArrows4");
                 arrowsOverlay4_->setSize(Vector2(0.02727, arrowsSize_));
                 arrowsOverlay4_->setPickPoint(Vector2(0.5, 0.5));
@@ -163 +163 @@
             if( this->controllableEntity_ && !this->controllableEntity_->isInMouseLook() )
             {
-                if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip")
-                    this->showOverlays();
                 this->updateTarget();
+
                 if ( !controlPaused_ ) {
+                    if (this->getControllableEntity() && this->getControllableEntity()->getIdentifier()->getName() == "SpaceShip")
+                        this->showOverlays();
+
                     this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
 
                     if ( this->controlMode_ == 0 || ( this->controlMode_ == 1 && this->firemode_ == 1 ) )
                     {
-                        if ( this->showOverlays_ )
+                        if ( this->showOverlays_ && this->showArrows_)
                             alignArrows();
                     }
@@ -421 +423 @@
     void NewHumanController::doPauseControl() {
         this->controlPaused_ = true;
-        
+
         this->hideOverlays();
     }
@@ -457 +459 @@
         this->crossHairOverlay_->show();
         this->centerOverlay_->show();
-        
+
         if (showArrows_) {
             this->arrowsOverlay1_->show();
@@ -469 +471 @@
         this->crossHairOverlay_->hide();
         this->centerOverlay_->hide();
-        
+
         this->hideArrows();
     }