diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js index 4e5f6e8fef..98af1eb19b 100644 --- a/scripts/system/controllers/teleport.js +++ b/scripts/system/controllers/teleport.js @@ -115,13 +115,11 @@ function Teleporter() { inTeleportMode = true; this.inCoolIn = true; - print('setting cool in timeout') if (coolInTimeout !== null) { Script.clearTimeout(coolInTimeout); } coolInTimeout = Script.setTimeout(function() { - print('should exit cool in mode now' + COOL_IN_DURATION) _this.inCoolIn = false; }, COOL_IN_DURATION) @@ -234,15 +232,12 @@ function Teleporter() { teleporter.leftRay(); if ((leftPad.buttonValue === 0) && inTeleportMode === true) { if (_this.inCoolIn === true) { - print('released during cool in period. exit.') _this.exitTeleportMode(); _this.deleteTargetOverlay(); _this.deleteCancelOverlay(); } else { - print('release while not in cool in and in teleport mode. should teleport') _this.teleport(); } - print('some other state::' + leftPad.buttonValue + "///" + inTeleportMode) return; } @@ -253,15 +248,12 @@ function Teleporter() { teleporter.rightRay(); if ((rightPad.buttonValue === 0) && inTeleportMode === true) { if (_this.inCoolIn === true) { - print('released during cool in period. exit.') _this.exitTeleportMode(); _this.deleteTargetOverlay(); _this.deleteCancelOverlay(); } else { - print('release while not in cool in and in teleport mode. should teleport') _this.teleport(); } - print('some other state::' + rightPad.buttonValue + "///" + inTeleportMode) return; } } diff --git a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js index 57aa4cd2c1..696cac714a 100644 --- a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js +++ b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js @@ -1,5 +1,6 @@ -// Created by james b. pollack @imgntn on 7/2/2016 +// Created by james b. pollack @imgntn on 8/18/2016 // Copyright 2016 High Fidelity, Inc. +// //advanced movements settings are in individual controller json files //what we do is check the status of the 'advance movement' checkbox when you enter HMD mode //if 'advanced movement' is checked...we give you the defaults that are in the json. @@ -49,15 +50,12 @@ function registerBasicMapping() { } if (Controller.Hardware.Vive !== undefined) { if (value > 0.75 && inFlipTurn === false) { - print('vive should flip turn') inFlipTurn = true; rotate180(); Script.setTimeout(function() { - print('vive should be able to flip turn again') inFlipTurn = false; }, 250) } else { - print('vive should not flip turn') } } @@ -71,19 +69,15 @@ function registerBasicMapping() { } if (Controller.Hardware.Vive !== undefined) { if (value > 0.75 && inFlipTurn === false) { - print('vive should flip turn') inFlipTurn = true; rotate180(); Script.setTimeout(function() { - print('vive should be able to flip turn again') inFlipTurn = false; }, 250) } else { - print('vive should not flip turn') } } - print('should do RY stuff' + value + ":stick:" + stick); return; }) } @@ -114,7 +108,6 @@ function menuItemEvent(menuItem) { enableMappings(); } } - } addAdvancedMovementItemToSettingsMenu();