diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js index a27e537861..8b9f0f69b9 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js @@ -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; } diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json index 7f5418d67a..601d1d5dd2 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json @@ -1,246 +1,245 @@ { - "Entities": [ - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-15T21:26:11Z", - "dimensions": { - "x": 0.25794500112533569, - "y": 0.3533988893032074, - "z": 0.03479468822479248 - }, - "id": "{896373aa-9ed0-4be5-865b-a474448ea67b}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-SC-NS.fbx", - "name": "home_model_book1", - "position": { - "x": 0, - "y": 0.0357666015625, - "z": 0 - }, - "queryAACube": { - "scale": 0.43890440464019775, - "x": -0.21945220232009888, - "y": -0.18368560075759888, - "z": -0.21945220232009888 - }, - "rotation": { - "w": -0.31764703989028931, - "x": -4.57763671875e-05, - "y": 0.94818031787872314, - "z": -1.52587890625e-05 - }, - "type": "Model" + "Entities": [{ + "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "created": "2016-03-15T21:26:11Z", + "dimensions": { + "x": 0.25794500112533569, + "y": 0.3533988893032074, + "z": 0.03479468822479248 }, - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 0.25794500112533569, - "y": 0.36685666441917419, - "z": 0.046798638999462128 - }, - "id": "{e48fd6a5-ff0f-4ba6-92c7-fd972eba53c6}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-RPO-EC.fbx", - "name": "home_model_book_readyplayerone", - "position": { - "x": 0.031494140625, - "y": 0.052947998046875, - "z": 0.04192352294921875 - }, - "queryAACube": { - "scale": 0.45089861750602722, - "x": -0.19395516812801361, - "y": -0.17250131070613861, - "z": -0.18352578580379486 - }, - "rotation": { - "w": -0.2843213677406311, - "x": -4.57763671875e-05, - "y": 0.95870912075042725, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model" + "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", + "position": { + "x": 0, + "y": 0.0357666015625, + "z": 0 }, - { - "created": "2016-03-15T21:26:11Z", - "dimensions": { - "x": 0.23445942997932434, - "y": 0.33540505170822144, - "z": 0.036211937665939331 - }, - "id": "{e0790afc-6c62-4891-a933-7904b6cbc7cc}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-DADOES-PD.fbx", - "name": "home_model_book_DoAndroids", - "position": { - "x": 0.031005859375, - "y": 0.0430908203125, - "z": 0.10480499267578125 - }, - "queryAACube": { - "scale": 0.41082730889320374, - "x": -0.17440779507160187, - "y": -0.16232283413410187, - "z": -0.10060866177082062 - }, - "rotation": { - "w": -0.2843824028968811, - "x": -4.57763671875e-05, - "y": 0.95870912075042725, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model" + "queryAACube": { + "scale": 0.43890440464019775, + "x": -0.21945220232009888, + "y": -0.18368560075759888, + "z": -0.21945220232009888 }, - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 0.19239270687103271, - "y": 0.27543020248413086, - "z": 0.042817402631044388 - }, - "id": "{5120bfbb-66bf-493c-8c1a-ed883f39c054}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F1-IA.fbx", - "name": "home_model_book_Foundation1", - "position": { - "x": 0.04150390625, - "y": 0.005096435546875, - "z": 0.15532684326171875 - }, - "queryAACube": { - "scale": 0.33868876099586487, - "x": -0.12784047424793243, - "y": -0.16424794495105743, - "z": -0.014017537236213684 - }, - "rotation": { - "w": -0.2843213677406311, - "x": -4.57763671875e-05, - "y": 0.95870912075042725, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model" + "rotation": { + "w": -0.31764703989028931, + "x": -4.57763671875e-05, + "y": 0.94818031787872314, + "z": -1.52587890625e-05 }, - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 0.19239270687103271, - "y": 0.27289187908172607, - "z": 0.037494994699954987 - }, - "id": "{f9af3a1e-dbd5-4fb3-ad38-dc818592e4c6}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F2-IA.fbx", - "position": { - "x": 0.056884765625, - "y": 0.00262451171875, - "z": 0.20074462890625 - }, - "queryAACube": { - "scale": 0.33599227666854858, - "x": -0.11111137270927429, - "y": -0.16537162661552429, - "z": 0.032748490571975708 - }, - "rotation": { - "w": -0.2843213677406311, - "x": -4.57763671875e-05, - "y": 0.95870912075042725, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model" + "type": "Model" + }, { + "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", + "created": "2016-03-07T21:07:29Z", + "dimensions": { + "x": 0.25794500112533569, + "y": 0.36685666441917419, + "z": 0.046798638999462128 }, - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 0.19239270687103271, - "y": 0.27362632751464844, - "z": 0.04995863139629364 - }, - "id": "{6af6bf06-05c9-427c-8ff5-d10072ffc293}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F3-IA.fbx", - "name": "home_model_book_Foundation3", - "position": { - "x": 0.0919189453125, - "y": 0, - "z": 0.24033355712890625 - }, - "queryAACube": { - "scale": 0.33820435404777527, - "x": -0.077183231711387634, - "y": -0.16910217702388763, - "z": 0.071231380105018616 - }, - "rotation": { - "w": -0.2843213677406311, - "x": -4.57763671875e-05, - "y": 0.95870912075042725, - "z": 1.52587890625e-05 - }, - "shapeType": "box", - "type": "Model" + "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", + "position": { + "x": 0.031494140625, + "y": 0.052947998046875, + "z": 0.04192352294921875 }, - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-15T21:26:11Z", - "dimensions": { - "x": 0.20406116545200348, - "y": 0.29261711239814758, - "z": 0.014823859557509422 - }, - "id": "{4982da58-d573-4582-b627-f08312cc0d07}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-LPP-ASE.fbx", - "position": { - "x": 0.1171875, - "y": 0.01153564453125, - "z": 0.26572418212890625 - }, - "queryAACube": { - "scale": 0.35705110430717468, - "x": -0.061338052153587341, - "y": -0.16698990762233734, - "z": 0.087198629975318909 - }, - "rotation": { - "w": -0.27602046728134155, - "x": -4.57763671875e-05, - "y": 0.96115052700042725, - "z": -1.52587890625e-05 - }, - "type": "Model" + "queryAACube": { + "scale": 0.45089861750602722, + "x": -0.19395516812801361, + "y": -0.17250131070613861, + "z": -0.18352578580379486 }, - { - "collisionSoundURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav", - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 0.23497477173805237, - "y": 0.28377044200897217, - "z": 0.033324316143989563 - }, - "id": "{178b1cef-f76b-4cda-b834-42080208d502}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-N-WG.fbx", - "position": { - "x": 0.1429443359375, - "y": 0.00970458984375, - "z": 0.2823486328125 - }, - "queryAACube": { - "scale": 0.36993148922920227, - "x": -0.042021408677101135, - "y": -0.17526115477085114, - "z": 0.097382888197898865 - }, - "rotation": { - "w": -0.30934613943099976, - "x": -4.57763671875e-05, - "y": 0.9509575366973877, - "z": -1.52587890625e-05 - }, - "type": "Model" - } - ], + "rotation": { + "w": -0.2843213677406311, + "x": -4.57763671875e-05, + "y": 0.95870912075042725, + "z": 1.52587890625e-05 + }, + "shapeType": "box", + "type": "Model" + }, { + "created": "2016-03-15T21:26:11Z", + "dimensions": { + "x": 0.23445942997932434, + "y": 0.33540505170822144, + "z": 0.036211937665939331 + }, + "id": "{e0790afc-6c62-4891-a933-7904b6cbc7cc}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-DADOES-PD.fbx", + "name": "home_model_book_DoAndroids", + "position": { + "x": 0.031005859375, + "y": 0.0430908203125, + "z": 0.10480499267578125 + }, + "dynamic": 1, + "queryAACube": { + "scale": 0.41082730889320374, + "x": -0.17440779507160187, + "y": -0.16232283413410187, + "z": -0.10060866177082062 + }, + "rotation": { + "w": -0.2843824028968811, + "x": -4.57763671875e-05, + "y": 0.95870912075042725, + "z": 1.52587890625e-05 + }, + "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": { + "x": 0.19239270687103271, + "y": 0.27543020248413086, + "z": 0.042817402631044388 + }, + "id": "{5120bfbb-66bf-493c-8c1a-ed883f39c054}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F1-IA.fbx", + "name": "home_model_book_Foundation1", + "position": { + "x": 0.04150390625, + "y": 0.005096435546875, + "z": 0.15532684326171875 + }, + "dynamic": 1, + "queryAACube": { + "scale": 0.33868876099586487, + "x": -0.12784047424793243, + "y": -0.16424794495105743, + "z": -0.014017537236213684 + }, + "rotation": { + "w": -0.2843213677406311, + "x": -4.57763671875e-05, + "y": 0.95870912075042725, + "z": 1.52587890625e-05 + }, + "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": { + "x": 0.19239270687103271, + "y": 0.27289187908172607, + "z": 0.037494994699954987 + }, + "id": "{f9af3a1e-dbd5-4fb3-ad38-dc818592e4c6}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F2-IA.fbx", + "position": { + "x": 0.056884765625, + "y": 0.00262451171875, + "z": 0.20074462890625 + }, + "dynamic": 1, + "queryAACube": { + "scale": 0.33599227666854858, + "x": -0.11111137270927429, + "y": -0.16537162661552429, + "z": 0.032748490571975708 + }, + "rotation": { + "w": -0.2843213677406311, + "x": -4.57763671875e-05, + "y": 0.95870912075042725, + "z": 1.52587890625e-05 + }, + "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": { + "x": 0.19239270687103271, + "y": 0.27362632751464844, + "z": 0.04995863139629364 + }, + "id": "{6af6bf06-05c9-427c-8ff5-d10072ffc293}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F3-IA.fbx", + "name": "home_model_book_Foundation3", + "position": { + "x": 0.0919189453125, + "y": 0, + "z": 0.24033355712890625 + }, + "dynamic": 1, + "queryAACube": { + "scale": 0.33820435404777527, + "x": -0.077183231711387634, + "y": -0.16910217702388763, + "z": 0.071231380105018616 + }, + "rotation": { + "w": -0.2843213677406311, + "x": -4.57763671875e-05, + "y": 0.95870912075042725, + "z": 1.52587890625e-05 + }, + "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": { + "x": 0.20406116545200348, + "y": 0.29261711239814758, + "z": 0.014823859557509422 + }, + "id": "{4982da58-d573-4582-b627-f08312cc0d07}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-LPP-ASE.fbx", + "position": { + "x": 0.1171875, + "y": 0.01153564453125, + "z": 0.26572418212890625 + }, + "dynamic": 1, + "queryAACube": { + "scale": 0.35705110430717468, + "x": -0.061338052153587341, + "y": -0.16698990762233734, + "z": 0.087198629975318909 + }, + "rotation": { + "w": -0.27602046728134155, + "x": -4.57763671875e-05, + "y": 0.96115052700042725, + "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": { + "x": 0.23497477173805237, + "y": 0.28377044200897217, + "z": 0.033324316143989563 + }, + "id": "{178b1cef-f76b-4cda-b834-42080208d502}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-N-WG.fbx", + "position": { + "x": 0.1429443359375, + "y": 0.00970458984375, + "z": 0.2823486328125 + }, + "dynamic": 1, + "queryAACube": { + "scale": 0.36993148922920227, + "x": -0.042021408677101135, + "y": -0.17526115477085114, + "z": 0.097382888197898865 + }, + "rotation": { + "w": -0.30934613943099976, + "x": -4.57763671875e-05, + "y": 0.9509575366973877, + "z": -1.52587890625e-05 + }, + "type": "Model" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json index 573537bfe5..4cfcb64801 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/chair.json @@ -1,36 +1,35 @@ { - "Entities": [ - { - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.obj", - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 0.66077238321304321, - "y": 1.058124303817749, - "z": 0.7188611626625061 - }, - "gravity": { - "x": 0, - "y": -6, - "z": 0 - }, - "id": "{d97c8a4e-9b95-448c-a729-5da9e22b6adc}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.fbx", - "queryAACube": { - "scale": 1.439794659614563, - "x": -0.71989732980728149, - "y": -0.71989732980728149, - "z": -0.71989732980728149 - }, - "rotation": { - "w": 0.63176929950714111, - "x": -0.0003204345703125, - "y": 0.77511250972747803, - "z": 0.0002593994140625 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{}" - } - ], + "Entities": [{ + "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.obj", + "created": "2016-03-07T21:07:29Z", + "dimensions": { + "x": 0.66077238321304321, + "y": 1.058124303817749, + "z": 0.7188611626625061 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -6, + "z": 0 + }, + "id": "{d97c8a4e-9b95-448c-a729-5da9e22b6adc}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/simple-chair2.fbx", + "queryAACube": { + "scale": 1.439794659614563, + "x": -0.71989732980728149, + "y": -0.71989732980728149, + "z": -0.71989732980728149 + }, + "rotation": { + "w": 0.63176929950714111, + "x": -0.0003204345703125, + "y": 0.77511250972747803, + "z": 0.0002593994140625 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/labLamp.json b/unpublishedScripts/DomainContent/Home/kineticObjects/labLamp.json index 42b613412e..42f3192ab3 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/labLamp.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/labLamp.json @@ -1,36 +1,35 @@ { - "Entities": [ - { - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp.obj", - "created": "2016-03-16T01:00:16Z", - "dimensions": { - "x": 0.63867169618606567, - "y": 0.75600343942642212, - "z": 0.22696791589260101 - }, - "id": "{533c2da8-ea8c-4ae8-9c1c-3a18c7d91f46}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp-White-4.fbx", - "position": { - "x": 1103.28564453125, - "y": 460.89242553710938, - "z": 0 - }, - "queryAACube": { - "scale": 1.0153605937957764, - "x": 1102.7779541015625, - "y": 460.38473510742188, - "z": -0.50768029689788818 - }, - "rotation": { - "w": -0.36089110374450684, - "x": -0.014938592910766602, - "y": -0.93249410390853882, - "z": -0.0007476806640625 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"grabbableKey\":{\"grabbable\":true,\"wantsTrigger\":true}}" - } - ], + "Entities": [{ + "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp.obj", + "created": "2016-03-16T01:00:16Z", + "dimensions": { + "x": 0.63867169618606567, + "y": 0.75600343942642212, + "z": 0.22696791589260101 + }, + "id": "{533c2da8-ea8c-4ae8-9c1c-3a18c7d91f46}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp-White-4.fbx", + "position": { + "x": 1103.28564453125, + "y": 460.89242553710938, + "z": 0 + }, + "dynamic": 1, + "queryAACube": { + "scale": 1.0153605937957764, + "x": 1102.7779541015625, + "y": 460.38473510742188, + "z": -0.50768029689788818 + }, + "rotation": { + "w": -0.36089110374450684, + "x": -0.014938592910766602, + "y": -0.93249410390853882, + "z": -0.0007476806640625 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true,\"wantsTrigger\":true}}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/leftDeskDrawer.json b/unpublishedScripts/DomainContent/Home/kineticObjects/leftDeskDrawer.json index 3e1b603b51..bdc0c54d25 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/leftDeskDrawer.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/leftDeskDrawer.json @@ -1,36 +1,35 @@ { - "Entities": [ - { - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-1.obj", - "created": "2016-03-15T21:26:11Z", - "dimensions": { - "x": 0.87835502624511719, - "y": 0.32454308867454529, - "z": 0.71838575601577759 - }, - "gravity": { - "x": 0, - "y": -1, - "z": 0 - }, - "id": "{a87cc972-aaf5-48a4-b720-d79ee7bd68d9}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-1.fbx", - "queryAACube": { - "scale": 1.1802177429199219, - "x": -0.59010887145996094, - "y": -0.59010887145996094, - "z": -0.59010887145996094 - }, - "rotation": { - "w": 0.9542534351348877, - "x": -4.57763671875e-05, - "y": 0.29893946647644043, - "z": -1.52587890625e-05 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{}" - } - ], + "Entities": [{ + "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-1.obj", + "created": "2016-03-15T21:26:11Z", + "dimensions": { + "x": 0.87835502624511719, + "y": 0.32454308867454529, + "z": 0.71838575601577759 + }, + "gravity": { + "x": 0, + "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": { + "scale": 1.1802177429199219, + "x": -0.59010887145996094, + "y": -0.59010887145996094, + "z": -0.59010887145996094 + }, + "rotation": { + "w": 0.9542534351348877, + "x": -4.57763671875e-05, + "y": 0.29893946647644043, + "z": -1.52587890625e-05 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/livingRoomLamp.json b/unpublishedScripts/DomainContent/Home/kineticObjects/livingRoomLamp.json index b4ff729f54..75ac362014 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/livingRoomLamp.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/livingRoomLamp.json @@ -1,36 +1,35 @@ { - "Entities": [ - { - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp.obj", - "created": "2016-03-16T01:04:38Z", - "dimensions": { - "x": 0.63867169618606567, - "y": 0.75600343942642212, - "z": 0.22696791589260101 - }, - "id": "{ee167d6d-3901-469a-86df-baf787691997}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp-White-4.fbx", - "position": { - "x": 1104.701171875, - "y": 460.98452758789062, - "z": 0 - }, - "queryAACube": { - "scale": 1.0153605937957764, - "x": 1104.1934814453125, - "y": 460.47683715820312, - "z": -0.50768029689788818 - }, - "rotation": { - "w": 0.69259178638458252, - "x": -0.0070344209671020508, - "y": -0.72118711471557617, - "z": 0.013168573379516602 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"grabbableKey\":{\"grabbable\":true,\"wantsTrigger\":true}}" - } - ], + "Entities": [{ + "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp.obj", + "created": "2016-03-16T01:04:38Z", + "dimensions": { + "x": 0.63867169618606567, + "y": 0.75600343942642212, + "z": 0.22696791589260101 + }, + "id": "{ee167d6d-3901-469a-86df-baf787691997}", + "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Little-Lamp-White-4.fbx", + "position": { + "x": 1104.701171875, + "y": 460.98452758789062, + "z": 0 + }, + "dynamic": 1, + "queryAACube": { + "scale": 1.0153605937957764, + "x": 1104.1934814453125, + "y": 460.47683715820312, + "z": -0.50768029689788818 + }, + "rotation": { + "w": 0.69259178638458252, + "x": -0.0070344209671020508, + "y": -0.72118711471557617, + "z": 0.013168573379516602 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"grabbableKey\":{\"grabbable\":true,\"wantsTrigger\":true}}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json index 3e2bb45e7f..b2974bd2e5 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json @@ -1,33 +1,32 @@ { - "Entities": [ - { - "created": "2016-03-07T21:07:29Z", - "dimensions": { - "x": 2.0069153308868408, - "y": 0.0160951167345047, - "z": 0.45006880164146423 - }, - "gravity": { - "x": 0, - "y": -2, - "z": 0 - }, - "id": "{9745b51e-7816-4de0-85d0-82432a0b8175}", - "queryAACube": { - "scale": 2.0568251609802246, - "x": -1.0284125804901123, - "y": -1.0284125804901123, - "z": -1.0284125804901123 - }, - "rotation": { - "w": -0.0063019990921020508, - "x": 0.46935224533081055, - "y": -0.011947810649871826, - "z": -0.88293278217315674 - }, - "type": "Box", - "userData": "{}" - } - ], + "Entities": [{ + "created": "2016-03-07T21:07:29Z", + "dimensions": { + "x": 2.0069153308868408, + "y": 0.0160951167345047, + "z": 0.45006880164146423 + }, + "gravity": { + "x": 0, + "y": -2, + "z": 0 + }, + "dynamic": 1, + "id": "{9745b51e-7816-4de0-85d0-82432a0b8175}", + "queryAACube": { + "scale": 2.0568251609802246, + "x": -1.0284125804901123, + "y": -1.0284125804901123, + "z": -1.0284125804901123 + }, + "rotation": { + "w": -0.0063019990921020508, + "x": 0.46935224533081055, + "y": -0.011947810649871826, + "z": -0.88293278217315674 + }, + "type": "Box", + "userData": "{}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/rightDeskDrawer.json b/unpublishedScripts/DomainContent/Home/kineticObjects/rightDeskDrawer.json index 23a7b9c77e..cef3ab08c3 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/rightDeskDrawer.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/rightDeskDrawer.json @@ -1,36 +1,35 @@ { - "Entities": [ - { - "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-2.obj", - "created": "2016-03-15T21:26:11Z", - "dimensions": { - "x": 0.8697468638420105, - "y": 0.31825172901153564, - "z": 1.1220188140869141 - }, - "gravity": { - "x": 0, - "y": -1, - "z": 0 - }, - "id": "{ae1fa8dd-1167-40c1-8fa7-aeb12ee7b12c}", - "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-2.fbx", - "queryAACube": { - "scale": 1.4548780918121338, - "x": -0.72743904590606689, - "y": -0.72743904590606689, - "z": -0.72743904590606689 - }, - "rotation": { - "w": 0.9539787769317627, - "x": -7.62939453125e-05, - "y": 0.29982447624206543, - "z": -1.52587890625e-05 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{}" - } - ], + "Entities": [{ + "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/desk-drawer-2.obj", + "created": "2016-03-15T21:26:11Z", + "dimensions": { + "x": 0.8697468638420105, + "y": 0.31825172901153564, + "z": 1.1220188140869141 + }, + "gravity": { + "x": 0, + "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": { + "scale": 1.4548780918121338, + "x": -0.72743904590606689, + "y": -0.72743904590606689, + "z": -0.72743904590606689 + }, + "rotation": { + "w": 0.9539787769317627, + "x": -7.62939453125e-05, + "y": 0.29982447624206543, + "z": -1.52587890625e-05 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{}" + }], "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 3d2f56da7a..0373152e75 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json @@ -1,33 +1,32 @@ { - "Entities": [ - { - "created": "2016-03-15T21:26:11Z", - "dimensions": { - "x": 2.0069153308868408, - "y": 0.0160951167345047, - "z": 0.45006880164146423 - }, - "gravity": { - "x": 0, - "y": -1, - "z": 0 - }, - "id": "{ef35ce2a-fddb-44bf-bb1b-30d9fac70563}", - "queryAACube": { - "scale": 2.0568251609802246, - "x": -1.0284125804901123, - "y": -1.0284125804901123, - "z": -1.0284125804901123 - }, - "rotation": { - "w": -0.0064851045608520508, - "x": 0.46929121017456055, - "y": -0.012191951274871826, - "z": -0.88293278217315674 - }, - "type": "Box", - "userData": "{}" - } - ], + "Entities": [{ + "created": "2016-03-15T21:26:11Z", + "dimensions": { + "x": 2.0069153308868408, + "y": 0.0160951167345047, + "z": 0.45006880164146423 + }, + "gravity": { + "x": 0, + "y": -1, + "z": 0 + }, + "dynamic": 1, + "id": "{ef35ce2a-fddb-44bf-bb1b-30d9fac70563}", + "queryAACube": { + "scale": 2.0568251609802246, + "x": -1.0284125804901123, + "y": -1.0284125804901123, + "z": -1.0284125804901123 + }, + "rotation": { + "w": -0.0064851045608520508, + "x": 0.46929121017456055, + "y": -0.012191951274871826, + "z": -0.88293278217315674 + }, + "type": "Box", + "userData": "{}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js index c512762240..b35195c5ce 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js @@ -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() { diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index f86a30a264..79e7559758 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -85,8 +85,11 @@ }, 2500); _this.cleanupDynamicEntities(); _this.cleanupKineticEntities(); - _this.createKineticEntities(); - _this.createDynamicEntities(); + 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();