Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 13:56:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #17 from ericrius1/atpHomeReset

Browse source 
made plant bowl static and tweaked lamp properties
This commit is contained in:
James B. Pollack 2016-04-01 15:03:11 -07:00
commit 2e7d20cb03
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,6 @@ Plant = function(spawnPosition, spawnRotation) {
type: "Model",
modelURL: BOWL_MODEL_URL,
dimensions: bowlDimensions,
dynamic: true,
shapeType: 'compound',
compoundShapeURL: BOWL_COLLISION_HULL_URL,
name: "home_model_plantBowl",

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

@ -14,7 +14,7 @@
},
"id": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}",
"ignoreForCollisions": 1,
"name": "hifi-home-living-room-desk-lamp-trigger",
"name": "home_box_livingRoomDeskLampTrigger",
"parentID": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}",
"position": {
"x": 0.0062166899442672729,
@ -55,12 +55,12 @@
"id": "{47e2c415-854c-4b6a-b71e-06c760675afd}",
"intensity": 20,
"isSpotlight": 1,
"name": "hifi-home-living-room-desk-lamp-spotlight",
"name": "home_light_livingRoomLight",
"parentID": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}",
"position": {
"x": -0.10525670647621155,
"x": 0,
"y": -0.14917388558387756,
"z": 0.71759903430938721
"z": 0
},
"queryAACube": {
"scale": 20.784608840942383,
@ -94,7 +94,7 @@
},
"id": "{6c59ca6f-e3f6-42c1-ae4d-1549b5bdaee1}",
"modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.fbx",
"name": "hifi-home-model-bulldog-shade",
"name": "home_model_bulldogShade",
"position": {
"x": 0.085205078125,
"y": 0.5194091796875,
@ -138,7 +138,7 @@
},
"id": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}",
"modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.fbx",
"name": "hifi-home-model-bulldog-base",
"name": "home_model_BulldogBase",
"position": {
"x": 0.08642578125,
"y": 0.306884765625,

7
unpublishedScripts/DomainContent/Home/kineticObjects/fruit.json
View file

@ -1,6 +1,7 @@
{
"Entities": [{
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_fruitBowl",
"collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/fruit/Fruit-Bowl.obj",
"created": "2016-03-15T23:11:03Z",
@ -38,6 +39,7 @@
"type": "Model"
}, {
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_apple",
"collisionsWillMove": 1,
"created": "2016-03-15T21:26:11Z",
"dimensions": {
@ -76,6 +78,7 @@
"type": "Model"
}, {
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_apple",
"collisionsWillMove": 1,
"created": "2016-03-15T21:26:11Z",
"dimensions": {
@ -114,6 +117,7 @@
"type": "Model"
}, {
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_apple",
"collisionsWillMove": 1,
"created": "2016-03-16T00:27:30Z",
"dimensions": {
@ -152,6 +156,7 @@
"type": "Model"
}, {
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_apple",
"collisionsWillMove": 1,
"created": "2016-03-16T00:27:30Z",
"dimensions": {
@ -190,6 +195,7 @@
"type": "Model"
}, {
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_apple",
"collisionsWillMove": 1,
"created": "2016-03-16T00:27:30Z",
"dimensions": {
@ -228,6 +234,7 @@
"type": "Model"
}, {
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"name": "home_model_apple",
"collisionsWillMove": 1,
"created": "2016-03-16T00:27:30Z",
"dimensions": {

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

@ -206,7 +206,7 @@ Books = function(spawnLocation, spawnRotation) {
}
Blocks = function(spawnLocation, spawnRotation) {
print('CREATE BLOCKS')
print('EBL CREATE BLOCKS')
var created = [];
function create() {

7
unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js
View file

@ -11,6 +11,7 @@
Switch.prototype = {
prefix: 'hifi-home-living-room-desk-lamp-',
lightName: 'home_light_livingRoomLight',
clickReleaseOnEntity: function(entityID, mouseEvent) {
if (!mouseEvent.isLeftButton) {
return;
@ -63,9 +64,11 @@
var results = Entities.findEntities(_this.position, SEARCH_RADIUS);
results.forEach(function(result) {
var properties = Entities.getEntityProperties(result);
if (properties.name === _this.prefix + "spotlight") {
print("EBL FOUND THE SPOTLIGHT!");
if (properties.name === _this.lightName) {
print("EBL FOUND THE LIGHT!");
found.push(result);
} else {
print("EBL DID NOT FIND THE LIGHT!");
}
});
return found;