Changeset 3279 for code/branches/core4/src/core/input/InputDevice.h

Timestamp:

Jul 12, 2009, 11:08:50 PM (15 years ago)

Author:

rgrieder

Message:

Heavy clean up in the InputManager; not many real code changes though.
And temporary hack-fixed a problem in the Keybinder with std::vector.reserve(1000)

File:

• code/branches/core4/src/core/input/InputDevice.h (modified) (2 diffs)

code/branches/core4/src/core/input/InputDevice.h

@@ -113 +113 @@
             : InputDevice(id)
         {
-            OIS::InputManager* system = InputManager::getInstance().getInputSystem();
+            OIS::InputManager* system = InputManager::getInstance().getOISInputManager();
             oisDevice_ = static_cast<OISDeviceClass*>(system->createInputObject(OISDeviceValue, true));
             oisDevice_->setEventCallback(static_cast<DeviceClass*>(this));
@@ -123 +123 @@
             try
             {
-                InputManager::getInstance().getInputSystem()->destroyInputObject(oisDevice_);
+                InputManager::getInstance().getOISInputManager()->destroyInputObject(oisDevice_);
             }
             catch (...)