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

Merge pull request #10960 from zfox23/spectatorCamera_MarketplacePreparation

Browse source 
Spectator camera marketplace preparation
This commit is contained in:
Zach Fox 2017-07-12 16:02:47 -07:00 committed by GitHub
commit aab04042b2
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/defaultScripts.js
View file

@ -25,7 +25,6 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/tablet-goto.js", "system/tablet-goto.js",
"system/marketplaces/marketplaces.js", "system/marketplaces/marketplaces.js",
"system/edit.js", "system/edit.js",
"system/spectatorCamera.js",
"system/notifications.js", "system/notifications.js",
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",

BIN
unpublishedScripts/marketplace/spectator-camera/spectator-camera.fbx Normal file
View file

Binary file not shown.

12
scripts/system/spectatorCamera.js → unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -75,11 +75,11 @@
"collidesWith": "static,dynamic,kinematic,", "collidesWith": "static,dynamic,kinematic,",
"collisionMask": 7, "collisionMask": 7,
"dynamic": cameraIsDynamic, "dynamic": cameraIsDynamic,
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/spectator-camera.fbx?7", "modelURL": Script.resolvePath("spectator-camera.fbx"),
"registrationPoint": { "registrationPoint": {
"x": 0.53, "x": 0.56,
"y": 0.545, "y": 0.545,
"z": 0.16 "z": 0.23
}, },
"rotation": cameraRotation, "rotation": cameraRotation,
"position": cameraPosition, "position": cameraPosition,
@ -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 });
@ -383,7 +383,7 @@
// Relevant Variables: // Relevant Variables:
// -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML // -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML
// -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app. // -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app.
var SPECTATOR_CAMERA_QML_SOURCE = "../SpectatorCamera.qml"; var SPECTATOR_CAMERA_QML_SOURCE = Script.resourcesPath() + "qml/hifi/SpectatorCamera.qml";
var onSpectatorCameraScreen = false; var onSpectatorCameraScreen = false;
function onTabletButtonClicked() { function onTabletButtonClicked() {
if (!tablet) { if (!tablet) {