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

switch branches

Browse source
This commit is contained in:
James B. Pollack 2016-05-18 14:12:45 -07:00
parent 17b617f1e1
commit d6d94b7d17
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
unpublishedScripts/DomainContent/Home/kineticObjects/bench.json
View file

@ -1,5 +1,6 @@
{ {
"Entities": [{ "Entities": [{
"name": "home_model_bench",
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/bench/Bench.obj", "compoundShapeURL": "atp:/kineticObjects/bench/Bench.obj",
"created": "2016-05-17T19:27:31Z", "created": "2016-05-17T19:27:31Z",

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

@ -1,7 +1,7 @@
{ {
"Entities": [{ "Entities": [{
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "https://hifi-content.s3.amazonaws.com/DomainContent/Home/skully/573a170808bd0_vhacd_skully.obj", "compoundShapeURL": "atp:/kineticObjects/skully/skullyhull.obj",
"created": "2016-05-16T19:34:28Z", "created": "2016-05-16T19:34:28Z",
"dimensions": { "dimensions": {
"x": 0.19080814719200134, "x": 0.19080814719200134,
@ -15,7 +15,7 @@
"z": 0 "z": 0
}, },
"id": "{cef37b0a-bb3d-4549-a645-f3a934f82148}", "id": "{cef37b0a-bb3d-4549-a645-f3a934f82148}",
"modelURL": "https://hifi-content.s3.amazonaws.com/DomainContent/Home/skully/skully.fbx", "modelURL": "atp:/kineticObjects/skully/skully.fbx",
"position": { "position": {
"x": 0.254150390625, "x": 0.254150390625,
"y": 0.4500732421875, "y": 0.4500732421875,
@ -500,7 +500,7 @@
"collidesWith": "static,dynamic,kinematic,otherAvatar,", "collidesWith": "static,dynamic,kinematic,otherAvatar,",
"collisionMask": 23, "collisionMask": 23,
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/snapback/snapbackFinal.OBJ", "compoundShapeURL": "atp:/kineticObjects/snapback/snapback.obj",
"created": "2016-05-16T17:01:33Z", "created": "2016-05-16T17:01:33Z",
"dimensions": { "dimensions": {
"x": 0.19942393898963928, "x": 0.19942393898963928,
@ -514,7 +514,7 @@
"z": 0 "z": 0
}, },
"id": "{26e895b7-4a83-45fe-a3e9-5b6ba5f5717e}", "id": "{26e895b7-4a83-45fe-a3e9-5b6ba5f5717e}",
"modelURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/snapback/snapback.fbx", "modelURL": "atp:/kineticObjects/snapback/snapback.fbx",
"position": { "position": {
"x": 0.7891845703125, "x": 0.7891845703125,
"y": 0.492218017578125, "y": 0.492218017578125,

5
unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json
View file

@ -1,9 +1,10 @@
{ {
"Entities": [{ "Entities": [{
"name": "home_model_umbrella",
"collidesWith": "static,dynamic,kinematic,otherAvatar,", "collidesWith": "static,dynamic,kinematic,otherAvatar,",
"collisionMask": 23, "collisionMask": 23,
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/umbrellaopen_ch.obj", "compoundShapeURL": "atp:/kineticObjects/umbrella/umbrellaopen_ch.obj",
"created": "2016-05-16T22:48:54Z", "created": "2016-05-16T22:48:54Z",
"dimensions": { "dimensions": {
"x": 1.2649545669555664, "x": 1.2649545669555664,
@ -17,7 +18,7 @@
"z": 0 "z": 0
}, },
"id": "{59f5cc21-c6e8-4deb-a1e2-0364e82fe062}", "id": "{59f5cc21-c6e8-4deb-a1e2-0364e82fe062}",
"modelURL": "atp:/kineticObjects/umbrella_open.fbx", "modelURL": "atp:/kineticObjects/umbrella/umbrella_open.fbx",
"queryAACube": { "queryAACube": {
"scale": 2.0602173805236816, "scale": 2.0602173805236816,
"x": -1.0301086902618408, "x": -1.0301086902618408,

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

@ -418,9 +418,9 @@
}); });
var dressingRoomBricabrac = new Bricabrac({ var dressingRoomBricabrac = new Bricabrac({
x: 1107.6450, x: 1105.8,
y: 460.4309, y: 460.4309,
z: -72.6496 z: -72.6
}); });
var bench = new Bench({ var bench = new Bench({