Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +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

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

File diff suppressed because it is too large Load diff

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}",

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

@ -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
}
}

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
}

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

@ -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
}
}

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 = [];
@ -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;
}

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

13
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");
@ -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,