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

Timestamp:

Aug 21, 2008, 9:23:11 PM (16 years ago)

Author:

rgrieder

Message:

• Finished CommandLineArgument completely. You can also use SetCommandLineSwitch to define boolean switches.
• Added StaticConversion to Covert.h (compile time type conversion checking)
• Fixed a bug in Exception
• Added getAllStrings() to SubString

Location:

code/branches/gui/src/orxonox/gamestates

Files:

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

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

@@ -46 +46 @@
 namespace orxonox
 {
-    SetCommandLineArgument(port, 55556).setShortcut("p");
-    SetCommandLineArgument(ip, std::string("127.0.0.0"));
+    SetCommandLineArgument(port, 55556).setShortcut("p").setInformation("PORT");
+    SetCommandLineArgument(ip, "127.0.0.0").setInformation("#.#.#.#");
 
     GSLevel::GSLevel()

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

@@ -30 +30 @@
 #include "GSRoot.h"
 
+#include "util/SubString.h"
 #include "core/Factory.h"
 #include "core/ConfigFileManager.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
+#include "core/CommandLine.h"
 #include "core/Debug.h"
 #include "core/Exception.h"
@@ -44 +46 @@
 namespace orxonox
 {
-    SetCommandLineArgument(dataPath, std::string("./"));
+    SetCommandLineArgument(dataPath, "").setInformation("PATH");
 
     GSRoot::GSRoot()
@@ -55 +57 @@
     GSRoot::~GSRoot()
     {
+    }
+
+    //SetCommandLineArgument(asdf1, "haha").setShortcut("a").setUsageInformation("1|2|3");
+    //SetCommandLineArgument(asdf2, 3).setShortcut("b");
+    //SetCommandLineArgument(asdf3, Vector2()).setShortcut("c");
+    //SetCommandLineArgument(adsf4, 1.4f).setShortcut("d");
+    //SetCommandLineSwitch(showGraphics).setShortcut("g");
+
+    void GSRoot::feedCommandLine(int argc, char** argv)
+    {
+        std::vector<std::string> args;
+        for (int i = 1; i < argc; ++i)
+            args.push_back(argv[i]);
+
+        //std::string line = "-a --asdf3 (3,3) -d -5 -b - 5.4";
+        //SubString tokens(line, " ", " ", false, 92, false, 34, true, 40, 41, false, 0);
+
+        try
+        {
+            orxonox::CommandLine::parse(args);
+            //CommandLine::parse(tokens.getAllStrings());
+        }
+        catch (orxonox::ArgumentException& ex)
+        {
+            COUT(1) << ex.what() << std::endl;
+            COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
+        }
     }
 
@@ -71 +100 @@
         this->settings_ = new Settings();
 
-        const CommandLineArgument<std::string>* dataPath = CommandLine::getCommandLineArgument<std::string>("dataPath");
-        if (!dataPath->hasDefaultValue())
+        std::string dataPath;
+        CommandLine::getCommandLineValue("dataPath", &dataPath);
+        if (dataPath != "")
         {
-            if (*dataPath->getValue().end() != '/' && *dataPath->getValue().end() != '\\')
-                Settings::tsetDataPath(dataPath->getValue() + "/");
+            if (*dataPath.end() != '/' && *dataPath.end() != '\\')
+                Settings::tsetDataPath(dataPath + "/");
             else
-                Settings::tsetDataPath(dataPath->getValue());
+                Settings::tsetDataPath(dataPath);
         }
 
@@ -91 +121 @@
         functor->setObject(this);
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "loadGame"));
+
+        requestState("gui");
     }
 

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

@@ -41 +41 @@
         ~GSRoot();
 
+        void feedCommandLine(int argc, char** argv);
         bool tick(float dt);
         void loadGame(const std::string& name);