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

Merge pull request #808 from JulianGro/valve_calibration_workaround

Browse source 
Workaround: Add Valve Index to calibratable devices
This commit is contained in:
kasenvr 2020-10-15 17:11:45 -04:00 committed by GitHub
commit 97c823ab4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/tablet/ControllerSettings.qml
View file

@ -27,6 +27,7 @@ Item {
width: parent.width width: parent.width
property string title: "Controls" property string title: "Controls"
property var openVRDevices: ["HTC Vive", "Valve Index", "Valve HMD", "Valve"]
HifiConstants { id: hifi } HifiConstants { id: hifi }
@ -244,7 +245,7 @@ Item {
source: InputConfiguration.configurationLayout(box.textAt(box.currentIndex)); source: InputConfiguration.configurationLayout(box.textAt(box.currentIndex));
onLoaded: { onLoaded: {
if (loader.item.hasOwnProperty("pluginName")) { if (loader.item.hasOwnProperty("pluginName")) {
if (box.textAt(box.currentIndex) === "HTC Vive") { if (openVRDevices.indexOf(box.textAt(box.currentIndex)) !== -1) {
loader.item.pluginName = "OpenVR"; loader.item.pluginName = "OpenVR";
} else { } else {
loader.item.pluginName = box.textAt(box.currentIndex); loader.item.pluginName = box.textAt(box.currentIndex);
@ -298,7 +299,7 @@ Item {
loader.source = ""; loader.source = "";
var selectedDevice = box.textAt(box.currentIndex); var selectedDevice = box.textAt(box.currentIndex);
var source = ""; var source = "";
if (selectedDevice == "HTC Vive") { if (openVRDevices.indexOf(selectedDevice) !== -1) {
source = InputConfiguration.configurationLayout("OpenVR"); source = InputConfiguration.configurationLayout("OpenVR");
} else { } else {
source = InputConfiguration.configurationLayout(selectedDevice); source = InputConfiguration.configurationLayout(selectedDevice);