From b06fd3876ba24f527ab06de49f20cc3d84a95b3c Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 9 Oct 2015 10:33:47 -0700 Subject: [PATCH] Update masterReset.js The basketball rack should not be grabbable; this got changed in the last commit. Also we're removing the back gate. --- unpublishedScripts/masterReset.js | 49 ++++--------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index 908cee66bf..9db3bfb605 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -245,7 +245,7 @@ MasterReset = function() { resetMe: true }, grabbableKey: { - grabbable: true + grabbable: false } }) @@ -844,47 +844,8 @@ MasterReset = function() { function createGates() { var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx'; - var rotation1 = Quat.fromPitchYawRollDegrees(0, 36, 0); - - var gate1 = Entities.addEntity({ - name: 'Back Door Gate', - type: 'Model', - shapeType: 'box', - modelURL: MODEL_URL, - position: { - x: 546.52, - y: 494.76, - z: 498.87 - }, - dimensions: { - x: 1.42, - y: 1.13, - z: 0.25 - }, - rotation: rotation1, - collisionsWillMove: true, - gravity: { - x: 0, - y: -50, - z: 0 - }, - linearDamping: 1, - angularDamping: 10, - mass: 10, - userData: JSON.stringify({ - resetMe: { - resetMe: true, - }, - grabbableKey: { - grabbable: false - } - }) - - }); - - - var rotation2 = Quat.fromPitchYawRollDegrees(0, -16, 0); - var gate2 = Entities.addEntity({ + var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0); + var gate = Entities.addEntity({ name: 'Front Door Fence', type: 'Model', modelURL: MODEL_URL, @@ -899,7 +860,7 @@ MasterReset = function() { y: 1.13, z: 0.2 }, - rotation: rotation2, + rotation: rotation, collisionsWillMove: true, gravity: { x: 0, @@ -1315,4 +1276,4 @@ MasterReset = function() { Script.scriptEnding.connect(cleanup); } -}; \ No newline at end of file +};