Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 23:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

werk

Browse source
This commit is contained in:
James B. Pollack 2016-03-17 15:08:35 -07:00
parent 0789f869da
commit 8f00e9ea27
11 changed files with 488 additions and 486 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
unpublishedScripts/DomainContent/Home/fishTank/tank.js
View file

@ -454,8 +454,8 @@
lowerCorner = bounds.brn;
upperCorner = bounds.tfl;
} else {
print('NO BOUNDS FOR TANK, returning!!')
print('INNER CONTAINER?' + innerContainer)
print('NO BOUNDS FOR TANK, returning!!');
print('INNER CONTAINER?' + innerContainer);
print('INNER PROPS :: ' + JSON.stringify(props));
return;
}

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

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-15T21:26:11Z",
"dimensions": {
@ -8,6 +7,7 @@
"y": 0.3533988893032074,
"z": 0.03479468822479248
},
"dynamic": 1,
"id": "{896373aa-9ed0-4be5-865b-a474448ea67b}",
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-SC-NS.fbx",
"name": "home_model_book1",
@ -29,8 +29,7 @@
"z": -1.52587890625e-05
},
"type": "Model"
},
{
}, {
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z",
"dimensions": {
@ -38,6 +37,7 @@
"y": 0.36685666441917419,
"z": 0.046798638999462128
},
"dynamic": 1,
"id": "{e48fd6a5-ff0f-4ba6-92c7-fd972eba53c6}",
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-RPO-EC.fbx",
"name": "home_model_book_readyplayerone",
@ -60,8 +60,7 @@
},
"shapeType": "box",
"type": "Model"
},
{
}, {
"created": "2016-03-15T21:26:11Z",
"dimensions": {
"x": 0.23445942997932434,
@ -76,6 +75,7 @@
"y": 0.0430908203125,
"z": 0.10480499267578125
},
"dynamic": 1,
"queryAACube": {
"scale": 0.41082730889320374,
"x": -0.17440779507160187,
@ -90,8 +90,7 @@
},
"shapeType": "box",
"type": "Model"
},
{
}, {
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z",
"dimensions": {
@ -107,6 +106,7 @@
"y": 0.005096435546875,
"z": 0.15532684326171875
},
"dynamic": 1,
"queryAACube": {
"scale": 0.33868876099586487,
"x": -0.12784047424793243,
@ -121,8 +121,7 @@
},
"shapeType": "box",
"type": "Model"
},
{
}, {
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z",
"dimensions": {
@ -137,6 +136,7 @@
"y": 0.00262451171875,
"z": 0.20074462890625
},
"dynamic": 1,
"queryAACube": {
"scale": 0.33599227666854858,
"x": -0.11111137270927429,
@ -151,8 +151,7 @@
},
"shapeType": "box",
"type": "Model"
},
{
}, {
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z",
"dimensions": {
@ -168,6 +167,7 @@
"y": 0,
"z": 0.24033355712890625
},
"dynamic": 1,
"queryAACube": {
"scale": 0.33820435404777527,
"x": -0.077183231711387634,
@ -182,8 +182,7 @@
},
"shapeType": "box",
"type": "Model"
},
{
}, {
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-15T21:26:11Z",
"dimensions": {
@ -198,6 +197,7 @@
"y": 0.01153564453125,
"z": 0.26572418212890625
},
"dynamic": 1,
"queryAACube": {
"scale": 0.35705110430717468,
"x": -0.061338052153587341,
@ -211,8 +211,7 @@
"z": -1.52587890625e-05
},
"type": "Model"
},
{
}, {
"collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav",
"created": "2016-03-07T21:07:29Z",
"dimensions": {
@ -227,6 +226,7 @@
"y": 0.00970458984375,
"z": 0.2823486328125
},
"dynamic": 1,
"queryAACube": {
"scale": 0.36993148922920227,
"x": -0.042021408677101135,
@ -240,7 +240,6 @@
"z": -1.52587890625e-05
},
"type": "Model"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/chair.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.obj",
"created": "2016-03-07T21:07:29Z",
"dimensions": {
@ -8,6 +7,7 @@
"y": 1.058124303817749,
"z": 0.7188611626625061
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -6,
@ -30,7 +30,6 @@
"shapeType": "compound",
"type": "Model",
"userData": "{}"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/labLamp.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp.obj",
"created": "2016-03-16T01:00:16Z",
"dimensions": {
@ -15,6 +14,7 @@
"y": 460.89242553710938,
"z": 0
},
"dynamic": 1,
"queryAACube": {
"scale": 1.0153605937957764,
"x": 1102.7779541015625,
@ -30,7 +30,6 @@
"shapeType": "compound",
"type": "Model",
"userData": "{\"grabbableKey\":{\"grabbable\":true,\"wantsTrigger\":true}}"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/leftDeskDrawer.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-1.obj",
"created": "2016-03-15T21:26:11Z",
"dimensions": {
@ -13,6 +12,7 @@
"y": -1,
"z": 0
},
"dynamic": 1,
"id": "{a87cc972-aaf5-48a4-b720-d79ee7bd68d9}",
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-1.fbx",
"queryAACube": {
@ -30,7 +30,6 @@
"shapeType": "compound",
"type": "Model",
"userData": "{}"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/livingRoomLamp.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp.obj",
"created": "2016-03-16T01:04:38Z",
"dimensions": {
@ -15,6 +14,7 @@
"y": 460.98452758789062,
"z": 0
},
"dynamic": 1,
"queryAACube": {
"scale": 1.0153605937957764,
"x": 1104.1934814453125,
@ -30,7 +30,6 @@
"shapeType": "compound",
"type": "Model",
"userData": "{\"grabbableKey\":{\"grabbable\":true,\"wantsTrigger\":true}}"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"created": "2016-03-07T21:07:29Z",
"dimensions": {
"x": 2.0069153308868408,
@ -12,6 +11,7 @@
"y": -2,
"z": 0
},
"dynamic": 1,
"id": "{9745b51e-7816-4de0-85d0-82432a0b8175}",
"queryAACube": {
"scale": 2.0568251609802246,
@ -27,7 +27,6 @@
},
"type": "Box",
"userData": "{}"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/rightDeskDrawer.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-2.obj",
"created": "2016-03-15T21:26:11Z",
"dimensions": {
@ -13,6 +12,7 @@
"y": -1,
"z": 0
},
"dynamic": 1,
"id": "{ae1fa8dd-1167-40c1-8fa7-aeb12ee7b12c}",
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-2.fbx",
"queryAACube": {
@ -30,7 +30,6 @@
"shapeType": "compound",
"type": "Model",
"userData": "{}"
}
],
}],
"Version": 57
}

7
unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"created": "2016-03-15T21:26:11Z",
"dimensions": {
"x": 2.0069153308868408,
@ -12,6 +11,7 @@
"y": -1,
"z": 0
},
"dynamic": 1,
"id": "{ef35ce2a-fddb-44bf-bb1b-30d9fac70563}",
"queryAACube": {
"scale": 2.0568251609802246,
@ -27,7 +27,6 @@
},
"type": "Box",
"userData": "{}"
}
],
}],
"Version": 57
}

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

@ -1,16 +1,16 @@
print('KINETIC INCLUDING WRAPPER')
var BOOKS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/books.json'+ "?"+Math.random();
var UPPER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/upperBookShelf.json'+ "?"+Math.random();
var LOWER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/lowerBookShelf.json'+ "?"+Math.random();
var RIGHT_DESK_DRAWER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/rightDeskDrawer.json'+ "?"+Math.random();
var LEFT_DESK_DRAWER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/leftDeskDrawer.json'+ "?"+Math.random();
var CHAIR_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/chair.json'+ "?"+Math.random();
var DESK_DRAWERS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/deskDrawers.json'+ "?"+Math.random();
var FRUIT_BOWL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/fruit.json'+ "?"+Math.random()
var LAB_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/labLamp.json'+ "?"+Math.random();
var LIVING_ROOM_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/livingRoomLamp.json'+ "?"+Math.random();
var TRASHCAN_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/trashcan.json'+ "?"+Math.random();
var BOOKS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/books.json' + "?" + Math.random();
var UPPER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/upperBookShelf.json' + "?" + Math.random();
var LOWER_BOOKSHELF_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/lowerBookShelf.json' + "?" + Math.random();
var RIGHT_DESK_DRAWER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/rightDeskDrawer.json' + "?" + Math.random();
var LEFT_DESK_DRAWER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/leftDeskDrawer.json' + "?" + Math.random();
var CHAIR_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/chair.json' + "?" + Math.random();
var DESK_DRAWERS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/deskDrawers.json' + "?" + Math.random();
var FRUIT_BOWL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/fruit.json' + "?" + Math.random()
var LAB_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/labLamp.json' + "?" + Math.random();
var LIVING_ROOM_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/livingRoomLamp.json' + "?" + Math.random();
var TRASHCAN_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/trashcan.json' + "?" + Math.random();
FruitBowl = function(spawnLocation, spawnRotation) {
print('CREATE FRUIT BOWL')
@ -26,7 +26,6 @@ FruitBowl = function(spawnLocation, spawnRotation) {
};
function cleanup() {
print('CLEANUP FRUIT')
created.forEach(function(obj) {
Entities.deleteEntity(obj);
})
@ -39,6 +38,10 @@ FruitBowl = function(spawnLocation, spawnRotation) {
}
LabLamp = function(spawnLocation, spawnRotation) {
print('CREATE LAB LAMP')
var created = [];
function create() {
@ -62,6 +65,7 @@ LabLamp = function(spawnLocation, spawnRotation) {
}
LivingRoomLamp = function(spawnLocation, spawnRotation) {
print('CREATE LIVING ROOM LAMP')
var created = [];
function create() {
@ -178,6 +182,7 @@ LeftDeskDrawer = function(spawnLocation, spawnRotation) {
}
Chair = function(spawnLocation, spawnRotation) {
print('CREATE CHAIR')
var created = [];
function create() {
@ -200,6 +205,7 @@ Chair = function(spawnLocation, spawnRotation) {
}
Trashcan = function(spawnLocation, spawnRotation) {
print('CREATE TRASHCAN')
var created = [];
function create() {
@ -223,6 +229,7 @@ Trashcan = function(spawnLocation, spawnRotation) {
}
Books = function(spawnLocation, spawnRotation) {
print('CREATE BOOKS')
var created = [];
function create() {

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

@ -85,8 +85,11 @@
}, 2500);
_this.cleanupDynamicEntities();
_this.cleanupKineticEntities();
Script.setTimeout(function() {
_this.createKineticEntities();
_this.createDynamicEntities();
}, 500)
}
},
@ -163,7 +166,7 @@
dynamicEntities.push(pingPongGun);
dynamicEntities.push(myPlant);
//v2.0
print('DYNAMIC ENTITIES AFTER CREATE:::' + dynamicEntities.length)
// var musicBox = new MusicBox();
// var cuckooClock = new CuckooClock();