Changeset 5980 for code/trunk

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

Files:

• data/overlays/hudtemplates3.oxo (modified) (1 diff)
• src/modules/overlays/GUIOverlay.cc (modified) (1 diff)
• src/modules/overlays/stats/CreateLines.cc (modified) (1 diff)
• src/modules/overlays/stats/CreateLines.h (modified) (1 diff)
• src/modules/overlays/stats/Scoreboard.cc (modified) (2 diffs)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (2 diffs)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)
• src/orxonox/overlays/OverlayGroup.cc (modified) (2 diffs)

code/trunk/data/overlays/hudtemplates3.oxo

@@ -99 +99 @@
       name = "QuestGUI"
       guiname = "QuestGUI"
+      visible = "false"
     />
 

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);
         }

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -48 +48 @@
 #include "core/ConsoleCommand.h"
 
+#include "OverlayGroup.h"
+
 namespace orxonox
 {
@@ -165 +167 @@
     void OrxonoxOverlay::changedVisibility()
     {
+        SUPER( OrxonoxOverlay, changedVisibility );
+        
         if (!this->overlay_)
             return;
 
-        if (this->isVisible())
+        // only set to visible if corresponding OverlayGroup is also visible
+        if (this->isVisible() && (!this->getOverlayGroup() || this->getOverlayGroup()->isVisible()) )
             this->overlay_->show();
         else

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -179 +179 @@
         inline OverlayGroup* getOverlayGroup() const
             { return this->group_; }
-        virtual void changedOverlayGroup() {}
+        virtual void changedOverlayGroup() 
+            { this->changedVisibility(); }
 
     protected:

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -105 +105 @@
     {
         hudElements_.insert(element);
-        element->setVisible(this->isVisible());
+        element->setOverlayGroup( this );
         if (this->owner_)
             element->setOwner(this->owner_);
@@ -142 +142 @@
     void OverlayGroup::changedVisibility()
     {
-        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it)->setVisible(this->isVisible());
+        SUPER( OverlayGroup, changedVisibility );
+        
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
     }