Changeset 6858 for code/branches/skybox2/src

Timestamp:

May 6, 2010, 1:11:43 PM (15 years ago)

Author:

dafrick

Message:

Made noCaption feature needed for skybox much nice.

Location:

code/branches/skybox2/src

Files:

• libraries/core/Core.cc (modified) (3 diffs)
• libraries/core/Core.h (modified) (2 diffs)
• modules/designtools/SkyboxGenerator.cc (modified) (4 diffs)
• modules/designtools/SkyboxGenerator.h (modified) (1 diff)
• modules/overlays/hud/GametypeStatus.cc (modified) (4 diffs)
• modules/overlays/hud/GametypeStatus.h (modified) (1 diff)

code/branches/skybox2/src/libraries/core/Core.cc

@@ -78 +78 @@
 
     SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
-    SetCommandLineSwitch(noGametypeCaptions).information("Use this if you don't want to use Gametype captions.");
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
@@ -150 +149 @@
         this->setConfigValues();
 
-        // no captions in gametype.
-        if(CommandLineParser::getValue("noGametypeCaptions").getBool())
-        {
-            ModifyConfigValue(bGametypeCaptions_, tset, false);
-        }
-
         // create persistent io console
         this->ioConsole_.reset(new IOConsole());
@@ -201 +194 @@
             .description("If true, all random actions are different each time you start the game")
             .callback(this, &Core::initRandomNumberGenerator);
-        SetConfigValue(bGametypeCaptions_, true)
-            .description("Set to false if you don't want to use Gametype captions.");
     }
 

code/branches/skybox2/src/libraries/core/Core.h

@@ -67 +67 @@
             void setConfigValues();
 
-            inline bool hasGametypeCaptions(void)
-                { return this->bGametypeCaptions_; }
-
             //! Returns the configured language.
             const std::string& getLanguage()
@@ -111 +108 @@
             std::string                   language_;                   //!< The language
             bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
-            bool                          bGametypeCaptions_;
 
             static Core*                  singletonPtr_s;

code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc

@@ -60 +60 @@
         this->setConfigValues();
         takeScreenshot_ = false;
+        this->captionsRemoved_ = false;
     }
 
@@ -76 +77 @@
         if( takeScreenshot_ == true )
         {
+            if(!this->captionsRemoved_)
+            {
+                CommandExecutor::execute("setGametypeStatus false");
+                this->captionsRemoved_ = true;
+                return;
+            }
+            
             ControllableEntity* ce = HumanController::getLocalControllerSingleton()->getControllableEntity();
             Camera* camera = ce->getCamera();
@@ -81 +89 @@
         
             Ogre::RenderWindow* w = GraphicsManager::getInstance().getRenderWindow();
+
 
             switch (iterateOverDirections_) 
@@ -131 +140 @@
                 camera->getOgreCamera()->setAspectRatio(aspectRatio_);
                 camera->getOgreCamera()->setFOVy(fovy_);
+                iterateOverDirections_++;
+            case 8 :
                 iterateOverDirections_ =0;
                 takeScreenshot_ = false;
                 CommandExecutor::execute("pause");
+                CommandExecutor::execute("setGametypeStatus true");
+                this->captionsRemoved_ = false;
             }
+
         }
     }

code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h

@@ -54 +54 @@
             float aspectRatio_;
             Ogre::Radian fovy_;
+            bool captionsRemoved_;
     };
 }

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

@@ -30 +30 @@
 
 #include "util/Convert.h"
-#include "core/Core.h"
+#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
 #include "infos/GametypeInfo.h"
@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(GametypeStatus);
+    CreateFactory(GametypeStatus);  
+
+    /*static*/ bool GametypeStatus::noCaption_s = false; 
+    SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
 
     GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator)
@@ -61 +64 @@
             ControllableEntity* ce = this->owner_->getControllableEntity();
 
-            if(!Core::getInstance().hasGametypeCaptions()) // No captions are displayed.
+            if(GametypeStatus::noCaption_s) // No captions are displayed.
+            {
+                this->setCaption("");
                 return;
+            }
 
             if (!gtinfo->hasStarted() && !gtinfo->isStartCountdownRunning())
@@ -92 +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/skybox2/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;
+            
     };
 }