Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 23:34:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed angular damping to default for water can

Browse source
This commit is contained in:
ericrius1 2016-04-01 15:53:55 -07:00
parent 68642099b7
commit 4a0b502f15
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,6 @@ Plant = function(spawnPosition, spawnRotation) {
compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL, compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL,
position: waterCanPosition, position: waterCanPosition,
collisionSoundURL: "atp:/growingPlant/watering_can_drop.L.wav", collisionSoundURL: "atp:/growingPlant/watering_can_drop.L.wav",
angularDamping: 1,
dynamic: true, dynamic: true,
gravity: { gravity: {
x: 0.0, x: 0.0,
@ -155,6 +154,7 @@ Plant = function(spawnPosition, spawnRotation) {
green: 10, green: 10,
blue: 200 blue: 200
}, },
collisionless: true,
position: waterSpoutPosition, position: waterSpoutPosition,
rotation: waterSpoutRotation, rotation: waterSpoutRotation,
parentID: waterCan, parentID: waterCan,

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

@ -1,6 +1,7 @@
{ {
"Entities": [{ "Entities": [{
"created": "2016-03-07T21:07:29Z", "created": "2016-03-07T21:07:29Z",
"name": "home_model_lowerBookShelf",
"dimensions": { "dimensions": {
"x": 2.0069153308868408, "x": 2.0069153308868408,
"y": 0.0160951167345047, "y": 0.0160951167345047,

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

@ -12,7 +12,7 @@
"z": 0.14119282364845276 "z": 0.14119282364845276
}, },
"id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}", "id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}",
"name": "Poster-Nail", "name": "home_model_posterNail",
"position" : { "position" : {
"x": -0.05, "x": -0.05,
"y": 0.4, "y": 0.4,
@ -44,7 +44,7 @@
"dynamic": 0, "dynamic": 0,
"id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}", "id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}",
"modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx", "modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx",
"name": "hifi-home-poster-cell", "name": "home_model_posterCell",
"queryAACube": { "queryAACube": {
"scale": 1.4568163156509399, "scale": 1.4568163156509399,
"x": 1103.1385498046875, "x": 1103.1385498046875,

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

@ -9,7 +9,7 @@
"z": 0.92656642198562622 "z": 0.92656642198562622
}, },
"dynamic": 0, "dynamic": 0,
"name": "hifi-home-poster-playa", "name": "home_model_posterPlaya",
"id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}", "id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}",
"modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx", "modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx",
"queryAACube": { "queryAACube": {
@ -41,7 +41,7 @@
"z": 0.14119282364845276 "z": 0.14119282364845276
}, },
"id": "{7f060027-2927-4513-bd92-13a98e6fc06c}", "id": "{7f060027-2927-4513-bd92-13a98e6fc06c}",
"name": "Poster-Nail", "name": "home_model_posterNail",
"position": { "position": {
"x": -0.07, "x": -0.07,
"y": 0.5, "y": 0.5,

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

@ -3,7 +3,7 @@
"collisionsWillMove": 1, "collisionsWillMove": 1,
"compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj", "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj",
"created": "2016-03-15T23:06:41Z", "created": "2016-03-15T23:06:41Z",
"name": "hifi-home-model-trashcan", "name": "home_model_Trashcan",
"dimensions": { "dimensions": {
"x": 0.4264354407787323, "x": 0.4264354407787323,
"y": 0.50489801168441772, "y": 0.50489801168441772,

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

@ -1,6 +1,7 @@
{ {
"Entities": [{ "Entities": [{
"created": "2016-03-15T21:26:11Z", "created": "2016-03-15T21:26:11Z",
"name": "home_model_upperBookShelf",
"dimensions": { "dimensions": {
"x": 2.0069153308868408, "x": 2.0069153308868408,
"y": 0.0160951167345047, "y": 0.0160951167345047,