Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 05:53:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gravity and cleaning

Browse source
This commit is contained in:
James B. Pollack 2016-03-18 10:55:10 -07:00
parent 5dff9de3a0
commit 9e6cea2f41
3 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
unpublishedScripts/DomainContent/Home/kineticObjects/books.json
View file

@ -1,5 +1,10 @@
{ {
"Entities": [{ "Entities": [{
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-15T21:26:11Z", "created": "2016-03-15T21:26:11Z",
@ -31,6 +36,11 @@
}, },
"type": "Model" "type": "Model"
}, { }, {
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z", "created": "2016-03-07T21:07:29Z",
@ -63,6 +73,11 @@
"shapeType": "box", "shapeType": "box",
"type": "Model" "type": "Model"
}, { }, {
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"created": "2016-03-15T21:26:11Z", "created": "2016-03-15T21:26:11Z",
"dimensions": { "dimensions": {
@ -94,6 +109,11 @@
"shapeType": "box", "shapeType": "box",
"type": "Model" "type": "Model"
}, { }, {
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z", "created": "2016-03-07T21:07:29Z",
@ -126,6 +146,11 @@
"shapeType": "box", "shapeType": "box",
"type": "Model" "type": "Model"
}, { }, {
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z", "created": "2016-03-07T21:07:29Z",
@ -157,6 +182,11 @@
"shapeType": "box", "shapeType": "box",
"type": "Model" "type": "Model"
}, { }, {
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z", "created": "2016-03-07T21:07:29Z",
@ -189,6 +219,11 @@
"shapeType": "box", "shapeType": "box",
"type": "Model" "type": "Model"
}, { }, {
"gravity": {
"x": 0,
"y": -7,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}", "userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-15T21:26:11Z", "created": "2016-03-15T21:26:11Z",

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

@ -39,7 +39,7 @@ FruitBowl = function(spawnLocation, spawnRotation) {
LabLamp = function(spawnLocation, spawnRotation) { LabLamp = function(spawnLocation, spawnRotation) {
print('CREATE LAB LAMP') print('CREATE LAB LAMP')
var created = []; var created = [];

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

@ -33,6 +33,12 @@
var kineticPath = Script.resolvePath("kineticObjects/wrapper.js?" + Math.random()); var kineticPath = Script.resolvePath("kineticObjects/wrapper.js?" + Math.random());
Script.include(kineticPath); 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, { var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0, x: 0,
@ -106,12 +112,6 @@
createDynamicEntities: function() { createDynamicEntities: function() {
Script.include(utilsPath);
// Script.include(fishTankPath);
Script.include(tiltMazePath);
Script.include(whiteboardPath);
Script.include(plantPath);
Script.include(pingPongGunPath);
// var fishTank = new FishTank({ // var fishTank = new FishTank({
// x: 1098.9254, // x: 1098.9254,
@ -236,16 +236,13 @@
return; return;
} }
if (userData.hasOwnProperty('hifiHomeKey')) { if (userData.hasOwnProperty('hifiHomeKey')) {
print('JBP found a home key for an entity')
if (userData.hifiHomeKey.reset === true) { if (userData.hifiHomeKey.reset === true) {
print('JBP deleting a home entity')
Entities.deleteEntity(result); Entities.deleteEntity(result);
} }
} }
}) })
print('JBP after deleting home entities') print('JBP after deleting home entities')
}, },
unload: function() { unload: function() {