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

Timestamp:

Aug 26, 2008, 4:26:04 PM (17 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

File:

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

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