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

various asans fixes

Browse source
This commit is contained in:
James B. Pollack 2016-04-01 09:35:19 -07:00
parent 30c8a44411
commit f9026fae66
12 changed files with 1231 additions and 937 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -12,10 +11,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{5371218c-e05b-49da-ac70-81f1f76c55ea}",
"modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx",
"name": "hifi-home-model-block",
@ -39,8 +42,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -52,10 +54,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{ccc1198a-a501-48b8-959a-68297258aea7}",
"modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx",
"name": "hifi-home-model-block",
@ -79,8 +85,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -92,10 +97,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{3aaf5dd5-16d8-4852-880d-8256de68de19}",
"modelURL": "atp:/kineticObjects/blocks/planky_red.fbx",
"name": "hifi-home-model-block",
@ -119,8 +128,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -132,10 +140,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{0474a29f-c45b-4d42-ae95-0c0bd1e6c501}",
"modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx",
"name": "hifi-home-model-block",
@ -159,8 +171,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -172,10 +183,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{53e06851-8346-45ac-bdb5-0a74c99b5bd5}",
"modelURL": "atp:/kineticObjects/blocks/planky_green.fbx",
"name": "hifi-home-model-block",
@ -199,8 +214,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -212,10 +226,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{38bcb70d-e384-4b60-878a-e34d4830f045}",
"modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx",
"name": "hifi-home-model-block",
@ -239,8 +257,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -252,10 +269,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{fa8f8bbc-5bd0-4121-985d-75ce2f68eba1}",
"modelURL": "atp:/kineticObjects/blocks/planky_red.fbx",
"name": "hifi-home-model-block",
@ -279,8 +300,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -292,10 +312,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{d4b8582b-b707-453c-89c6-65e358da5cd7}",
"modelURL": "atp:/kineticObjects/blocks/planky_yellow.fbx",
"name": "hifi-home-model-block",
@ -319,8 +343,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -332,10 +355,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{3b5b53fb-7ee5-44eb-9b81-8de8a525c433}",
"modelURL": "atp:/kineticObjects/blocks/planky_red.fbx",
"name": "hifi-home-model-block",
@ -359,8 +386,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -372,10 +398,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{0d1f27e9-7e74-4263-9428-8c8f7aac94a6}",
"modelURL": "atp:/kineticObjects/blocks/planky_green.fbx",
"name": "hifi-home-model-block",
@ -399,8 +429,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -412,10 +441,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{79ea518f-aac3-45ff-b22d-6d295b3c9e87}",
"modelURL": "atp:/kineticObjects/blocks/planky_green.fbx",
"name": "hifi-home-model-block",
@ -439,8 +472,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -452,10 +484,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{ff470ff9-c889-4893-a25f-80895bff0e9a}",
"modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx",
"name": "hifi-home-model-block",
@ -479,8 +515,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -492,10 +527,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{b5319f85-603d-436b-8bbe-fc9f798ca738}",
"modelURL": "atp:/kineticObjects/blocks/planky_green.fbx",
"name": "hifi-home-model-block",
@ -519,8 +558,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -532,10 +570,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{944a4616-8dac-4d6a-a92b-49fa98514416}",
"modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx",
"name": "hifi-home-model-block",
@ -559,8 +601,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -572,10 +613,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{ea6a1038-7047-4a1e-bdbd-076d6e41508c}",
"modelURL": "atp:/kineticObjects/blocks/planky_blue.fbx",
"name": "hifi-home-model-block",
@ -599,8 +644,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -612,10 +656,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{ff65f5dd-2d53-4127-86da-05156a42946d}",
"modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx",
"name": "hifi-home-model-block",
@ -639,8 +687,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -652,10 +699,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{3a9acd14-f754-4c70-b294-9f622c000785}",
"modelURL": "atp:/kineticObjects/blocks/planky_red.fbx",
"name": "hifi-home-model-block",
@ -679,8 +730,7 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav",
"collisionsWillMove": 1,
"created": "2016-03-23T21:29:36Z",
@ -692,10 +742,14 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2.5,
"y": -10,
"z": 0
},
"velocity": {
"x": 0,
"y": -0.1,
"z": 0
},
"velocity": {"x": 0, "y": -0.1, "z": 0},
"id": "{bb014301-247b-44d0-8b09-b830fea4439e}",
"modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx",
"name": "hifi-home-model-block",
@ -719,7 +773,6 @@
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}
],
}],
"Version": 57
}

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

@ -39,7 +39,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
@ -76,7 +76,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
@ -112,7 +112,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
@ -149,7 +149,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
@ -185,7 +185,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
@ -222,7 +222,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
@ -258,7 +258,7 @@
}, {
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",

2
unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json
View file

@ -12,7 +12,7 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -6,
"y": -10,
"z": 0
},
"id": "{d97c8a4e-9b95-448c-a729-5da9e22b6adc}",

19
unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"collisionless": 1,
"color": {
"blue": 0,
@ -39,8 +38,7 @@
"type": "Box",
"userData": "{\"hifiHomeKey\":{\"reset\":true},\"grabbableKey\":{\"wantsTrigger\":true},\"home-switch\":{\"state\":\"off\"}}",
"visible": 0
},
{
}, {
"color": {
"blue": 68,
"green": 252,
@ -79,8 +77,7 @@
"type": "Light",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"visible": 0
},
{
}, {
"collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.obj",
"created": "2016-03-22T22:55:11Z",
@ -92,7 +89,7 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -2,
"y": -10,
"z": 0
},
"id": "{6c59ca6f-e3f6-42c1-ae4d-1549b5bdaee1}",
@ -119,8 +116,7 @@
"shapeType": "compound",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
},
{
}, {
"angularVelocity": {
"x": 0.0087265009060502052,
"y": 0.005478390958160162,
@ -137,7 +133,7 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -9,
"y": -10,
"z": 0
},
"id": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}",
@ -168,7 +164,6 @@
"y": 0.0016162246465682983,
"z": 0.0042029935866594315
}
}
],
}],
"Version": 57
}

14
unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json
View file

@ -12,7 +12,7 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -7,
"y": -10,
"z": 0
},
"id": "{fa981882-c38f-4413-88f2-255a06aacf08}",
@ -49,7 +49,7 @@
"friction": 0.33000001311302185,
"gravity": {
"x": 0,
"y": -9,
"y": -10,
"z": 0
},
"id": "{ed04b516-3c66-42d9-99af-c4425765df27}",
@ -87,7 +87,7 @@
"friction": 0.33000001311302185,
"gravity": {
"x": 0,
"y": -8,
"y": -10,
"z": 0
},
"id": "{031f883a-6d7f-447a-96b1-c3ea75f938e1}",
@ -125,7 +125,7 @@
"friction": 0.33000001311302185,
"gravity": {
"x": 0,
"y": -9,
"y": -10,
"z": 0
},
"id": "{e3d77c1e-1fcf-4dc2-8799-001046934df8}",
@ -163,7 +163,7 @@
"friction": 0.33000001311302185,
"gravity": {
"x": 0,
"y": -8,
"y": -10,
"z": 0
},
"id": "{34c224cf-d5f5-4cf3-9bf6-55857bf08e43}",
@ -201,7 +201,7 @@
"friction": 0.33000001311302185,
"gravity": {
"x": 0,
"y": -9,
"y": -10,
"z": 0
},
"id": "{0eab5380-2358-4bcd-b53e-a071d50e1475}",
@ -239,7 +239,7 @@
"friction": 0.33000001311302185,
"gravity": {
"x": 0,
"y": -8,
"y": -10,
"z": 0
},
"id": "{c8140643-23fb-4827-b708-e87103f9e438}",

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

@ -8,7 +8,7 @@
},
"gravity": {
"x": 0,
"y": -2,
"y": -10,
"z": 0
},
"dynamic": 1,

226
unpublishedScripts/DomainContent/Home/kineticObjects/stuff_on_shelves.json Normal file
View file

@ -0,0 +1,226 @@
{
"Entities": [{
"collisionsWillMove": 1,
"created": "2016-03-31T23:06:57Z",
"dimensions": {
"x": 0.28182807564735413,
"y": 0.25535506010055542,
"z": 0.14865440130233765
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -10,
"z": 0
},
"id": "{13efcd51-8cae-4052-951d-9ec6f7214f26}",
"modelURL": "atp:/kineticObjects/Zombie_Rabbit.fbx",
"name": "home_model_Zombie_Rabbit.fbx",
"position": {
"x": 0.529541015625,
"y": 0.572784423828125,
"z": 0.6578216552734375
},
"queryAACube": {
"scale": 0.40832754969596863,
"x": 0.32537722587585449,
"y": 0.36862063407897949,
"z": 0.45365786552429199
},
"rotation": {
"w": 0.83144879341125488,
"x": -1.52587890625e-05,
"y": -0.55562674999237061,
"z": -1.52587890625e-05
},
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}, {
"collisionsWillMove": 1,
"created": "2016-03-31T23:06:57Z",
"dimensions": {
"x": 0.34797310829162598,
"y": 0.4468902051448822,
"z": 0.33542871475219727
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -10,
"z": 0
},
"id": "{3b956925-2489-4e80-925b-d503658c007a}",
"modelURL": "atp:/kineticObjects/Robot.fbx",
"name": "home_model_Robot.fbx",
"position": {
"x": 0.3660888671875,
"y": 0.664794921875,
"z": 0.38057708740234375
},
"queryAACube": {
"scale": 0.65826177597045898,
"x": 0.036957979202270508,
"y": 0.33566403388977051,
"z": 0.051446199417114258
},
"rotation": {
"w": 0.86916911602020264,
"x": -0.0001373291015625,
"y": -0.49446862936019897,
"z": -0.0001678466796875
},
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}, {
"collisionsWillMove": 1,
"created": "2016-03-31T22:45:06Z",
"dimensions": {
"x": 0.1394726037979126,
"y": 0.49765011668205261,
"z": 0.13870064914226532
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -10,
"z": 0
},
"id": "{f0a9669c-3a27-4511-a1ea-cec6bd70dc87}",
"modelURL": "atp:/kineticObjects/Fizzy_Pop.fbx",
"name": "home_model_Fizzy_Pop.fbx",
"position": {
"x": 0,
"y": 0.690338134765625,
"z": 0.06630706787109375
},
"queryAACube": {
"scale": 0.53511321544647217,
"x": -0.26755660772323608,
"y": 0.42278152704238892,
"z": -0.20124953985214233
},
"rotation": {
"w": -0.33333331346511841,
"x": -4.57763671875e-05,
"y": 0.94277870655059814,
"z": -1.52587890625e-05
},
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}, {
"collisionsWillMove": 1,
"created": "2016-03-31T23:06:57Z",
"dimensions": {
"x": 0.18462549149990082,
"y": 0.20482274889945984,
"z": 0.22557833790779114
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -10,
"z": 0
},
"id": "{323fac35-f1d3-4b76-837f-b158c2f269aa}",
"modelURL": "atp:/kineticObjects/Zombie_Cat.fbx",
"name": "home_model_Zombie_Cat.fbx",
"position": {
"x": 0.6685791015625,
"y": 0,
"z": 1.0860137939453125
},
"queryAACube": {
"scale": 0.35626468062400818,
"x": 0.49044674634933472,
"y": -0.17813234031200409,
"z": 0.90788143873214722
},
"rotation": {
"w": 0.73727011680603027,
"x": -1.52587890625e-05,
"y": -0.67562371492385864,
"z": -1.52587890625e-05
},
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}, {
"collisionsWillMove": 1,
"created": "2016-03-31T22:47:17Z",
"dimensions": {
"x": 0.42468345165252686,
"y": 0.25432091951370239,
"z": 0.35341560840606689
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -10,
"z": 0
},
"id": "{97b1b14b-f52e-47c5-91e9-53e93a69d232}",
"modelURL": "atp:/kineticObjects/Ninja_House.fbx",
"name": "home_model_Ninja_House.fbx",
"position": {
"x": 0.065185546875,
"y": 0.006011962890625,
"z": 0
},
"queryAACube": {
"scale": 0.60822510719299316,
"x": -0.23892700672149658,
"y": -0.29810059070587158,
"z": -0.30411255359649658
},
"rotation": {
"w": 0.9695124626159668,
"x": -0.0001373291015625,
"y": 0.24492251873016357,
"z": -1.52587890625e-05
},
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}, {
"collisionsWillMove": 1,
"created": "2016-03-31T22:49:28Z",
"dimensions": {
"x": 0.36405211687088013,
"y": 0.32572725415229797,
"z": 0.36405211687088013
},
"dynamic": 1,
"gravity": {
"x": 0,
"y": -10,
"z": 0
},
"id": "{f053e31e-f446-494a-85ee-6bb76608b41b}",
"modelURL": "atp:/kineticObjects/PropagandaOrnament.fbx",
"name": "home_model_PropagandaOrnament.fbx",
"position": {
"x": 0.5653076171875,
"y": 0.0426025390625,
"z": 0.74505615234375
},
"queryAACube": {
"scale": 0.6092340350151062,
"x": 0.2606905996799469,
"y": -0.2620144784450531,
"z": 0.4404391348361969
},
"rotation": {
"w": 0.89004349708557129,
"x": -0.0001678466796875,
"y": -0.45589381456375122,
"z": -1.52587890625e-05
},
"shapeType": "box",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}],
"Version": 57
}

8
unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json
View file

@ -1,6 +1,5 @@
{
"Entities": [
{
"Entities": [{
"collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj",
"created": "2016-03-15T23:06:41Z",
@ -13,7 +12,7 @@
"dynamic": 1,
"gravity": {
"x": 0,
"y": -5,
"y": -10,
"z": 0
},
"id": "{e9693784-4264-4dd5-baa7-fd165b2645c8}",
@ -33,7 +32,6 @@
"shapeType": "compound",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}
],
}],
"Version": 57
}

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

@ -8,7 +8,7 @@
},
"gravity": {
"x": 0,
"y": -1,
"y": -10,
"z": 0
},
"dynamic": 1,

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

@ -15,6 +15,8 @@ var BLOCKS_URL = "atp:/kineticObjects/blocks.json";
var PLAYA_POSTER_URL = "atp:/kineticObjects/postersPlaya.json"
var CELL_POSTER_URL = "atp:/kineticObjects/postersCell.json"
var STUFF_ON_SHELVES_URL ="atp:/kineticObjects/stuff_on_shelves.json"
FruitBowl = function(spawnLocation, spawnRotation) {
print('CREATE FRUIT BOWL')
var created = [];
@ -271,3 +273,26 @@ PosterPlaya = function(spawnLocation, spawnRotation) {
this.cleanup = cleanup;
}
StuffOnShelves = function(spawnLocation, spawnRotation) {
print('CREATE STUFF ON SHELVES')
var created = [];
function create() {
var success = Clipboard.importEntities(STUFF_ON_SHELVES_URL);
if (success === true) {
created = Clipboard.pasteEntities(spawnLocation)
print('created ' + created);
}
};
function cleanup() {
created.forEach(function(obj) {
Entities.deleteEntity(obj);
})
};
create();
this.cleanup = cleanup;
}

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

@ -13,7 +13,6 @@ Script.include("../utils.js");
var scriptURL = Script.resolvePath('pingPongGun.js');
var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx'
var COLLISION_HULL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.obj';
var COLLISION_SOUND_URL = 'atp:/pingPongGun/plastic_impact.L.wav';
HomePingPongGun = function(spawnPosition, spawnRotation) {
var pingPongGun = Entities.addEntity({
@ -35,7 +34,6 @@ HomePingPongGun = function(spawnPosition, spawnRotation) {
},
rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
dynamic: true,
collisionSoundURL: COLLISION_SOUND_URL,
userData: JSON.stringify({
grabbableKey: {
invertSolidWhileHeld: true

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

@ -30,9 +30,6 @@
var plantPath = Script.resolvePath("atp:/growingPlant/wrapper.js");
//EBL REMOVE ME
var myPlant;
var cuckooClockPath = Script.resolvePath("atp:/cuckooClock/wrapper.js");
var pingPongGunPath = Script.resolvePath("atp:/pingPongGun/wrapper.js");
@ -169,7 +166,7 @@
z: 0
});
myPlant = new Plant({
var myPlant = new Plant({
x: 1099.8785,
y: 460.3115,
z: -84.7736
@ -188,6 +185,7 @@
y: 179.0293,
z: 89.9698
});
var cuckooClock = new MyCuckooClock({
x: 1105.267,
y: 461.44,
@ -237,18 +235,19 @@
z: -80.2837
});
var chair = new Chair({
var deskChair = new Chair({
x: 1105.2716,
y: 459.7251,
z: -79.8097
});
// var comfyChair = new BlueChair({
// var blueChair = new BlueChair({
// x: 1100.4821,
// y: 459.8161,
// z:-75.9071
// });
// var stuffOnShelf = new stuffOnShelf({});
var trashcan = new Trashcan({
x: 1103.9034,