From 3432e7821f78b051ac42534e306c24326fa64f0a Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 17 Mar 2016 10:08:44 -0700 Subject: [PATCH] resets --- unpublishedScripts/DomainContent/Home/fishTank/wrapper.js | 2 +- .../Home/growingPlant/growingPlantEntityScript.js | 4 ++-- unpublishedScripts/DomainContent/Home/reset.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 6663fea972..d60989a95a 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -121,7 +121,7 @@ FishTank = function(spawnPosition, spawnRotation) { } if (spawnRotation !== undefined) { - tankProperties.rotation = spawnRotation + tankProperties.rotation = Quat.fromPitchYawRollDegrees(spawnRotation.x,spawnRotation.y,spawnRotation.z) } fishTank = Entities.addEntity(tankProperties); diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js index 4a7eca1cab..2201b1a9bc 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js @@ -9,11 +9,11 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -Script.include('utils.js'); + (function() { - +Script.include('utils.js'); var _this; function GrowingPlant() { diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index f6cf4a607c..63715e5af2 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -189,7 +189,7 @@ var fruitBowl = new FruitBowl({ x: 1105.3185, y: 460.3221, - z: -81.0752 + z: -81.2452 }); var livingRoomLamp = new LivingRoomLamp({ @@ -236,7 +236,7 @@ var books = new Books({ x: 1106.1553, - y: 461.0325, + y: 461.0825, z: -80.4890 });