Changeset 1446 for code/branches/network/src/core/InputManager.cc

Timestamp:

May 28, 2008, 5:30:11 AM (16 years ago)

Author:

landauf

Message:

merged console branch into network branch

after several heavy troubles it compiles, but there is still a bug I couldn't fix: orxonox crashes as soon as one presses a key after opening the console… maybe someone else sees the problem?

File:

• code/branches/network/src/core/InputManager.cc (modified) (5 diffs)

code/branches/network/src/core/InputManager.cc

@@ -42 +42 @@
 #include "CommandExecutor.h"
 #include "ConsoleCommand.h"
+#include "Shell.h"
 
 namespace orxonox
 {
-  ConsoleCommandShortcut(InputManager, keyBind, AccessLevel::User);
-  ConsoleCommandShortcut(InputManager, storeKeyStroke, AccessLevel::Offline);
-  ConsoleCommandShortcut(InputManager, calibrate, AccessLevel::User);
+  SetConsoleCommandShortcut(InputManager, keyBind);
+  SetConsoleCommandShortcut(InputManager, storeKeyStroke);
+  SetConsoleCommandShortcut(InputManager, calibrate);
 
   // ###############################
@@ -150 +151 @@
       buffer_ = new InputBuffer();
       addKeyHandler(buffer_, "buffer");
+      Shell::getInstance().setInputBuffer(buffer_);
 
       keyBinder_ = new KeyBinder();
@@ -233 +235 @@
         // register our listener in OIS.
         mouse_->setEventCallback(this);
-        CCOUT(ORX_DEBUG) << "Created OIS keyboard" << std::endl;
+        CCOUT(ORX_DEBUG) << "Created OIS mouse" << std::endl;
         return true;
       }
@@ -907 +909 @@
       for (unsigned int iHandler = 0; iHandler < activeJoyStickHandlers_[iJoyStick].size(); iHandler++)
         activeJoyStickHandlers_[iJoyStick][iHandler]->joyStickAxisMoved(iJoyStick, axis, fValue);
-    }    
+    }
   }
 
@@ -953 +955 @@
     if (lastState & OIS::Pov::West)
       buttonReleased(arg, 32 + id * 4 + 3);
-    
+
     povStates_[iJoyStick].povStates[id] = arg.state.mPOV[id].direction;