diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json index 7a1e8336b2..7b3cd1d986 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json @@ -1,5 +1,10 @@ { "Entities": [{ + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "created": "2016-03-15T21:26:11Z", @@ -31,6 +36,11 @@ }, "type": "Model" }, { + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", @@ -63,6 +73,11 @@ "shapeType": "box", "type": "Model" }, { + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "created": "2016-03-15T21:26:11Z", "dimensions": { @@ -94,6 +109,11 @@ "shapeType": "box", "type": "Model" }, { + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", @@ -126,6 +146,11 @@ "shapeType": "box", "type": "Model" }, { + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", @@ -157,6 +182,11 @@ "shapeType": "box", "type": "Model" }, { + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "created": "2016-03-07T21:07:29Z", @@ -189,6 +219,11 @@ "shapeType": "box", "type": "Model" }, { + "gravity": { + "x": 0, + "y": -7, + "z": 0 + }, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "created": "2016-03-15T21:26:11Z", diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index b35195c5ce..0ea61f76d4 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -39,7 +39,7 @@ FruitBowl = function(spawnLocation, spawnRotation) { LabLamp = function(spawnLocation, spawnRotation) { - print('CREATE LAB LAMP') + print('CREATE LAB LAMP') var created = []; diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 44188c205b..5be2564e5d 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -33,6 +33,12 @@ var kineticPath = Script.resolvePath("kineticObjects/wrapper.js?" + Math.random()); Script.include(kineticPath); + Script.include(utilsPath); + // Script.include(fishTankPath); + Script.include(tiltMazePath); + Script.include(whiteboardPath); + Script.include(plantPath); + Script.include(pingPongGunPath); var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, @@ -106,12 +112,6 @@ createDynamicEntities: function() { - Script.include(utilsPath); - // Script.include(fishTankPath); - Script.include(tiltMazePath); - Script.include(whiteboardPath); - Script.include(plantPath); - Script.include(pingPongGunPath); // var fishTank = new FishTank({ // x: 1098.9254, @@ -236,16 +236,13 @@ return; } if (userData.hasOwnProperty('hifiHomeKey')) { - print('JBP found a home key for an entity') if (userData.hifiHomeKey.reset === true) { - print('JBP deleting a home entity') Entities.deleteEntity(result); } } }) - print('JBP after deleting home entities') }, unload: function() {