This commit is contained in:
James B. Pollack 2016-03-17 11:10:28 -07:00
parent 78775baf8c
commit 5dbec15ae0
6 changed files with 13 additions and 5 deletions

View file

@ -455,5 +455,5 @@ FishTank = function(spawnPosition, spawnRotation) {
}
this.cleanup = cleanup;
print('CREATED FISH!');
}

View file

@ -58,7 +58,6 @@ Plant = function(spawnPosition, spawnRotation) {
parentID: bowl
});
print('CREATED PLANT:: '+ plant)
var WATER_CAN_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/waterCan.fbx?v1" + Math.random();
@ -144,4 +143,7 @@ Plant = function(spawnPosition, spawnRotation) {
this.cleanup = cleanup;
print('CREATED PLANT:: '+ plant)
}

View file

@ -68,4 +68,7 @@ _PingPongGun = function(spawnPosition, spawnRotation) {
}
this.cleanup = cleanup;
print('CREATED PING PONG GUN')
}

View file

@ -159,9 +159,9 @@
dynamicEntities.push(fishTank);
dynamicEntities.push(tiltMaze);
dynamicEntities.push(whiteboard);
dynamicEntities.push(myPlant);
dynamicEntities.push(pingPongGun);
dynamicEntities.push(pingPongGun);
dynamicEntities.push(myPlant);
//v2.0
// var musicBox = new MusicBox();

View file

@ -281,5 +281,6 @@ TiltMaze = function(spawnPosition, spawnRotation) {
}
this.cleanup = cleanup;
print('CREATED TILTMAZE')
}

View file

@ -38,7 +38,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
},
});
print('whiteboard:' + whiteboard)
var whiteboardSurfacePosition = Vec3.sum(whiteboardPosition, {
x: 0.0,
@ -242,4 +242,6 @@ Whiteboard = function(spawnPosition, spawnRotation) {
}
this.cleanup = cleanup;
print('CREATED WHITEBOARD')
}