Changeset 1670 for code/branches/gui/src/orxonox/gamestates

Timestamp:

Aug 26, 2008, 4:26:04 PM (16 years ago)

Author:

rgrieder

Message:

Still working on the GameStates, but I have to save the work because of some major changes.

• Exported InputManager- and TclThreadManager-tick to GSGraphics instead of Core
• Fixed a few bugs in GameState by adding an internal state variable as bitfield (quite practical)
• Fixed a bug in InputManager that occurred when destroying an active InputState
• Added GSIO and GSIOConsole (3 lines of loop code with std::cin, but works )
• Added more boost thread includes to OrxonoxStableHeaders.h
• Many changes in all GameState derived classes

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSClient.cc (added)
• GSClient.h (added)
• GSGUI.cc (modified) (1 diff)
• GSGUI.h (modified) (1 diff)
• GSGraphics.cc (modified) (7 diffs)
• GSGraphics.h (modified) (1 diff)
• GSIO.cc (added)
• GSIO.h (added)
• GSIOConsole.cc (added)
• GSIOConsole.h (added)
• GSLevel.cc (modified) (6 diffs)
• GSLevel.h (modified) (1 diff)
• GSRoot.cc (modified) (4 diffs)
• GSRoot.h (modified) (1 diff)
• GSServer.cc (added)
• GSServer.h (added)
• GSStandalone.cc (added)
• GSStandalone.h (added)

code/branches/gui/src/orxonox/gamestates/GSGUI.cc

@@ -58 +58 @@
     }
 
-    bool GSGUI::tick(float dt)
+    void GSGUI::ticked(float dt)
     {
         // tick CEGUI
         GUIManager::getInstance().tick(dt);
 
-        return true;
+        this->tickChild(dt);
     }
 }

code/branches/gui/src/orxonox/gamestates/GSGUI.h

@@ -44 +44 @@
         void enter();
         void leave();
-        bool tick(float dt);
+        void ticked(float dt);
 
     };

code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

@@ -38 +38 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/input/InputManager.h"
-#include "core/Core.h"
+#include "core/TclThreadManager.h"
+//#include "core/Core.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
@@ -48 +49 @@
         : GameState("graphics")
         , timer_(0)
-        , bAbort_(false)
         , debugRefreshTime_(0.0f)
         , inputManager_(0)
@@ -90 +90 @@
         // use the ogre timer class to measure time.
         timer_ = new Ogre::Timer();
-
-        // add console commands
-        FunctorMember<GSGraphics>* functor = createFunctor(&GSGraphics::exitGame);
-        functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "exit"));
     }
 
@@ -123 +118 @@
         need the time. So we shouldn't run into problems.
     */
-    bool GSGraphics::tick(float dt)
+    void GSGraphics::ticked(float dt)
     {
         // note: paramter 'dt' is of no meaning
@@ -147 +142 @@
         {
             timer_->reset();
-            while (!bAbort_)
+            while (!this->hasScheduledTransition())
             {
                 // get current time
@@ -154 +149 @@
                 float dt = (timeBeforeTick - timeBeforeTickOld) / 1000000.0;
 
-
-                // tick the core (needs real time for input and tcl thread management)
-                // TODO: ticks of InputManager and tcl thread manager have to be separated.
-                Core::tick(dt);
-
-                // tick child state
-                if (this->getActiveChild())
-                    this->getActiveChild()->tick(dt);
+                this->inputManager_->tick(dt);
+                TclThreadManager::getInstance().tick(dt);
+
+                this->tickChild(dt);
 
                 // tick console
@@ -210 +201 @@
             COUT(1) << ex.what() << std::endl;
             COUT(1) << "Main loop was stopped by an unhandled exception. Shutting down." << std::endl;
-        }        return true;
+        }
     }
 }

code/branches/gui/src/orxonox/gamestates/GSGraphics.h

@@ -43 +43 @@
         ~GSGraphics();
 
-        bool tick(float dt);
         void setConfigValues();
-
-        void exitGame() { this->bAbort_ = true; }
 
     private:
         void enter();
         void leave();
+        void ticked(float dt);
 
         Ogre::Timer*          timer_;            //!< Main loop timer
-        bool                  bAbort_;           //!< aborts the render loop if true
 
         // config values

code/branches/gui/src/orxonox/gamestates/GSLevel.cc

@@ -30 +30 @@
 #include "GSLevel.h"
 
-#include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
 #include "core/input/KeyBinder.h"
 #include "core/Loader.h"
-#include "core/CommandLine.h"
-#include "overlays/console/InGameConsole.h"
-#include "gui/GUIManager.h"
 #include "objects/Backlight.h"
 #include "tools/ParticleInterface.h"
+#include "Settings.h"
 #include "Radar.h"
-#include "Settings.h"
 #include "GraphicsEngine.h"
 
 namespace orxonox
 {
-    SetCommandLineArgument(port, 55556).setShortcut("p").setInformation("PORT");
-    SetCommandLineArgument(ip, "127.0.0.0").setInformation("#.#.#.#");
-
-    GSLevel::GSLevel()
-        : GameState("level")
+    GSLevel::GSLevel(const std::string& name)
+        : GameState(name)
         , timefactor_(1.0f)
         , keyBinder_(0)
+        , inputState_(0)
         , radar_(0)
         , startLevel_(0)
@@ -65 +59 @@
     void GSLevel::enter()
     {
+        inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game", 20);
         keyBinder_ = new KeyBinder();
         keyBinder_->loadBindings();
-        InputManager::getInstance().createInputState<SimpleInputState>("game", 20)->setHandler(keyBinder_);
+        inputState_->setHandler(keyBinder_);
 
         // create Ogre SceneManager for the level
@@ -79 +74 @@
         hud_ = new Level(Settings::getDataPath() + "overlay/hud.oxo");
         Loader::load(hud_);
-
-        // call the loader
-        COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
-        Loader::open(startLevel_);
-
-        // add console commands
-        FunctorMember<GSLevel>* functor = createFunctor(&GSLevel::setTimeFactor);
-        functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "setTimeFactor"));
-
-        // level is loaded: we can start capturing the input
-        InputManager::getInstance().requestEnterState("game");
     }
 
     void GSLevel::leave()
     {
-        InputManager::getInstance().requestLeaveState("game");
-
-        // TODO: Remove and destroy console command
-
-        Loader::unload(startLevel_);
-        delete this->startLevel_;
-
         Loader::unload(hud_);
         delete this->hud_;
@@ -116 +91 @@
         // TODO: delete SceneManager
 
-        InputManager::getInstance().destroyState("game");
+        inputState_->setHandler(0);
+        InputManager::getInstance().requestDestroyState("game");
         delete this->keyBinder_;
     }
 
-    bool GSLevel::tick(float dt)
+    void GSLevel::ticked(float dt)
     {
         // Call those objects that need the real time
@@ -128 +104 @@
         for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
             it->tick(dt * this->timefactor_);
-
-        // TODO: split file into server/client/standalone
-        // call server/client with normal dt
-        //if (client_g)
-        //    client_g->tick(dt * this->timefactor_);
-        //if (server_g)
-        //    server_g->tick(dt * this->timefactor_);
-
-        return true;
     }
 
@@ -153 +120 @@
             it->setTimeFactor(timefactor_);
     }
+
+    void GSLevel::loadLevel()
+    {
+        // call the loader
+        COUT(0) << "Loading level..." << std::endl;
+        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
+        Loader::open(startLevel_);
+    }
+
+    void GSLevel::unloadLevel()
+    {
+        Loader::unload(startLevel_);
+        delete this->startLevel_;
+    }
 }

code/branches/gui/src/orxonox/gamestates/GSLevel.h

@@ -38 +38 @@
     {
     public:
-        GSLevel();
-        ~GSLevel();
+        GSLevel(const std::string& name);
+        virtual ~GSLevel();
 
-        bool tick(float dt);
+        // this has to be public because proteced triggers a bug in msvc
+        // when taking the function address.
+        void setTimeFactor(float factor);
+        float getTimeFactor() { return this->timefactor_; }
+
+    protected:
+        virtual void enter();
+        virtual void leave();
+        virtual void ticked(float dt);
+
+        void loadLevel();
+        void unloadLevel();
 
     private:
-        void enter();
-        void leave();
-
-        void setTimeFactor(float factor);
 
         float timefactor_;       //!< A factor to change the gamespeed
 
         KeyBinder*            keyBinder_;        //!< tool that loads and manages the input bindings
+        SimpleInputState*     inputState_;
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
         Level*                startLevel_;       //!< current hard coded default level

code/branches/gui/src/orxonox/gamestates/GSRoot.cc

@@ -52 +52 @@
         , settings_(0)
         , graphicsEngine_(0)
+        , bExit_(false)
     {
     }
@@ -101 +102 @@
 
         std::string dataPath;
-        CommandLine::getCommandLineValue("dataPath", &dataPath);
+        CommandLine::getValue("dataPath", &dataPath);
         if (dataPath != "")
         {
@@ -122 +123 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "loadGame"));
 
-        requestState("gui");
+        // add console commands
+        functor = createFunctor(&GSRoot::exitGame);
+        functor->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "exit"));
     }
 
@@ -128 +132 @@
     {
         delete graphicsEngine_;
+        delete settings_;
 
-        delete settings_;
+        // TODO: remove and destroy console commands
     }
 
-    bool GSRoot::tick(float dt)
+    void GSRoot::ticked(float dt)
     {
-        if (this->getActiveChild())
-            this->getActiveChild()->tick(dt);
-        return true;
+        this->tickChild(dt);
     }
 

code/branches/gui/src/orxonox/gamestates/GSRoot.h

@@ -42 +42 @@
 
         void feedCommandLine(int argc, char** argv);
-        bool tick(float dt);
         void loadGame(const std::string& name);
+
+        void exitGame()
+        { requestState("root"); }
+        bool isGameFinished() { return (this->getActiveChild() == 0); }
 
     private:
         void enter();
         void leave();
+        void ticked(float dt);
 
         Settings*             settings_;
         GraphicsEngine*       graphicsEngine_;   //!< our dearest graphics engine <3
+        bool                  bExit_;
     };
 }