Changeset 6994 for code/branches/presentation3/src/modules/overlays

Timestamp:

May 27, 2010, 10:31:25 PM (14 years ago)

Author:

scheusso

Message:

merged skybox2 branch to presentation merger branch

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/GametypeStatus.cc (modified) (4 diffs)
• src/modules/overlays/hud/GametypeStatus.h (modified) (1 diff)

code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc

@@ -30 +30 @@
 
 #include "util/Convert.h"
+#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
 #include "infos/GametypeInfo.h"
@@ -38 +39 @@
 namespace orxonox
 {
-    CreateFactory(GametypeStatus);
+    CreateFactory(GametypeStatus);  
+
+    /*static*/ bool GametypeStatus::noCaption_s = false; 
+    SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
 
     GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator)
@@ -59 +63 @@
             const GametypeInfo* gtinfo = this->owner_->getGametypeInfo();
             ControllableEntity* ce = this->owner_->getControllableEntity();
+
+            if(GametypeStatus::noCaption_s) // No captions are displayed.
+            {
+                this->setCaption("");
+                return;
+            }
 
             if (!gtinfo->hasStarted() && !gtinfo->isStartCountdownRunning())
@@ -88 +98 @@
         this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
     }
+
+    /**
+    @brief
+        Sets whether the gametype status is displayed.
+    @param bValue
+        If true captions are displayed, if false, not.
+    */
+    /*static*/ void GametypeStatus::setGametypeStatus(bool bValue)
+    {
+        GametypeStatus::noCaption_s = !bValue;
+    }
+    
 }

code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h

@@ -46 +46 @@
             virtual void changedOwner();
 
+            static void setGametypeStatus(bool bValue); //!< Toggles whether the gametype status is displayed.
+
         private:
             PlayerInfo* owner_;
+            static bool noCaption_s;
+            
     };
 }