mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 08:37:19 +02:00
Fix InputController (Leap Motion) not being updated
This commit is contained in:
parent
e25d4c17e8
commit
5ecbaa5b93
3 changed files with 11 additions and 2 deletions
|
@ -2825,6 +2825,8 @@ void Application::update(float deltaTime) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_controllerScriptingInterface->updateInputControllers();
|
||||||
|
|
||||||
// Transfer the user inputs to the driveKeys
|
// Transfer the user inputs to the driveKeys
|
||||||
// FIXME can we drop drive keys and just have the avatar read the action states directly?
|
// FIXME can we drop drive keys and just have the avatar read the action states directly?
|
||||||
myAvatar->clearDriveKeys();
|
myAvatar->clearDriveKeys();
|
||||||
|
|
|
@ -89,8 +89,7 @@ controller::InputController* ControllerScriptingInterface::createInputController
|
||||||
auto icIt = _inputControllers.find(0);
|
auto icIt = _inputControllers.find(0);
|
||||||
if (icIt != _inputControllers.end()) {
|
if (icIt != _inputControllers.end()) {
|
||||||
return (*icIt).second.get();
|
return (*icIt).second.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Look for device
|
// Look for device
|
||||||
DeviceTracker::ID deviceID = DeviceTracker::getDeviceID(deviceName.toStdString());
|
DeviceTracker::ID deviceID = DeviceTracker::getDeviceID(deviceName.toStdString());
|
||||||
|
@ -122,6 +121,12 @@ void ControllerScriptingInterface::releaseInputController(controller::InputContr
|
||||||
_inputControllers.erase(input->getKey());
|
_inputControllers.erase(input->getKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ControllerScriptingInterface::updateInputControllers() {
|
||||||
|
for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
|
||||||
|
(*it).second->update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :
|
InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :
|
||||||
_deviceTrackerId(deviceTrackerId),
|
_deviceTrackerId(deviceTrackerId),
|
||||||
_subTrackerId(subTrackerId),
|
_subTrackerId(subTrackerId),
|
||||||
|
|
|
@ -85,6 +85,8 @@ public:
|
||||||
bool isKeyCaptured(const KeyEvent& event) const;
|
bool isKeyCaptured(const KeyEvent& event) const;
|
||||||
bool isJoystickCaptured(int joystickIndex) const;
|
bool isJoystickCaptured(int joystickIndex) const;
|
||||||
|
|
||||||
|
void updateInputControllers();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
virtual void captureKeyEvents(const KeyEvent& event);
|
virtual void captureKeyEvents(const KeyEvent& event);
|
||||||
|
|
Loading…
Reference in a new issue