Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-06 21:03:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove bricabrac from dressing room shelves for now

Browse source
This commit is contained in:
James B. Pollack 2016-06-07 14:37:19 -07:00
parent 9f4289ae1b
commit 6573b3c71e
3 changed files with 46 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/defaultScripts.js
View file

@ -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");
// Script.load("system/attachedEntitiesManager.js");

68
unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
View file

@ -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 = [];

10
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -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,