Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 15:32:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10527 from davidkelly/dk/4756

Browse source 
Should fix crash in general setting dialog
This commit is contained in:
Howard Stearns 2017-05-23 18:08:13 -07:00 committed by GitHub
commit b46ff07d65
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -163,12 +163,15 @@ void ViveControllerManager::pluginUpdate(float deltaTime, const controller::Inpu
}
ViveControllerManager::InputDevice::InputDevice(vr::IVRSystem*& system) : controller::InputDevice("Vive"), _system(system) {
createPreferences();
_configStringMap[Config::Auto] = QString("Auto");
_configStringMap[Config::Feet] = QString("Feet");
_configStringMap[Config::FeetAndHips] = QString("FeetAndHips");
_configStringMap[Config::FeetHipsAndChest] = QString("FeetHipsAndChest");
if (openVrSupported()) {
createPreferences();
}
}
void ViveControllerManager::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {