Changeset 1664 for code/branches/gui/src/orxonox/Main.cc

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

File:

• code/branches/gui/src/orxonox/Main.cc (modified) (3 diffs)

code/branches/gui/src/orxonox/Main.cc

@@ -41 +41 @@
 #include "core/SignalHandler.h"
 #include "core/Debug.h"
-#include "core/CommandLine.h"
-//#include "Orxonox.h"
 
 #include "gamestates/GSRoot.h"
@@ -85 +83 @@
 int main(int argc, char** argv)
 {
-    try
-    {
-        orxonox::CommandLine::parse(argc, argv);
-    }
-    catch (orxonox::ArgumentException& ex)
-    {
-        COUT(1) << ex.what() << std::endl;
-        COUT(0) << "Usage:" << std::endl << "orxonox [--mode client|server|dedicated|standalone] "
-                << "[--data PATH] [--ip IP] [--port PORT]" << std::endl;
-    }
-
-
     // create a signal handler (only works for linux)
     SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
-
 
 
@@ -144 +129 @@
     graphics.addChild(&gui);
 
-    root.requestState("gui");
+    root.feedCommandLine(argc, argv);
+    root.requestState("root");
     root.tick(0.0f);
     root.requestState("");
-
-
-    //Orxonox orxonoxInstance;
-
-    try
-    {
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
-        orxonoxInstance.start(macBundlePath());
-#else
-        //orxonoxInstance.start();
-#endif
-    }
-    catch (std::exception& ex)
-    {
-        COUT(1) << ex.what() << std::endl;
-        COUT(1) << "Abort." << std::endl;
-    }
 
     return 0;