Changeset 1891 for code/trunk/src/orxonox/Main.cc

Timestamp:

Oct 6, 2008, 7:39:38 PM (17 years ago)

Author:

rgrieder

Message:

Moved all Ogre related code from GSRoot to GSGraphics.
You should now be able to start the gui, goto ioConsole, then start the gui again and load the level.
gui —> level —> gui doesn't yet work. But I will not dig into that until our object hierarchy has been replaced.

File:

• code/trunk/src/orxonox/Main.cc (modified) (4 diffs)

code/trunk/src/orxonox/Main.cc

@@ -39 +39 @@
 
 #include "util/OrxonoxPlatform.h"
+#include "util/Debug.h"
+#include "core/ConfigFileManager.h"
 #include "SignalHandler.h"
-#include "util/Debug.h"
 
 #include "gamestates/GSRoot.h"
@@ -90 +91 @@
     SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
 
+    // Specifiy config file before creating the GameStates in order to have
+    // setConfigValues() in the constructor (required).
+#if ORXONOX_DEBUG_MODE == 1
+        ConfigFileManager::getInstance().setFile(CFT_Settings, "orxonox_d.ini");
+#else
+        ConfigFileManager::getInstance().setFile(CFT_Settings, "orxonox.ini");
+#endif
+
+    // create the gamestates
     GSRoot root;
     GSGraphics graphics;
@@ -99 +109 @@
     GSIOConsole ioConsole;
 
+    // make the hierarchy
     root.addChild(&graphics);
     graphics.addChild(&standalone);
@@ -104 +115 @@
     graphics.addChild(&client);
     graphics.addChild(&gui);
-
     root.addChild(&ioConsole);
     root.addChild(&dedicated);
 
+    // Here happens the game
     root.start(argc, argv);