diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index f460ddf88f..4fd17a1c6f 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -21,4 +21,4 @@ Script.load("system/controllers/handControllerPointer.js"); Script.load("system/controllers/squeezeHands.js"); Script.load("system/controllers/grab.js"); Script.load("system/dialTone.js"); -Script.load("system/attachedEntitiesManager.js"); \ No newline at end of file +// Script.load("system/attachedEntitiesManager.js"); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index 0dee32d05c..d4512823db 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -279,32 +279,8 @@ StuffOnShelves = function(spawnLocation, spawnRotation) { HomeJunk = function(spawnLocation, spawnRotation) { print('HOME CREATE JUNK'); var created = []; - - function create() { - var success = Clipboard.importEntities(JUNK_URL); - if (success === true) { - created = Clipboard.pasteEntities(spawnLocation) - print('created ' + created); - } - }; - - function cleanup() { - created.forEach(function(obj) { - Entities.deleteEntity(obj); - }) - }; - - create(); - - this.cleanup = cleanup; -} - -Bricabrac = function(spawnLocation, spawnRotation) { - print('HOME CREATE BRICABRAC'); - var created = []; - function addVelocityDown() { - print('HOME ADDING DOWN VELOCITY TO DRESSING ROOM ITEMS') + print('HOME ADDING DOWN VELOCITY TO SHELF ITEMS') created.forEach(function(obj) { Entities.editEntity(obj, { velocity: { @@ -315,14 +291,12 @@ Bricabrac = function(spawnLocation, spawnRotation) { }); }) } - function create() { - var success = Clipboard.importEntities(BRICABRAC_URL); + var success = Clipboard.importEntities(JUNK_URL); if (success === true) { created = Clipboard.pasteEntities(spawnLocation) print('created ' + created); addVelocityDown(); - } }; @@ -337,6 +311,44 @@ Bricabrac = function(spawnLocation, spawnRotation) { this.cleanup = cleanup; } +// Bricabrac = function(spawnLocation, spawnRotation) { +// print('HOME CREATE BRICABRAC'); +// var created = []; + +// function addVelocityDown() { +// print('HOME ADDING DOWN VELOCITY TO DRESSING ROOM ITEMS') +// created.forEach(function(obj) { +// Entities.editEntity(obj, { +// velocity: { +// x: 0, +// y: -0.1, +// z: 0 +// } +// }); +// }) +// } + +// function create() { +// var success = Clipboard.importEntities(BRICABRAC_URL); +// if (success === true) { +// created = Clipboard.pasteEntities(spawnLocation) +// print('created ' + created); +// addVelocityDown(); + +// } +// }; + +// function cleanup() { +// created.forEach(function(obj) { +// Entities.deleteEntity(obj); +// }) +// }; + +// create(); + +// this.cleanup = cleanup; +// } + Bench = function(spawnLocation, spawnRotation) { print('HOME CREATE BENCH'); var created = []; diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 65ec95cdac..7e69e1782b 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -422,11 +422,11 @@ z: -73.3 }); - var dressingRoomBricabrac = new Bricabrac({ - x: 1106.8, - y: 460.3909, - z: -72.6 - }); + // var dressingRoomBricabrac = new Bricabrac({ + // x: 1106.8, + // y: 460.3909, + // z: -72.6 + // }); var bench = new Bench({ x: 1100.1210,