From f9026fae66e2b8ba94c2ad0f5b0e2cd20d87bc32 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 1 Apr 2016 09:35:19 -0700 Subject: [PATCH] various asans fixes --- .../Home/kineticObjects/blocks.json | 1465 +++++++++-------- .../Home/kineticObjects/books.json | 14 +- .../Home/kineticObjects/deskChair.json | 2 +- .../Home/kineticObjects/deskLamp.json | 331 ++-- .../Home/kineticObjects/fruit.json | 14 +- .../Home/kineticObjects/lowerBookShelf.json | 2 +- .../Home/kineticObjects/stuff_on_shelves.json | 226 +++ .../Home/kineticObjects/trashcan.json | 72 +- .../Home/kineticObjects/upperBookShelf.json | 2 +- .../Home/kineticObjects/wrapper.js | 25 + .../DomainContent/Home/pingPongGun/wrapper.js | 2 - .../DomainContent/Home/reset.js | 13 +- 12 files changed, 1231 insertions(+), 937 deletions(-) create mode 100644 unpublishedScripts/DomainContent/Home/kineticObjects/stuff_on_shelves.json diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json b/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json index e616d7efc6..b7854ce5cb 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/blocks.json @@ -1,725 +1,778 @@ { - "Entities": [ - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.69732666015625, - "y": 0.1600341796875, - "z": 0.28265380859375 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": 0.6540253758430481, - "y": 0.11673291027545929, - "z": 0.23935253918170929 - }, - "rotation": { - "w": 0.996917724609375, - "x": -0.0001678466796875, - "y": 0.078294038772583008, - "z": -0.0003204345703125 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "Entities": [{ + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.47344970703125, - "y": 0.06005859375, - "z": 0.30706787109375 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": 0.4301484227180481, - "y": 0.01675732433795929, - "z": 0.2637665867805481 - }, - "rotation": { - "w": 0.70644688606262207, - "x": 0.70638585090637207, - "y": -0.030960559844970703, - "z": 0.031174182891845703 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.2613525390625, - "y": 0.01007080078125, - "z": 0.359466552734375 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.12442189455032349, - "y": -0.12685984373092651, - "z": 0.22253590822219849 - }, - "rotation": { - "w": -4.57763671875e-05, - "x": 0.35637450218200684, - "y": -4.57763671875e-05, - "z": 0.93432521820068359 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "velocity": { + "x": 0, + "y": -0.1, + "z": 0 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.029999999329447746, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.30487060546875, - "y": 0.01007080078125, - "z": 0.188262939453125 - }, - "queryAACube": { - "scale": 0.25670996308326721, - "x": 0.17651562392711639, - "y": -0.11828418076038361, - "z": 0.059907957911491394 - }, - "rotation": { - "w": 0.99496448040008545, - "x": 1.52587890625e-05, - "y": 0.10020601749420166, - "z": 0.0002288818359375 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "id": "{5371218c-e05b-49da-ac70-81f1f76c55ea}", + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "hifi-home-model-block", + "position": { + "x": 0.69732666015625, + "y": 0.1600341796875, + "z": 0.28265380859375 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.40277099609375, - "y": 0.035064697265625, - "z": 0.254364013671875 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.25915694236755371, - "y": -0.10854937136173248, - "z": 0.11074994504451752 - }, - "rotation": { - "w": 0.70650792121887207, - "x": -0.031143665313720703, - "y": -0.031143665313720703, - "z": 0.70632481575012207 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.6540253758430481, + "y": 0.11673291027545929, + "z": 0.23935253918170929 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.029999999329447746, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.54962158203125, - "y": 0.010040283203125, - "z": 0.294647216796875 - }, - "queryAACube": { - "scale": 0.25670996308326721, - "x": 0.42126661539077759, - "y": -0.11831469833850861, - "z": 0.16629223525524139 - }, - "rotation": { - "w": 0.999969482421875, - "x": -7.62939453125e-05, - "y": -0.0037384629249572754, - "z": 0.0001068115234375 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "rotation": { + "w": 0.996917724609375, + "x": -0.0001678466796875, + "y": 0.078294038772583008, + "z": -0.0003204345703125 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.52001953125, - "y": 0.01007080078125, - "z": 0 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.38308888673782349, - "y": -0.12685984373092651, - "z": -0.13693064451217651 - }, - "rotation": { - "w": 0.9861142635345459, - "x": -7.62939453125e-05, - "y": -0.16603344678878784, - "z": -7.62939453125e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.029999999329447746, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.66876220703125, - "y": 0, - "z": 0.012939453125 - }, - "queryAACube": { - "scale": 0.25670996308326721, - "x": 0.54040724039077759, - "y": -0.12835498154163361, - "z": -0.11541552841663361 - }, - "rotation": { - "w": 0.70589756965637207, - "x": 0.036270737648010254, - "y": -0.036331713199615479, - "z": -0.70647746324539185 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.83819580078125, - "y": 0.135040283203125, - "z": 0.261627197265625 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.70126515626907349, - "y": -0.0018903613090515137, - "z": 0.12469655275344849 - }, - "rotation": { - "w": 0.69332420825958252, - "x": 0.13832306861877441, - "y": -0.13841456174850464, - "z": -0.69353783130645752 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "velocity": { + "x": 0, + "y": -0.1, + "z": 0 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.61773681640625, - "y": 0.0350341796875, - "z": 0.265533447265625 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.47412276268005371, - "y": -0.10857988893985748, - "z": 0.12191937863826752 - }, - "rotation": { - "w": 0.9998779296875, - "x": -4.57763671875e-05, - "y": -0.014206171035766602, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "id": "{ccc1198a-a501-48b8-959a-68297258aea7}", + "modelURL": "atp:/kineticObjects/blocks/planky_natural.fbx", + "name": "hifi-home-model-block", + "position": { + "x": 0.47344970703125, + "y": 0.06005859375, + "z": 0.30706787109375 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.7188720703125, - "y": 0.08502197265625, - "z": 0.26397705078125 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.57525801658630371, - "y": -0.058592095971107483, - "z": 0.12036298215389252 - }, - "rotation": { - "w": 0.99993896484375, - "x": -4.57763671875e-05, - "y": -0.0099946856498718262, - "z": -0.0001068115234375 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.4301484227180481, + "y": 0.01675732433795929, + "z": 0.2637665867805481 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.74981689453125, - "y": 0.010040283203125, - "z": 0.258575439453125 - }, - "queryAACube": { - "scale": 0.25980761647224426, - "x": 0.61991310119628906, - "y": -0.11986352503299713, - "z": 0.12867163121700287 - }, - "rotation": { - "w": 0.99993896484375, - "x": -4.57763671875e-05, - "y": -0.010666072368621826, - "z": -0.0003814697265625 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "rotation": { + "w": 0.70644688606262207, + "x": 0.70638585090637207, + "y": -0.030960559844970703, + "z": 0.031174182891845703 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.10000000149011612, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.8824462890625, - "y": 0.0350341796875, - "z": 0.281097412109375 - }, - "queryAACube": { - "scale": 0.28722813725471497, - "x": 0.73883223533630371, - "y": -0.10857988893985748, - "z": 0.13748334348201752 - }, - "rotation": { - "w": 0.999847412109375, - "x": -4.57763671875e-05, - "y": -0.016922235488891602, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.963623046875, - "y": 0.010009765625, - "z": 0.25885009765625 - }, - "queryAACube": { - "scale": 0.25980761647224426, - "x": 0.83371925354003906, - "y": -0.11989404261112213, - "z": 0.12894628942012787 - }, - "rotation": { - "w": 0.999847412109375, - "x": -4.57763671875e-05, - "y": -0.017379999160766602, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.49188232421875, - "y": 0.010040283203125, - "z": 0.27752685546875 - }, - "queryAACube": { - "scale": 0.25980761647224426, - "x": 0.36197853088378906, - "y": -0.11986352503299713, - "z": 0.14762304723262787 - }, - "rotation": { - "w": 0.99798583984375, - "x": -4.57763671875e-05, - "y": -0.063248634338378906, - "z": 4.57763671875e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "velocity": { + "x": 0, + "y": -0.1, + "z": 0 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0, - "y": 0.010101318359375, - "z": 0.353302001953125 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": -0.04330126941204071, - "y": -0.03319995105266571, - "z": 0.3100007176399231 - }, - "rotation": { - "w": 0.55049967765808105, - "x": 0.44353401660919189, - "y": -0.44359505176544189, - "z": -0.55083543062210083 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "id": "{3aaf5dd5-16d8-4852-880d-8256de68de19}", + "modelURL": "atp:/kineticObjects/blocks/planky_red.fbx", + "name": "hifi-home-model-block", + "position": { + "x": 0.2613525390625, + "y": 0.01007080078125, + "z": 0.359466552734375 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.10000000149011612, - "y": 0.05000000074505806, - "z": 0.25 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.88006591796875, - "y": 0.010040283203125, - "z": 0.05718994140625 - }, - "queryAACube": { - "scale": 0.27386128902435303, - "x": 0.74313527345657349, - "y": -0.12689036130905151, - "z": -0.079740703105926514 - }, - "rotation": { - "w": 0.86965739727020264, - "x": -4.57763671875e-05, - "y": -0.4936751127243042, - "z": -4.57763671875e-05 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "queryAACube": { + "scale": 0.27386128902435303, + "x": 0.12442189455032349, + "y": -0.12685984373092651, + "z": 0.22253590822219849 }, - { - "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", - "collisionsWillMove": 1, - "created": "2016-03-23T21:29:36Z", - "dimensions": { - "x": 0.05000000074505806, - "y": 0.05000000074505806, - "z": 0.05000000074505806 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2.5, - "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", - "position": { - "x": 0.80487060546875, - "y": 0.010040283203125, - "z": 0.19500732421875 - }, - "queryAACube": { - "scale": 0.086602538824081421, - "x": 0.7615693211555481, - "y": -0.03326098620891571, - "z": 0.15170605480670929 - }, - "rotation": { - "w": 0.70440220832824707, - "x": 0.060776710510253906, - "y": -0.060868263244628906, - "z": -0.70455479621887207 - }, - "shapeType": "box", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - } - ], + "rotation": { + "w": -4.57763671875e-05, + "x": 0.35637450218200684, + "y": -4.57763671875e-05, + "z": 0.93432521820068359 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.30487060546875, + "y": 0.01007080078125, + "z": 0.188262939453125 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": 0.17651562392711639, + "y": -0.11828418076038361, + "z": 0.059907957911491394 + }, + "rotation": { + "w": 0.99496448040008545, + "x": 1.52587890625e-05, + "y": 0.10020601749420166, + "z": 0.0002288818359375 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.40277099609375, + "y": 0.035064697265625, + "z": 0.254364013671875 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": 0.25915694236755371, + "y": -0.10854937136173248, + "z": 0.11074994504451752 + }, + "rotation": { + "w": 0.70650792121887207, + "x": -0.031143665313720703, + "y": -0.031143665313720703, + "z": 0.70632481575012207 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.54962158203125, + "y": 0.010040283203125, + "z": 0.294647216796875 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": 0.42126661539077759, + "y": -0.11831469833850861, + "z": 0.16629223525524139 + }, + "rotation": { + "w": 0.999969482421875, + "x": -7.62939453125e-05, + "y": -0.0037384629249572754, + "z": 0.0001068115234375 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.52001953125, + "y": 0.01007080078125, + "z": 0 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": 0.38308888673782349, + "y": -0.12685984373092651, + "z": -0.13693064451217651 + }, + "rotation": { + "w": 0.9861142635345459, + "x": -7.62939453125e-05, + "y": -0.16603344678878784, + "z": -7.62939453125e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.029999999329447746, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.66876220703125, + "y": 0, + "z": 0.012939453125 + }, + "queryAACube": { + "scale": 0.25670996308326721, + "x": 0.54040724039077759, + "y": -0.12835498154163361, + "z": -0.11541552841663361 + }, + "rotation": { + "w": 0.70589756965637207, + "x": 0.036270737648010254, + "y": -0.036331713199615479, + "z": -0.70647746324539185 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.83819580078125, + "y": 0.135040283203125, + "z": 0.261627197265625 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": 0.70126515626907349, + "y": -0.0018903613090515137, + "z": 0.12469655275344849 + }, + "rotation": { + "w": 0.69332420825958252, + "x": 0.13832306861877441, + "y": -0.13841456174850464, + "z": -0.69353783130645752 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.61773681640625, + "y": 0.0350341796875, + "z": 0.265533447265625 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": 0.47412276268005371, + "y": -0.10857988893985748, + "z": 0.12191937863826752 + }, + "rotation": { + "w": 0.9998779296875, + "x": -4.57763671875e-05, + "y": -0.014206171035766602, + "z": 1.52587890625e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.7188720703125, + "y": 0.08502197265625, + "z": 0.26397705078125 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": 0.57525801658630371, + "y": -0.058592095971107483, + "z": 0.12036298215389252 + }, + "rotation": { + "w": 0.99993896484375, + "x": -4.57763671875e-05, + "y": -0.0099946856498718262, + "z": -0.0001068115234375 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.74981689453125, + "y": 0.010040283203125, + "z": 0.258575439453125 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": 0.61991310119628906, + "y": -0.11986352503299713, + "z": 0.12867163121700287 + }, + "rotation": { + "w": 0.99993896484375, + "x": -4.57763671875e-05, + "y": -0.010666072368621826, + "z": -0.0003814697265625 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.10000000149011612, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.8824462890625, + "y": 0.0350341796875, + "z": 0.281097412109375 + }, + "queryAACube": { + "scale": 0.28722813725471497, + "x": 0.73883223533630371, + "y": -0.10857988893985748, + "z": 0.13748334348201752 + }, + "rotation": { + "w": 0.999847412109375, + "x": -4.57763671875e-05, + "y": -0.016922235488891602, + "z": 1.52587890625e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.963623046875, + "y": 0.010009765625, + "z": 0.25885009765625 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": 0.83371925354003906, + "y": -0.11989404261112213, + "z": 0.12894628942012787 + }, + "rotation": { + "w": 0.999847412109375, + "x": -4.57763671875e-05, + "y": -0.017379999160766602, + "z": 1.52587890625e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.49188232421875, + "y": 0.010040283203125, + "z": 0.27752685546875 + }, + "queryAACube": { + "scale": 0.25980761647224426, + "x": 0.36197853088378906, + "y": -0.11986352503299713, + "z": 0.14762304723262787 + }, + "rotation": { + "w": 0.99798583984375, + "x": -4.57763671875e-05, + "y": -0.063248634338378906, + "z": 4.57763671875e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0, + "y": 0.010101318359375, + "z": 0.353302001953125 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": -0.04330126941204071, + "y": -0.03319995105266571, + "z": 0.3100007176399231 + }, + "rotation": { + "w": 0.55049967765808105, + "x": 0.44353401660919189, + "y": -0.44359505176544189, + "z": -0.55083543062210083 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.10000000149011612, + "y": 0.05000000074505806, + "z": 0.25 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.88006591796875, + "y": 0.010040283203125, + "z": 0.05718994140625 + }, + "queryAACube": { + "scale": 0.27386128902435303, + "x": 0.74313527345657349, + "y": -0.12689036130905151, + "z": -0.079740703105926514 + }, + "rotation": { + "w": 0.86965739727020264, + "x": -4.57763671875e-05, + "y": -0.4936751127243042, + "z": -4.57763671875e-05 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "collisionSoundURL": "atp:/kineticObjects/blocks/ToyWoodBlock.L.wav", + "collisionsWillMove": 1, + "created": "2016-03-23T21:29:36Z", + "dimensions": { + "x": 0.05000000074505806, + "y": 0.05000000074505806, + "z": 0.05000000074505806 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "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", + "position": { + "x": 0.80487060546875, + "y": 0.010040283203125, + "z": 0.19500732421875 + }, + "queryAACube": { + "scale": 0.086602538824081421, + "x": 0.7615693211555481, + "y": -0.03326098620891571, + "z": 0.15170605480670929 + }, + "rotation": { + "w": 0.70440220832824707, + "x": 0.060776710510253906, + "y": -0.060868263244628906, + "z": -0.70455479621887207 + }, + "shapeType": "box", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json index d6ab52701d..ced3901eb1 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json @@ -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}}", diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json index 5b4b4a22c2..6ec1c2e7fc 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/deskChair.json @@ -12,7 +12,7 @@ "dynamic": 1, "gravity": { "x": 0, - "y": -6, + "y": -10, "z": 0 }, "id": "{d97c8a4e-9b95-448c-a729-5da9e22b6adc}", diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json index dfc03840f5..625e6d071e 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json @@ -1,174 +1,169 @@ { - "Entities": [ - { - "collisionless": 1, - "color": { - "blue": 0, - "green": 0, - "red": 255 - }, - "created": "2016-03-24T22:17:16Z", - "dimensions": { - "x": 0.2776367485523224, - "y": 0.27723021268844604, - "z": 0.2535492241382599 - }, - "id": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}", - "ignoreForCollisions": 1, - "name": "hifi-home-living-room-desk-lamp-trigger", - "parentID": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}", - "position": { - "x": 0.0062166899442672729, - "y": -0.1577162891626358, - "z": -0.0018789069727063179 - }, - "queryAACube": { - "scale": 6.92822265625, - "x": 1101.2117919921875, - "y": 456.86856079101562, - "z": -84.708488464355469 - }, - "rotation": { - "w": 0.84585332870483398, - "x": 1.52587890625e-05, - "y": 0.53337907791137695, - "z": -0.0001373291015625 - }, - "script": "atp:/switches/livingRoomDeskLamp.js", - "scriptTimestamp": 1458860464095, - "type": "Box", - "userData": "{\"hifiHomeKey\":{\"reset\":true},\"grabbableKey\":{\"wantsTrigger\":true},\"home-switch\":{\"state\":\"off\"}}", - "visible": 0 + "Entities": [{ + "collisionless": 1, + "color": { + "blue": 0, + "green": 0, + "red": 255 }, - { - "color": { - "blue": 68, - "green": 252, - "red": 243 - }, - "created": "2016-03-24T22:21:38Z", - "cutoff": 90, - "dimensions": { - "x": 4, - "y": 4, - "z": 4 - }, - "falloffRadius": 0.30000001192092896, - "id": "{47e2c415-854c-4b6a-b71e-06c760675afd}", - "intensity": 20, - "isSpotlight": 1, - "name": "hifi-home-living-room-desk-lamp-spotlight", - "parentID": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}", - "position": { - "x": -0.10525670647621155, - "y": -0.14917388558387756, - "z": 0.71759903430938721 - }, - "queryAACube": { - "scale": 20.784608840942383, - "x": 1094.28076171875, - "y": 449.9404296875, - "z": -91.635543823242188 - }, - "rotation": { - "w": 0.6360476016998291, - "x": 0.26325368881225586, - "y": -0.27753552794456482, - "z": -0.67013490200042725 - }, - "type": "Light", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "visible": 0 + "created": "2016-03-24T22:17:16Z", + "dimensions": { + "x": 0.2776367485523224, + "y": 0.27723021268844604, + "z": 0.2535492241382599 }, - { - "collisionsWillMove": 1, - "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.obj", - "created": "2016-03-22T22:55:11Z", - "dimensions": { - "x": 0.35158795118331909, - "y": 0.27823561429977417, - "z": 0.35158795118331909 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -2, - "z": 0 - }, - "id": "{6c59ca6f-e3f6-42c1-ae4d-1549b5bdaee1}", - "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.fbx", - "name": "hifi-home-model-bulldog-shade", - "position": { - "x": 0.085205078125, - "y": 0.5194091796875, - "z": 0 - }, - "queryAACube": { - "scale": 0.56977474689483643, - "x": -0.28488737344741821, - "y": -0.072393476963043213, - "z": -0.28485685586929321 - }, - "restitution": 0.20000000298023224, - "rotation": { - "w": 0.98724901676177979, - "x": -0.0033740350045263767, - "y": -0.15913932025432587, - "z": 0.0016243136487901211 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + "id": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}", + "ignoreForCollisions": 1, + "name": "hifi-home-living-room-desk-lamp-trigger", + "parentID": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}", + "position": { + "x": 0.0062166899442672729, + "y": -0.1577162891626358, + "z": -0.0018789069727063179 }, - { - "angularVelocity": { - "x": 0.0087265009060502052, - "y": 0.005478390958160162, - "z": 0.0057442504912614822 - }, - "collisionsWillMove": 1, - "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.obj", - "created": "2016-03-22T22:50:49Z", - "dimensions": { - "x": 0.26436957716941833, - "y": 0.73171323537826538, - "z": 0.26436954736709595 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -9, - "z": 0 - }, - "id": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}", - "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.fbx", - "name": "hifi-home-model-bulldog-base", - "position": { - "x": 0.08642578125, - "y": 0.306884765625, - "z": 0.00026702880859375 - }, - "queryAACube": { - "scale": 0.82169753313064575, - "x": -0.40962806344032288, - "y": -0.41084876656532288, - "z": -0.41084876656532288 - }, - "rotation": { - "w": 0.84690523147583008, - "x": 4.9625090468907729e-05, - "y": -0.53174382448196411, - "z": 4.0798266127239913e-05 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}", - "velocity": { - "x": -0.0026286719366908073, - "y": 0.0016162246465682983, - "z": 0.0042029935866594315 - } + "queryAACube": { + "scale": 6.92822265625, + "x": 1101.2117919921875, + "y": 456.86856079101562, + "z": -84.708488464355469 + }, + "rotation": { + "w": 0.84585332870483398, + "x": 1.52587890625e-05, + "y": 0.53337907791137695, + "z": -0.0001373291015625 + }, + "script": "atp:/switches/livingRoomDeskLamp.js", + "scriptTimestamp": 1458860464095, + "type": "Box", + "userData": "{\"hifiHomeKey\":{\"reset\":true},\"grabbableKey\":{\"wantsTrigger\":true},\"home-switch\":{\"state\":\"off\"}}", + "visible": 0 + }, { + "color": { + "blue": 68, + "green": 252, + "red": 243 + }, + "created": "2016-03-24T22:21:38Z", + "cutoff": 90, + "dimensions": { + "x": 4, + "y": 4, + "z": 4 + }, + "falloffRadius": 0.30000001192092896, + "id": "{47e2c415-854c-4b6a-b71e-06c760675afd}", + "intensity": 20, + "isSpotlight": 1, + "name": "hifi-home-living-room-desk-lamp-spotlight", + "parentID": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}", + "position": { + "x": -0.10525670647621155, + "y": -0.14917388558387756, + "z": 0.71759903430938721 + }, + "queryAACube": { + "scale": 20.784608840942383, + "x": 1094.28076171875, + "y": 449.9404296875, + "z": -91.635543823242188 + }, + "rotation": { + "w": 0.6360476016998291, + "x": 0.26325368881225586, + "y": -0.27753552794456482, + "z": -0.67013490200042725 + }, + "type": "Light", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}", + "visible": 0 + }, { + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.obj", + "created": "2016-03-22T22:55:11Z", + "dimensions": { + "x": 0.35158795118331909, + "y": 0.27823561429977417, + "z": 0.35158795118331909 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 + }, + "id": "{6c59ca6f-e3f6-42c1-ae4d-1549b5bdaee1}", + "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.fbx", + "name": "hifi-home-model-bulldog-shade", + "position": { + "x": 0.085205078125, + "y": 0.5194091796875, + "z": 0 + }, + "queryAACube": { + "scale": 0.56977474689483643, + "x": -0.28488737344741821, + "y": -0.072393476963043213, + "z": -0.28485685586929321 + }, + "restitution": 0.20000000298023224, + "rotation": { + "w": 0.98724901676177979, + "x": -0.0033740350045263767, + "y": -0.15913932025432587, + "z": 0.0016243136487901211 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }, { + "angularVelocity": { + "x": 0.0087265009060502052, + "y": 0.005478390958160162, + "z": 0.0057442504912614822 + }, + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.obj", + "created": "2016-03-22T22:50:49Z", + "dimensions": { + "x": 0.26436957716941833, + "y": 0.73171323537826538, + "z": 0.26436954736709595 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 + }, + "id": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}", + "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.fbx", + "name": "hifi-home-model-bulldog-base", + "position": { + "x": 0.08642578125, + "y": 0.306884765625, + "z": 0.00026702880859375 + }, + "queryAACube": { + "scale": 0.82169753313064575, + "x": -0.40962806344032288, + "y": -0.41084876656532288, + "z": -0.41084876656532288 + }, + "rotation": { + "w": 0.84690523147583008, + "x": 4.9625090468907729e-05, + "y": -0.53174382448196411, + "z": 4.0798266127239913e-05 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}", + "velocity": { + "x": -0.0026286719366908073, + "y": 0.0016162246465682983, + "z": 0.0042029935866594315 } - ], + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json b/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json index ceb572c522..6b01bd9f1a 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json @@ -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}", diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json index be182a114e..eb603dde7b 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json @@ -8,7 +8,7 @@ }, "gravity": { "x": 0, - "y": -2, + "y": -10, "z": 0 }, "dynamic": 1, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/stuff_on_shelves.json b/unpublishedScripts/DomainContent/Home/kineticObjects/stuff_on_shelves.json new file mode 100644 index 0000000000..cecd02197a --- /dev/null +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/stuff_on_shelves.json @@ -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 +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json index c2a74e7e52..3dea13a6d2 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json @@ -1,39 +1,37 @@ { - "Entities": [ - { - "collisionsWillMove": 1, - "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj", - "created": "2016-03-15T23:06:41Z", - "name": "hifi-home-model-trashcan", - "dimensions": { - "x": 0.4264354407787323, - "y": 0.50489801168441772, - "z": 0.42643532156944275 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -5, - "z": 0 - }, - "id": "{e9693784-4264-4dd5-baa7-fd165b2645c8}", - "modelURL": "atp:/kineticObjects/trashcan/Trach-Can-3.fbx", - "queryAACube": { - "scale": 0.78652161359786987, - "x": -0.39326080679893494, - "y": -0.39326080679893494, - "z": -0.39326080679893494 - }, - "rotation": { - "w": -0.46858930587768555, - "x": 7.62939453125e-05, - "y": 0.88342106342315674, - "z": -4.57763671875e-05 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - } - ], + "Entities": [{ + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj", + "created": "2016-03-15T23:06:41Z", + "name": "hifi-home-model-trashcan", + "dimensions": { + "x": 0.4264354407787323, + "y": 0.50489801168441772, + "z": 0.42643532156944275 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 + }, + "id": "{e9693784-4264-4dd5-baa7-fd165b2645c8}", + "modelURL": "atp:/kineticObjects/trashcan/Trach-Can-3.fbx", + "queryAACube": { + "scale": 0.78652161359786987, + "x": -0.39326080679893494, + "y": -0.39326080679893494, + "z": -0.39326080679893494 + }, + "rotation": { + "w": -0.46858930587768555, + "x": 7.62939453125e-05, + "y": 0.88342106342315674, + "z": -4.57763671875e-05 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json index 28f0e8ebb7..344a57e581 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json @@ -8,7 +8,7 @@ }, "gravity": { "x": 0, - "y": -1, + "y": -10, "z": 0 }, "dynamic": 1, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index e2dab15753..c940e2f82d 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -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 = []; @@ -269,5 +271,28 @@ PosterPlaya = function(spawnLocation, spawnRotation) { create(); + 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; } \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js index 7e0085f770..42f48615a0 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js @@ -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 diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index a3e91b78b5..9d10696f8f 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -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"); @@ -62,7 +59,7 @@ Reset.prototype = { tidying: false, - + preload: function(entityID) { _this.entityID = entityID; }, @@ -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,