Changeset 1690 for code/branches

Timestamp:

Aug 31, 2008, 8:39:13 PM (16 years ago)

Author:

rgrieder

Message:

Added support to specify the command line arguments in start.ini (uses the same formatting). '#' is the comment character.

Location:

code/branches/gui/src/core

Files:

• CommandLine.cc (modified) (3 diffs)
• GameState.cc (modified) (1 diff)
• GameState.h (modified) (1 diff)
• RootGameState.cc (modified) (4 diffs)
• RootGameState.h (modified) (1 diff)

code/branches/gui/src/core/CommandLine.cc

@@ -28 +28 @@
 
 #include "CommandLine.h"
+
+#include "util/String.h"
 
 namespace orxonox
@@ -108 +110 @@
 
                         // save old data first
+                        value = removeTrailingWhitespaces(value);
                         if (name != "")
                         {
@@ -152 +155 @@
 
         // parse last argument
+        value = removeTrailingWhitespaces(value);
         if (name != "")
         {

code/branches/gui/src/core/GameState.cc

@@ -59 +59 @@
     GameStateBase::~GameStateBase()
     {
-        OrxAssert(!isInSubtree(getCurrentState()), "Deleting an active GameState is a very bad idea..");
+        OrxAssert(this->operation_.active == false, "Deleting an active GameState is a very bad idea..");
     }
 

code/branches/gui/src/core/GameState.h

@@ -139 +139 @@
     {
     public:
-        GameState(const std::string& name) : GameStateBase(name) { }
+        GameState(const std::string& name)
+            : GameStateBase(name)
+            , parent_(0)
+        { }
         virtual ~GameState() { }
 

code/branches/gui/src/core/RootGameState.cc

@@ -29 +29 @@
 #include "RootGameState.h"
 
+#include "util/String.h"
+#include "util/SubString.h"
 #include "Clock.h"
 #include "Debug.h"
@@ -129 +131 @@
     void RootGameState::start(int argc, char** argv)
     {
-        parseCommandLine(argc, argv);
+        parseArguments(argc, argv);
 
         this->activate();
@@ -152 +154 @@
     }
 
-    void RootGameState::parseCommandLine(int argc, char** argv)
-    {
+    /**
+    @brief
+        Parses both command line and start.ini for CommandLineArguments.
+    */
+    void RootGameState::parseArguments(int argc, char** argv)
+    {
+        // parse command line first
         std::vector<std::string> args;
         for (int i = 1; i < argc; ++i)
@@ -167 +174 @@
             COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
         }
+
+        // look for additional arguments in start.ini
+        std::ifstream file;
+        file.open("start.ini");
+        args.clear();
+        if (file)
+        {
+            while (!file.eof())
+            {
+                std::string line;
+                std::getline(file, line);
+                line = removeTrailingWhitespaces(line);
+                //if (!(line[0] == '#' || line[0] == '%'))
+                //{
+                SubString tokens(line, " ", " ", false, 92, false, 34, false, 40, 41, false, '#');
+                for (unsigned i = 0; i < tokens.size(); ++i)
+                    if (tokens[i][0] != '#')
+                        args.push_back(tokens[i]);
+                //args.insert(args.end(), tokens.getAllStrings().begin(), tokens.getAllStrings().end());
+                //}
+            }
+            file.close();
+        }
+
+        try
+        {
+            orxonox::CommandLine::parse(args);
+        }
+        catch (orxonox::ArgumentException& ex)
+        {
+            COUT(1) << "An Exception occured while parsing start.ini" << std::endl;
+            COUT(1) << ex.what() << std::endl;
+            COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
+        }
     }
 }

code/branches/gui/src/core/RootGameState.h

@@ -48 +48 @@
         void gotoState(const std::string& name);
 
-        void parseCommandLine(int argc, char** argv);
+        void parseArguments(int argc, char** argv);
 
         std::string           stateRequest_;