Changeset 7424 for sandbox_qt/src/libraries/core/Core.cc

Timestamp:

Sep 12, 2010, 2:48:11 PM (14 years ago)

Author:

rgrieder

Message:

Added CommandlineParser again and adjusted it to work with QVariant instead of MultiType.
Also removed obsolete Game class.

File:

• sandbox_qt/src/libraries/core/Core.cc (modified) (5 diffs)

sandbox_qt/src/libraries/core/Core.cc

@@ -53 +53 @@
 #include "util/Exception.h"
 #include "PathConfig.h"
+#include "CommandLineParser.h"
 
 namespace orxonox
@@ -59 +60 @@
     Core* Core::singletonPtr_s  = 0;
 
+    SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
+
+#ifdef ORXONOX_PLATFORM_WINDOWS
+    SetCommandLineArgument(limitToCPU, 1).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is the first core (faster than off)");
+#endif
+
     Core::Core(const std::string& cmdLine)
     {
         // Set the hard coded fixed paths
         this->pathConfig_.reset(new PathConfig());
+
+        // Parse command line arguments
+        CommandLineParser::parseCommandLine(cmdLine);
 
         // Set configurable paths like log, config and media
@@ -70 +80 @@
         OutputHandler::getInstance().setLogPath(PathConfig::getLogPathString());
 
+        // Parse additional options file now that we know its path
+        CommandLineParser::parseFile();
+
 #ifdef ORXONOX_PLATFORM_WINDOWS
         // limit the main thread to the first core so that QueryPerformanceCounter doesn't jump
-        int limitToCPU = 0;//CommandLineParser::getValue("limitToCPU");
+        int limitToCPU = CommandLineParser::getValue("limitToCPU").toInt();
         if (limitToCPU > 0)
             setThreadAffinity(static_cast<unsigned int>(limitToCPU));
@@ -78 +91 @@
 
         // Generate documentation instead of normal run?
-        std::string docFilename;
-        //CommandLineParser::getValue("generateDoc", &docFilename);
+        std::string docFilename = CommandLineParser::getValue("generateDoc").toString().toStdString();
         if (!docFilename.empty())
         {
@@ -85 +97 @@
             if (docFile.is_open())
             {
-                //CommandLineParser::generateDoc(docFile);
+                CommandLineParser::generateDoc(docFile);
                 docFile.close();
             }