after much struggle... what seems to be a working reset. at home IRL

This commit is contained in:
James B. Pollack 2016-04-05 22:38:11 -07:00
parent a9e4707470
commit 416c8752b3
2 changed files with 15 additions and 16 deletions

View file

@ -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')
}

View file

@ -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();
},