Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 16:06:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Merge pull request from overte-org/thumbsticks

Browse source 
Fix Valve Index Controller trackpad regression
This commit is contained in:
Julian Groß 2023-07-09 18:37:24 +02:00 committed by GitHub
commit 010e14dfc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
interface/resources/controllers
openvr_alternative.json
plugins/openvr/src
ViveControllerManager.cpp

0
interface/resources/controllers/index.json → interface/resources/controllers/openvr_alternative.json
View file

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

@ -2070,10 +2070,14 @@ controller::Input::NamedVector ViveControllerManager::InputDevice::getAvailableI
QString ViveControllerManager::InputDevice::getDefaultMappingConfig() const {
QString name(getOpenVrDeviceName().c_str());
QString MAPPING_JSON;
if (name.contains(QString("HTC")) || name.contains(QString("Vive"))) {
// Workaround for having to press the thumbstick to be able to move.
// On HTC Vive wands we want to need to press the touchpad to move.
// On Valve Index controllers the thumbsticks don't need to be pressed, but the touchpad does. Valve seems to have already thought of this.
if (name.contains(QString("HTC")) || name.contains(QString("Vive")) || name.contains(QString("Valve"))) {
MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/vive.json";
// Other HMDs need a different mapping to not need the thumbstick to be pressed.
} else {
MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/index.json";
MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/openvr_alternative.json";
}
return MAPPING_JSON;
}