From 81ef722ef80ed3993c36a0d681cca072f362e53f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 4 Nov 2014 10:35:41 -0800 Subject: [PATCH] update camera calls in JS to use new mode methods --- examples/cameraExample.js | 2 +- examples/concertCamera.js | 2 +- examples/concertCamera_kyrs.js | 8 ++++---- examples/headMove.js | 6 +++--- examples/inspect.js | 6 +++--- examples/lookAtExample.js | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/cameraExample.js b/examples/cameraExample.js index 332cc0fbca..bf91c46699 100644 --- a/examples/cameraExample.js +++ b/examples/cameraExample.js @@ -23,7 +23,7 @@ var THRUST_CONTROLLER = 0; var VIEW_CONTROLLER = 1; function checkCamera(deltaTime) { - if (Camera.getMode() == "independent") { + if (Camera.getModeString() == "independent") { var THRUST_MAG_UP = 800.0; var THRUST_MAG_DOWN = 300.0; var THRUST_MAG_FWD = 500.0; diff --git a/examples/concertCamera.js b/examples/concertCamera.js index 03908d0b57..1e6aa1e414 100644 --- a/examples/concertCamera.js +++ b/examples/concertCamera.js @@ -20,7 +20,7 @@ var cameraLocations = [ {x: 7971.9, y: 241.3, z: 7304.1}, {x: 7973.0, y: 241.3, var cameraLookAts = [ {x: 7971.1, y: 241.3, z: 7304.1}, {x: 7972.1, y: 241.3, z: 7304.1}, {x: 7972.1, y: 241.3, z: 7304.1}, {x: 7972.1, y: 241.3, z: 7304.1}, {x: 7972.1, y: 241.3, z: 7304.1}, {x: 7971.3, y: 241.3, z: 7304.2} ]; function saveCameraState() { - oldMode = Camera.getMode(); + oldMode = Camera.getModeString(); avatarPosition = MyAvatar.position; Camera.setModeShiftPeriod(0.0); Camera.setMode("independent"); diff --git a/examples/concertCamera_kyrs.js b/examples/concertCamera_kyrs.js index 2b37a84f9e..8d3a07934e 100644 --- a/examples/concertCamera_kyrs.js +++ b/examples/concertCamera_kyrs.js @@ -20,15 +20,15 @@ var cameraLocations = [ {x: 2921.5, y: 251.3, z: 8254.8}, {x: 2921.5, y: 251.3, var cameraLookAts = [ {x: 2921.5, y: 251.3, z: 8255.7}, {x: 2921.5, y: 251.3, z: 8255.7}, {x: 2921.5, y: 251.3, z: 8255.7}, {x: 2921.5, y: 251.3, z: 8255.7}, {x: 2921.4 , y: 251.3, z: 8255.1} ]; function saveCameraState() { - oldMode = Camera.getMode(); + oldMode = Camera.getModeString(); avatarPosition = MyAvatar.position; Camera.setModeShiftPeriod(0.0); - Camera.setMode("independent"); + Camera.setModeString("independent"); } function restoreCameraState() { Camera.stopLooking(); - Camera.setMode(oldMode); + Camera.setModeString(oldMode); } function update(deltaTime) { @@ -52,7 +52,7 @@ function keyPressEvent(event) { saveCameraState(); freeCamera = true; } - Camera.setMode("independent"); + Camera.setModeString("independent"); Camera.setPosition(cameraLocations[choice - 1]); Camera.keepLookingAt(cameraLookAts[choice - 1]); } diff --git a/examples/headMove.js b/examples/headMove.js index 2c49847864..0ace39e853 100644 --- a/examples/headMove.js +++ b/examples/headMove.js @@ -53,12 +53,12 @@ var lastYawTurned = 0.0; var startPullbackPosition; function saveCameraState() { - oldMode = Camera.getMode(); - Camera.setMode("independent"); + oldMode = Camera.getModeString(); + Camera.setModeString("independent"); } function restoreCameraState() { - Camera.setMode(oldMode); + Camera.setModeString(oldMode); } function activateWarp() { diff --git a/examples/inspect.js b/examples/inspect.js index 81beea7ee9..5742f84765 100644 --- a/examples/inspect.js +++ b/examples/inspect.js @@ -118,14 +118,14 @@ function handlePanMode(dx, dy) { } function saveCameraState() { - oldMode = Camera.getMode(); + oldMode = Camera.getModeString(); var oldPosition = Camera.getPosition(); - Camera.setMode("independent"); + Camera.setModeString("independent"); Camera.setPosition(oldPosition); } function restoreCameraState() { - Camera.setMode(oldMode); + Camera.setModeString(oldMode); } function handleModes() { diff --git a/examples/lookAtExample.js b/examples/lookAtExample.js index 1cf8aabb96..281ba59066 100644 --- a/examples/lookAtExample.js +++ b/examples/lookAtExample.js @@ -17,13 +17,13 @@ // var lookingAtSomething = false; -var oldMode = Camera.getMode(); +var oldMode = Camera.getModeString(); function cancelLookAt() { if (lookingAtSomething) { lookingAtSomething = false; Camera.stopLooking(); - Camera.setMode(oldMode); + Camera.setModeString(oldMode); releaseMovementKeys(); } } @@ -65,13 +65,13 @@ function mousePressEvent(event) { if (intersection.intersects) { // remember the old mode we were in - oldMode = Camera.getMode(); + oldMode = Camera.getModeString(); print("looking at intersection point: " + intersection.intersection.x + ", " + intersection.intersection.y + ", " + intersection.intersection.z); // switch to independent mode - Camera.setMode("independent"); + Camera.setModeString("independent"); // tell the camera to fix it's look at on the point we clicked Camera.keepLookingAt(intersection.intersection);