Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7334 from hyperlogic/tony/third-person-camera-mouse-fix

Browse source 
Application: fix for mouse control in third-person camera
This commit is contained in:
Philip Rosedale 2016-03-11 18:03:24 -08:00
commit f87b9a963e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -3186,9 +3186,12 @@ void Application::update(float deltaTime) {
myAvatar->getHMDSensorMatrix() myAvatar->getHMDSensorMatrix()
}; };
InputPluginPointer keyboardMousePlugin;
bool jointsCaptured = false; bool jointsCaptured = false;
for (auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) { for (auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
if (inputPlugin->isActive()) { if (inputPlugin->getName() == KeyboardMouseDevice::NAME) {
keyboardMousePlugin = inputPlugin;
} else if (inputPlugin->isActive()) {
inputPlugin->pluginUpdate(deltaTime, calibrationData, jointsCaptured); inputPlugin->pluginUpdate(deltaTime, calibrationData, jointsCaptured);
if (inputPlugin->isJointController()) { if (inputPlugin->isJointController()) {
jointsCaptured = true; jointsCaptured = true;
@ -3198,6 +3201,10 @@ void Application::update(float deltaTime) {
userInputMapper->update(deltaTime); userInputMapper->update(deltaTime);
if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {
keyboardMousePlugin->pluginUpdate(deltaTime, calibrationData, jointsCaptured);
}
_controllerScriptingInterface->updateInputControllers(); _controllerScriptingInterface->updateInputControllers();
// Transfer the user inputs to the driveKeys // Transfer the user inputs to the driveKeys