Changeset 5980 for code/trunk/src/modules

Timestamp:

Oct 21, 2009, 4:06:50 PM (15 years ago)

Author:

scheusso

Message:

fixed a logical error in OverlayGroup/OrxonoxOverlay (visibility of overlays in a overlaygroup could not be configured individually)
changed Scoreboard/CreateLines accordingly
set initial visibility of QuestGUI to false

Location:

code/trunk/src/modules/overlays

Files:

• GUIOverlay.cc (modified) (1 diff)
• stats/CreateLines.cc (modified) (1 diff)
• stats/CreateLines.h (modified) (1 diff)
• stats/Scoreboard.cc (modified) (2 diffs)

code/trunk/src/modules/overlays/GUIOverlay.cc

@@ -62 +62 @@
     {
         SUPER(GUIOverlay, changedVisibility);
-
+        
         //Setting player now.
-        GUIManager::getInstance().setPlayer(this->guiName_, (orxonox_cast<ControllableEntity*>(this->getOwner()))->getPlayer());
+        if( this->getOwner() )
+            GUIManager::getInstance().setPlayer(this->guiName_, (orxonox_cast<ControllableEntity*>(this->getOwner()))->getPlayer());
 
         if (this->isVisible())

code/trunk/src/modules/overlays/stats/CreateLines.cc

@@ -87 +87 @@
         this->background_->setVisible(visible);
     }
+    void CreateLines::changedVisibility()
+    {
+        this->scoreText_->changedVisibility();
+        this->deathsText_->changedVisibility();
+        this->playerNameText_->changedVisibility();
+        this->background_->changedVisibility();
+    }
+    
+    void CreateLines::setOverlayGroup( OverlayGroup* group )
+    {
+        this->scoreText_->setOverlayGroup( group );
+        this->deathsText_->setOverlayGroup( group );
+        this->playerNameText_->setOverlayGroup( group );
+        this->background_->setOverlayGroup( group );
+    }
 
     /**

code/trunk/src/modules/overlays/stats/CreateLines.h

@@ -44 +44 @@
 
         void setVisibility(bool);
+        void changedVisibility();
+        void setOverlayGroup( OverlayGroup* group );
 
         //void setNumberOfColumns(unsigned int numberOfColumns, unsigned int lineIndex);

code/trunk/src/modules/overlays/stats/Scoreboard.cc

@@ -69 +69 @@
 
         for (unsigned int i = 0; i < this->lines_.size(); ++i)
-            this->lines_[i]->setVisibility(this->isVisible());
+            this->lines_[i]->changedVisibility();
     }
 
@@ -89 +89 @@
             CreateLines* lines = new CreateLines(leftOffset, topOffset + (distance + height) * lines_.size(), width, height);
             lines->setVisibility(this->isVisible());
+            lines->setOverlayGroup( this->getOverlayGroup() );
             this->lines_.push_back(lines);
         }