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

Timestamp:

Aug 19, 2008, 8:12:15 PM (16 years ago)

Author:

rgrieder

Message:

• Changed static Executor/Functor in ConsoleCommand to generic one that enables console commands for member functions. (This is more of a temporary solution, but can be made permanent with right adjustments)
• The whole GameState thing seems to works so far. But I there's only standalone mode at the moment
• Console now shows in GUI too. I will have to implement a master InputState in the InputManager (little bit of a break with the concept, but probably necessary)

File:

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

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

@@ -30 +30 @@
 #include "GSRoot.h"
 
-#include <cassert>
 #include "core/Factory.h"
 #include "core/ConfigFileManager.h"
@@ -36 +35 @@
 #include "core/ConsoleCommand.h"
 #include "core/Debug.h"
-//#include "core/Exception.h"
+#include "core/Exception.h"
 #include "core/TclBind.h"
 #include "core/Core.h"
@@ -65 +64 @@
         Factory::createClassHierarchy();
 
-        // TODO: config values
-        //setConfigValues();
-
         const Settings::CommandLineArgument* dataPath = Settings::getCommandLineArgument("dataPath");
         assert(dataPath);
@@ -81 +77 @@
         TclBind::getInstance().setDataPath(Settings::getDataPath());
 
+        // initialise graphics engine. Doesn't load the render window yet!
         graphicsEngine_ = new GraphicsEngine();
         graphicsEngine_->setup();       // creates ogre root and other essentials
 
+        // console commands
+        FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::loadGame);
+        functor->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "loadGame"));
     }
 
@@ -98 +99 @@
         return true;
     }
+
+    /**
+    @brief
+        Requests a state.
+    */
+    void GSRoot::loadGame(const std::string& name)
+    {
+        this->requestState(name);
+    }
 }