From eca75ba66dcd97fcea66cd00da081bc392f015dc Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 25 Jan 2016 14:48:15 -0800 Subject: [PATCH] cleanup --- examples/toybox/bow/bow.js | 2 -- examples/toybox/bow/createBow.js | 8 +++++--- unpublishedScripts/hiddenEntityReset.js | 1 + unpublishedScripts/masterReset.js | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/toybox/bow/bow.js b/examples/toybox/bow/bow.js index 4c887cbb57..0ac571276e 100644 --- a/examples/toybox/bow/bow.js +++ b/examples/toybox/bow/bow.js @@ -117,9 +117,7 @@ this.arrowNotchSound = SoundCache.getSound(NOTCH_ARROW_SOUND_URL); var userData = Entities.getEntityProperties(this.entityID).userData; this.userData = JSON.parse(userData); - print('THIS USERDATA::: ' + userData) this.preNotchString = this.userData.bowKey.preNotchString; - print('PRE NOTCH STRING:::' + this.preNotchString) }, unload: function() { diff --git a/examples/toybox/bow/createBow.js b/examples/toybox/bow/createBow.js index 3fdcecd728..ba4994ab1a 100644 --- a/examples/toybox/bow/createBow.js +++ b/examples/toybox/bow/createBow.js @@ -10,8 +10,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var utilsPath = Script.resolvePath('../../libraries/utils.js') -Script.include(utilsPath) +var utilsPath = Script.resolvePath('../../libraries/utils.js'); +Script.include(utilsPath); var SCRIPT_URL = Script.resolvePath('bow.js'); @@ -80,10 +80,12 @@ function makeBow() { } } }) - } + }; + bow = Entities.addEntity(bowProperties); createPreNotchString(); } + var preNotchString; function createPreNotchString() { diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index 280c22ff88..0ba1c72e72 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -334,6 +334,7 @@ var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27); var MODEL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow-deadly.fbx"; var COLLISION_HULL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow_collision_hull.obj"; + var BOW_DIMENSIONS = { x: 0.04, y: 1.3, diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index a29eb905ca..8ff1333a78 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -318,6 +318,7 @@ MasterReset = function() { var BOW_ROTATION = Quat.fromPitchYawRollDegrees(-103.05, -178.60, -87.27); var MODEL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow-deadly.fbx"; var COLLISION_HULL_URL = "https://hifi-public.s3.amazonaws.com/models/bow/new/bow_collision_hull.obj"; + var BOW_DIMENSIONS = { x: 0.04, y: 1.3, @@ -438,7 +439,7 @@ MasterReset = function() { makeBow(); } - + function createFire() {