Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 06:57:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge fix

Browse source
This commit is contained in:
Bradley Austin Davis 2015-08-04 00:32:38 -07:00
parent 53ccbfc4fa
commit 0edd7fd3c4
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/devices/3DConnexionClient.cpp
View file

@ -907,10 +907,10 @@ void ConnexionClient::init() {
// use default switches // use default switches
ConnexionClientControl(fConnexionClientID, kConnexionCtlSetSwitches, kConnexionSwitchesDisabled, NULL); ConnexionClientControl(fConnexionClientID, kConnexionCtlSetSwitches, kConnexionSwitchesDisabled, NULL);
if (ConnexionClient::Is3dmouseAttached() && connexiondata.getDeviceID() == 0) { if (ConnexionClient::Is3dmouseAttached() && connexiondata.getDeviceID() == 0) {
connexiondata.registerToUserInputMapper(*Application::getUserInputMapper()); auto userInputMapper = DependencyManager::get<UserInputMapper>();
connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper()); connexiondata.registerToUserInputMapper(*userInputMapper);
connexiondata.assignDefaultInputMapping(*userInputMapper);
UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion"); UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion");
} }
//let one axis be dominant //let one axis be dominant
@ -929,7 +929,8 @@ void ConnexionClient::destroy() {
fConnexionClientID = 0; fConnexionClientID = 0;
ConnexionData& connexiondata = ConnexionData::getInstance(); ConnexionData& connexiondata = ConnexionData::getInstance();
if (connexiondata.getDeviceID()!=0) { if (connexiondata.getDeviceID()!=0) {
Application::getUserInputMapper()->removeDevice(connexiondata.getDeviceID()); auto userInputMapper = DependencyManager::get<UserInputMapper>();
userInputMapper->removeDevice(connexiondata.getDeviceID());
connexiondata.setDeviceID(0); connexiondata.setDeviceID(0);
} }
} }
@ -939,8 +940,9 @@ void DeviceAddedHandler(unsigned int connection) {
ConnexionData& connexiondata = ConnexionData::getInstance(); ConnexionData& connexiondata = ConnexionData::getInstance();
if (connexiondata.getDeviceID() == 0) { if (connexiondata.getDeviceID() == 0) {
qCWarning(interfaceapp) << "3Dconnexion device added "; qCWarning(interfaceapp) << "3Dconnexion device added ";
connexiondata.registerToUserInputMapper(*Application::getUserInputMapper()); auto userInputMapper = DependencyManager::get<UserInputMapper>();
connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper()); connexiondata.registerToUserInputMapper(*userInputMapper);
connexiondata.assignDefaultInputMapping(*userInputMapper);
UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion"); UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion");
} }
} }
@ -949,7 +951,8 @@ void DeviceRemovedHandler(unsigned int connection) {
ConnexionData& connexiondata = ConnexionData::getInstance(); ConnexionData& connexiondata = ConnexionData::getInstance();
if (connexiondata.getDeviceID() != 0) { if (connexiondata.getDeviceID() != 0) {
qCWarning(interfaceapp) << "3Dconnexion device removed"; qCWarning(interfaceapp) << "3Dconnexion device removed";
Application::getUserInputMapper()->removeDevice(connexiondata.getDeviceID()); auto userInputMapper = DependencyManager::get<UserInputMapper>();
userInputMapper->removeDevice(connexiondata.getDeviceID());
connexiondata.setDeviceID(0); connexiondata.setDeviceID(0);
} }
} }