History

Fix InputController (Leap Motion) not being updated

David Rowe committed 10 years ago

Commit 5ecbaa51 parent e25d4c13 files · +11 −2Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+7−2
@@ -89,8 +89,7 @@ controller::InputController* ControllerScriptingInterface::createInputController · 88 unmodified lines
89 auto icIt = _inputControllers.find(0);89 auto icIt = _inputControllers.find(0);
90 if (icIt != _inputControllers.end()) {90 if (icIt != _inputControllers.end()) {
91 return (*icIt).second.get();91 return (*icIt).second.get();
92 } 92 }
93
94 93
95 // Look for device94 // Look for device
96 DeviceTracker::ID deviceID = DeviceTracker::getDeviceID(deviceName.toStdString());95 DeviceTracker::ID deviceID = DeviceTracker::getDeviceID(deviceName.toStdString());
@@ -122,6 +121,12 @@ void ControllerScriptingInterface::releaseInputController(controller::InputContr · 25 unmodified lines
122 _inputControllers.erase(input->getKey());121 _inputControllers.erase(input->getKey());
123}122}
124 123
124void ControllerScriptingInterface::updateInputControllers() {
125 for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
126 (*it).second->update();
127 }
128}
129
125InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :130InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :
126 _deviceTrackerId(deviceTrackerId),131 _deviceTrackerId(deviceTrackerId),
127 _subTrackerId(subTrackerId),132 _subTrackerId(subTrackerId),