Changeset 1524 for code/branches/input/src/core/input
- Timestamp:
- Jun 3, 2008, 12:20:36 AM (16 years ago)
- Location:
- code/branches/input/src/core/input
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/input/src/core/input/InputManager.cc
r1520 r1524 499 499 @param dt Delta time 500 500 */ 501 void InputManager:: tick(float dt)501 void InputManager::_tick(float dt) 502 502 { 503 503 if (state_ == IS_UNINIT) … … 649 649 activeHandlers_[iHandler].first->tickInput(dt, activeHandlers_[iHandler].second); 650 650 } 651 651 652 652 void InputManager::_completeCalibration() 653 653 { … … 1141 1141 } 1142 1142 1143 void InputManager::tick(float dt) 1144 { 1145 _getSingleton()._tick(dt); 1146 } 1147 1143 1148 // ###### KeyHandler ###### 1144 1149 -
code/branches/input/src/core/input/InputManager.h
r1519 r1524 43 43 #include "ois/OIS.h" 44 44 #include "util/Math.h" 45 #include "core/ Tickable.h"45 #include "core/OrxonoxClass.h" 46 46 #include "InputInterfaces.h" 47 47 … … 89 89 */ 90 90 class _CoreExport InputManager 91 : public TickableReal,91 : public OrxonoxClass, 92 92 public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener 93 93 { … … 143 143 static void calibrate(); 144 144 145 static void tick(float dt); 146 145 147 static bool addKeyHandler (KeyHandler* handler, const std::string& name); 146 148 static bool removeKeyHandler (const std::string& name); … … 191 193 unsigned int _getJoystick(const OIS::JoyStickEvent& arg); 192 194 193 void tick(float dt);195 void _tick(float dt); 194 196 195 197 // input events
Note: See TracChangeset
for help on using the changeset viewer.