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

Timestamp:

Aug 20, 2008, 10:30:28 PM (16 years ago)

Author:

rgrieder

Message:

Added CommandLine class.
You can now call SetCommandLineArgument like SetConsoleCommand and hereby define a new command line argument. They are passed in main() and then they can be accessed by commandLine::getCommandLineArgument().

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (2 diffs)
• GSRoot.cc (modified) (4 diffs)
• GSRoot.h (modified) (1 diff)

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

@@ -35 +35 @@
 #include "core/input/KeyBinder.h"
 #include "core/Loader.h"
+#include "core/CommandLine.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
@@ -45 +46 @@
 namespace orxonox
 {
+    SetCommandLineArgument(port, 55556).setShortcut("p");
+    SetCommandLineArgument(ip, std::string("127.0.0.0"));
+
     GSLevel::GSLevel()
         : GameState("level")

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

@@ -38 +38 @@
 #include "core/TclBind.h"
 #include "core/Core.h"
+#include "core/CommandLine.h"
 #include "GraphicsEngine.h"
 #include "Settings.h"
@@ -43 +44 @@
 namespace orxonox
 {
+    SetCommandLineArgument(dataPath, std::string("./"));
+
     GSRoot::GSRoot()
         : GameState("root")
+        , settings_(0)
         , graphicsEngine_(0)
     {
@@ -64 +68 @@
         Factory::createClassHierarchy();
 
-        const Settings::CommandLineArgument* dataPath = Settings::getCommandLineArgument("dataPath");
-        assert(dataPath);
-        if (!dataPath->bHasDefaultValue_)
+        // instantiate Settings class
+        this->settings_ = new Settings();
+
+        const CommandLineArgument<std::string>* dataPath = CommandLine::getCommandLineArgument<std::string>("dataPath");
+        if (!dataPath->hasDefaultValue())
         {
-            if (*dataPath->value_.getString().end() != '/' && *dataPath->value_.getString().end() != '\\')
-                Settings::tsetDataPath(dataPath->value_.getString() + "/");
+            if (*dataPath->getValue().end() != '/' && *dataPath->getValue().end() != '\\')
+                Settings::tsetDataPath(dataPath->getValue() + "/");
             else
-                Settings::tsetDataPath(dataPath->value_.getString());
+                Settings::tsetDataPath(dataPath->getValue());
         }
 
@@ -89 +95 @@
     void GSRoot::leave()
     {
-        if (this->graphicsEngine_)
-            delete graphicsEngine_;
+        delete graphicsEngine_;
+
+        delete settings_;
     }
 

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

@@ -48 +48 @@
         void leave();
 
+        Settings*             settings_;
         GraphicsEngine*       graphicsEngine_;   //!< our dearest graphics engine <3
     };