Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 18:23:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

positioned posters and lamp

Browse source
This commit is contained in:
ericrius1 2016-03-24 17:51:24 -07:00
parent aa4817ea26
commit 327e937970
4 changed files with 23 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json
View file

@ -13,16 +13,10 @@
},
"id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}",
"name": "Poster-Nail",
"position": {
"x": 1103.8148193359375,
"y": 461.78707885742188,
"z": 3.0988998413085938
},
"queryAACube": {
"scale": 0.25164666771888733,
"x": 1103.68896484375,
"y": 461.6612548828125,
"z": 2.9730765819549561
"position" : {
"x": -0.05,
"y": 0.4,
"z": 0.1
},
"rotation": {
"w": 0.96362245082855225,
@ -30,6 +24,12 @@
"y": 0.26723122596740723,
"z": -1.52587890625e-05
},
"queryAACube": {
"scale": 0.25164666771888733,
"x": 1103.68896484375,
"y": 461.6612548828125,
"z": 2.9730765819549561
},
"type": "Box",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"
}, {
@ -49,23 +49,14 @@
},
"id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}",
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Cellscience-Poster-2.fbx",
"position": {
"x": 1103.866943359375,
"y": 461.2822265625,
"z": 3.0254440307617188
},
"name": "hifi-home-poster-cell",
"queryAACube": {
"scale": 1.4568163156509399,
"x": 1103.1385498046875,
"y": 460.5538330078125,
"z": 2.2970359325408936
},
"rotation": {
"w": -0.28834974765777588,
"x": 0.023819327354431152,
"y": 0.95718324184417725,
"z": -0.0075837373733520508
},
"rotation": {"x":0.000021114425180712715,"y":-0.9585217833518982,"z":-0.000005921703177591553,"w":0.285019189119339},
"shapeType": "compound",
"type": "Model",
"userData": "{\"hifiHomeKey\":{\"reset\":true}}"

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

@ -14,13 +14,9 @@
"y": -2,
"z": 0
},
"name": "hifi-home-poster-playa",
"id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}",
"modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Playa-Poster.fbx",
"position": {
"x": 1101.8731689453125,
"y": 461.19500732421875,
"z": 0
},
"queryAACube": {
"scale": 1.5361770391464233,
"x": 1101.1051025390625,
@ -51,10 +47,10 @@
},
"id": "{7f060027-2927-4513-bd92-13a98e6fc06c}",
"name": "Poster-Nail",
"position": {
"x": 1101.77685546875,
"y": 461.72821044921875,
"z": 0.0442657470703125
"position" : {
"x": -0.07,
"y": 0.5,
"z": 0.07
},
"queryAACube": {
"scale": 0.25164666771888733,

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

@ -10,7 +10,6 @@ var DESK_DRAWERS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/
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/deskLamp.json' + "?" + Math.random();
var LIVING_ROOM_LAMP_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/deskLamp.json' + "?" + Math.random();
var LIVING_ROOM_LAMP_URL = 'http://localhost:8080/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json' + "?" + Math.random();
var TRASHCAN_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/trashcan.json' + "?" + Math.random();
var BLOCKS_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/blocks.json' + "?" + Math.random();
var PLAYA_POSTER_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/kineticObjects/postersPlaya.json' + "?" + Math.random();

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

@ -244,15 +244,15 @@
});
var cellPoster = new PosterCell({
x:1103.81,
y:461.0729,
z:-70.24
x:1103.78,
y:461,
z:-70.3
});
var playaPoster = new PosterPlaya({
x:1101.72,
y:451.51,
z:-73.22
x:1101.8,
y:461,
z:-73.3
});