From 53f24954e05a5b2a62f39a30cfa343c1f1bbb4a1 Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 7 Jan 2015 11:15:30 -0800 Subject: [PATCH] Updates based on PR comments Commented out Camera.stopLooking and Camera.keepLookingAt . This can be put back when we merge back the C++ issue. --- examples/example/avatarcontrol/lookAtExample.js | 4 ++++ examples/example/entities/editEntityExample.js | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/example/avatarcontrol/lookAtExample.js b/examples/example/avatarcontrol/lookAtExample.js index 3beb22e7ec..8484a82ef1 100644 --- a/examples/example/avatarcontrol/lookAtExample.js +++ b/examples/example/avatarcontrol/lookAtExample.js @@ -22,6 +22,7 @@ var oldMode = Camera.mode; function cancelLookAt() { if (lookingAtSomething) { lookingAtSomething = false; + //Camera.stopLooking(); Camera.mode = oldMode; releaseMovementKeys(); } @@ -72,6 +73,9 @@ function mousePressEvent(event) { // switch to independent mode Camera.mode = "independent"; + // tell the camera to fix it's look at on the point we clicked +- //Camera.keepLookingAt(intersection.intersection); + // keep track of the fact that we're in this looking at mode lookingAtSomething = true; diff --git a/examples/example/entities/editEntityExample.js b/examples/example/entities/editEntityExample.js index d6d0a83521..96132ad471 100644 --- a/examples/example/entities/editEntityExample.js +++ b/examples/example/entities/editEntityExample.js @@ -79,7 +79,6 @@ function moveEntity(deltaTime) { y: originalProperties.position.y + (count * positionDelta.y), z: originalProperties.position.z + (count * positionDelta.z) }, - //radius : 0.05, };