Changeset 993 for code/branches/core2/src/orxonox/Orxonox.cc

Timestamp:

Apr 5, 2008, 3:40:10 AM (16 years ago)

Author:

landauf

Message:

• added exit command: quits orxonox (no, it's not a hidden segfault )
• added exec command: executes files (that contain other commands)

funny: use the log function to write commands into orxonox.log and then use 'exec orxonox.log' - it works. I've even added a recursion-blocker to avoid an (almost) endless loop after logging 'exec orxonox.log'

I'm currently thinking about more complex commands (what about delayed commands? or commands with returnvalue and a pipeline symbol?).

File:

• code/branches/core2/src/orxonox/Orxonox.cc (modified) (4 diffs)

code/branches/core2/src/orxonox/Orxonox.cc

@@ -86 +86 @@
 #include "objects/test3.h"
 
+#include "core/ConsoleCommand.h"
 #include "core/CommandExecutor.h"
 #include "core/InputBuffer.h"
@@ -93 +94 @@
 namespace orxonox
 {
+    ConsoleCommandShortcut(Orxonox, exit, AccessLevel::None);
+
     class Testlistener : public InputBufferListener
     {
@@ -150 +153 @@
 
         mKeyboard->capture();
-        return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
+        return (!mKeyboard->isKeyDown(OIS::KC_ESCAPE) && !Orxonox::getSingleton()->shouldExit());
       }
 /*
@@ -185 +188 @@
     this->frameListener_ = 0;
     this->root_ = 0;
+    this->bExit_ = false;
   }