From a8ec78ed2fe6e73032ec2df5da0fb6ce0509fcc2 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Sun, 27 Mar 2016 14:32:08 -0700 Subject: [PATCH] object typo --- .../DomainContent/Home/dressingRoom/transformer.js | 2 +- unpublishedScripts/DomainContent/Home/fishTank/tank.js | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js index 1896bb8a59..10154f7054 100644 --- a/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js +++ b/unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js @@ -76,7 +76,7 @@ rotation: rotatorProps.rotation, userData: JSON.stringify({ 'grabbableKey': { - 'grabbable:', false + 'grabbable': false }, 'hifiHomeKey': { 'reset': true diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js index 4e998617f6..19781f8c64 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js @@ -431,7 +431,6 @@ var data = { fishLoaded: true, innerContainer: _this.userData['hifi-home-fishtank'].innerContainer, - } setEntityCustomData(FISHTANK_USERDATA_KEY, _this.entityID, data); _this.userData['hifi-home-fishtank'].fishLoaded = true; @@ -519,7 +518,7 @@ y: properties.position.y, z: properties.position.z }; - + var othersCounted = 0; for (var j = 0; j < fish.length; j++) { @@ -588,8 +587,8 @@ var primePosition = tankXForm.xFormPoint(position); var primeVelocity = tankXForm.xFormVector(velocity); - // Orient in direction of velocity - var rotation = Quat.rotationBetween(Vec3.UNIT_NEG_Z, primeVelocity); + // Orient in direction of velocity + var rotation = Quat.rotationBetween(Vec3.UNIT_NEG_Z, primeVelocity); var mixedRotation = Quat.mix(properties.rotation, rotation, VELOCITY_FOLLOW_RATE); @@ -626,7 +625,7 @@ Entities.editEntity(fish[i], { position: primePosition, velocity: primeVelocity, - rotation: finalQuat + rotation: finalQuat }); } }