Changeset 1672 for code/branches/gui/src/orxonox/gamestates/GSRoot.cc

Timestamp:

Aug 27, 2008, 10:21:39 PM (17 years ago)

Author:

rgrieder

Message:

• Changed GameState so that the new RootGameState can override 2 virtual methods
• added RootGameState that takes care of state transitions (can only happen between ticks)
• moved main loop to GSRoot instead of GSGraphics
• network GameStates not yet finished
• GraphicsEngine not yet merged into GSGraphics

File:

• code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) (5 diffs)

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

@@ -41 +41 @@
 #include "core/Core.h"
 #include "core/CommandLine.h"
+#include "core/TclThreadManager.h"
 #include "GraphicsEngine.h"
 #include "Settings.h"
@@ -49 +50 @@
 
     GSRoot::GSRoot()
-        : GameState("root")
+        : RootGameState("root")
         , settings_(0)
         , graphicsEngine_(0)
-        , bExit_(false)
     {
     }
@@ -113 +113 @@
         // initialise TCL
         TclBind::getInstance().setDataPath(Settings::getDataPath());
+        TclThreadManager::getInstance();
 
         // initialise graphics engine. Doesn't load the render window yet!
@@ -118 +119 @@
         graphicsEngine_->setup();       // creates ogre root and other essentials
 
-        // console commands
-        FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::loadGame);
-        functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "loadGame"));
+        // add console commands
+        FunctorMember<GSRoot>* functor1 = createFunctor(&GSRoot::exitGame);
+        functor1->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor1, "exit"));
 
         // add console commands
-        functor = createFunctor(&GSRoot::exitGame);
-        functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "exit"));
+        FunctorMember01<GameState, const std::string&>* functor2 = createFunctor(&GameState::requestState);
+        functor2->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor2, "selectGameState"));
     }
 
@@ -137 +138 @@
     }
 
-    void GSRoot::ticked(float dt)
+    void GSRoot::ticked(float dt, uint64_t time)
     {
-        this->tickChild(dt);
-    }
+        TclThreadManager::getInstance().tick(dt);
 
-    /**
-    @brief
-        Requests a state.
-    */
-    void GSRoot::loadGame(const std::string& name)
-    {
-        this->requestState(name);
+        this->tickChild(dt, time);
     }
 }