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

Timestamp:

Aug 26, 2008, 4:26:04 PM (16 years ago)

Author:

rgrieder

Message:

Still working on the GameStates, but I have to save the work because of some major changes.

• Exported InputManager- and TclThreadManager-tick to GSGraphics instead of Core
• Fixed a few bugs in GameState by adding an internal state variable as bitfield (quite practical)
• Fixed a bug in InputManager that occurred when destroying an active InputState
• Added GSIO and GSIOConsole (3 lines of loop code with std::cin, but works )
• Added more boost thread includes to OrxonoxStableHeaders.h
• Many changes in all GameState derived classes

File:

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

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

@@ -44 +44 @@
 #include "gamestates/GSRoot.h"
 #include "gamestates/GSGraphics.h"
-#include "gamestates/GSLevel.h"
+#include "gamestates/GSStandalone.h"
+#include "gamestates/GSServer.h"
+#include "gamestates/GSClient.h"
 #include "gamestates/GSGUI.h"
+#include "gamestates/GSIO.h"
+#include "gamestates/GSIOConsole.h"
 
 using namespace orxonox;
@@ -77 +81 @@
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+//#ifdef __cplusplus
+//extern "C" {
+//#endif
 
 int main(int argc, char** argv)
@@ -122 +126 @@
     GSRoot root;
     GSGraphics graphics;
-    GSLevel level;
+    GSStandalone standalone;
+    GSServer server;
+    GSClient client;
     GSGUI gui;
+    GSIO io;
+    GSIOConsole ioConsole;
 
     root.addChild(&graphics);
-    graphics.addChild(&level);
+    graphics.addChild(&standalone);
+    graphics.addChild(&server);
+    graphics.addChild(&client);
     graphics.addChild(&gui);
 
+    root.addChild(&io);
+    io.addChild(&ioConsole);
+
     root.feedCommandLine(argc, argv);
-    root.requestState("root");
-    root.tick(0.0f);
-    root.requestState("");
+    root.requestState("ioConsole");
+    while (!root.isGameFinished())
+        root.tick(0.0f);
 
     return 0;
 }
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif