Changeset 1317 for code/branches/console/src/orxonox/Orxonox.cc

Timestamp:

May 18, 2008, 1:28:08 AM (17 years ago)

Author:

landauf

Message:

changed some parts of InGameConsole to make it work with Shell, but I couldn't test it yet as there seems to be a bug in InputBuffer.

File:

• code/branches/console/src/orxonox/Orxonox.cc (modified) (7 diffs)

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

@@ -76 +76 @@
 #include "tools/Timer.h"
 #include "hud/HUD.h"
-#include "console/InGameConsole.h"
+//#include "console/InGameConsole.h"
 
 // FIXME: is this really file scope?
@@ -88 +88 @@
   ConsoleCommand(Orxonox, slomo, AccessLevel::Offline, true).setDefaultValue(0, 1.0);
   ConsoleCommand(Orxonox, setTimeFactor, AccessLevel::Offline, false).setDefaultValue(0, 1.0);
-
+/*
   class Testconsole : public InputBufferListener
   {
@@ -125 +125 @@
       InputBuffer* ib_;
   };
-
+*/
   class Calculator
   {
@@ -421 +421 @@
   void Orxonox::startRenderLoop()
   {
-    InputBuffer* ib = new InputBuffer();
-    InputManager::getSingleton().feedInputBuffer(ib);
+
+//    InputBuffer* ib = new InputBuffer();
+//    InputManager::getSingleton().feedInputBuffer(ib);
     /*
     Testconsole* console = new Testconsole(ib);
@@ -432 +433 @@
     ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
     */
-
+    /*
     orxonoxConsole_ = new InGameConsole(ib);
     ib->registerListener(orxonoxConsole_, &InGameConsole::listen, true);
@@ -440 +441 @@
     ib->registerListener(orxonoxConsole_, &InGameConsole::removeLast, '\b', true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::exit, (char)0x1B, true);
-
+    */
     // first check whether ogre root object has been created
     if (Ogre::Root::getSingletonPtr() == 0)
@@ -489 +490 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
-      orxonoxConsole_->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+//      orxonoxConsole_->tick((float)evt.timeSinceLastFrame * this->timefactor_);
 
       // don't forget to call _fireFrameStarted in ogre to make sure