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

Fixes

Browse source
This commit is contained in:
Zach Fox 2017-07-12 15:17:23 -07:00
parent d37789234d
commit e6f7457d0c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -157,7 +157,7 @@
if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) { if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) {
button = tablet.addButton({ button = tablet.addButton({
text: buttonName, text: buttonName,
icon: Script.resourcesPath() + "icons/tablet-icons/spectator-i.svg" icon: "icons/tablet-icons/spectator-i.svg"
}); });
button.clicked.connect(onTabletButtonClicked); button.clicked.connect(onTabletButtonClicked);
} }
@ -344,9 +344,9 @@
function registerButtonMappings() { function registerButtonMappings() {
var VRDevices = Controller.getDeviceNames().toString(); var VRDevices = Controller.getDeviceNames().toString();
if (VRDevices) { if (VRDevices) {
if (VRDevices.includes("Vive")) { if (VRDevices.indexOf("Vive") != -1) {
controllerType = "Vive"; controllerType = "Vive";
} else if (VRDevices.includes("OculusTouch")) { } else if (VRDevices.indexOf("OculusTouch") != -1) {
controllerType = "OculusTouch"; controllerType = "OculusTouch";
} else { } else {
sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType }); sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });