From 416c8752b334bbe432b259b1868b14d124931831 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Tue, 5 Apr 2016 22:38:11 -0700 Subject: [PATCH] after much struggle... what seems to be a working reset. at home IRL --- .../DomainContent/Home/pingPongGun/wrapper.js | 10 ++++----- .../DomainContent/Home/reset.js | 21 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js index cf9a12b734..af481db678 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js @@ -10,14 +10,14 @@ // Script.include("../utils.js"); -var scriptURL = Script.resolvePath('pingPongGun.js'); -var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx' +var scriptURL = 'atp:/pingPongGun/pingPingGun.js'; +var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx'; var COLLISION_HULL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.obj'; HomePingPongGun = function(spawnPosition, spawnRotation) { var pingPongGun = Entities.addEntity({ type: "Model", - name: "home_model_pingPongGun" + name: "home_model_pingPongGun", modelURL: MODEL_URL, shapeType: 'compound', compoundShapeURL: COLLISION_HULL_URL, @@ -70,12 +70,12 @@ HomePingPongGun = function(spawnPosition, spawnRotation) { }); function cleanup() { - print('PING PONG CLEANUP!') + print('HOME PING PONG CLEANUP!') Entities.deleteEntity(pingPongGun); } this.cleanup = cleanup; - print('CREATED PING PONG GUN') + print('HOME CREATED PING PONG GUN') } \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 0c4d438ef6..3f77b90cf9 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -176,15 +176,15 @@ z: 0 }); - // var pingPongGun = new HomePingPongGun({ - // x: 1101.2123, - // y: 460.2328, - // z: -65.8513 - // }, { - // x: 97.3683, - // y: 179.0293, - // z: 89.9698 - // }); + var pingPongGun = new HomePingPongGun({ + x: 1101.2123, + y: 460.2328, + z: -65.8513 + }, { + x: 97.3683, + y: 179.0293, + z: 89.9698 + }); var cuckooClock = new MyCuckooClock({ x: 1105.267, @@ -196,9 +196,8 @@ z: 0 }); - // v2.0 // var musicBox = new MusicBox(); - // var doppelganger = new Doppelganger(); + },