Changeset 1555 for code/trunk/src/core/input/InputManager.cc

Timestamp:

Jun 6, 2008, 9:05:27 PM (16 years ago)

Author:

landauf

Message:

• ParticleInterface uses Orxonox::getTimeFactor to make particle effects independend of gamespeed (but there's still a drawback with thrusters)
• reduced OIS includes in input-related classes, changed OIS search and include to avoid conflicts with other versions of OIS (for example in Ogre). not yet tested on tardis.

File:

• code/trunk/src/core/input/InputManager.cc (modified) (3 diffs)

code/trunk/src/core/input/InputManager.cc

@@ -36 +36 @@
 
 #include <limits.h>
+
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -42 +43 @@
 #include "core/ConsoleCommand.h"
 #include "core/Shell.h"               // hack!
+
 #include "InputBuffer.h"
 #include "KeyBinder.h"
 #include "KeyDetector.h"
 #include "CalibratorCallback.h"
+
+#include "src/ois/OISException.h"
+#include "src/ois/OISInputManager.h"
 
 namespace orxonox
@@ -650 +655 @@
       activeHandlers_[iHandler].first->tickInput(dt, activeHandlers_[iHandler].second);
   }
-    
+
   void InputManager::_completeCalibration()
   {