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

Merge pull request #6457 from imgntn/damping

Browse source 
Rename linearDamping to damping in scripts
This commit is contained in:
Philip Rosedale 2015-11-20 16:08:16 -08:00
commit ba0f30a487
10 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/FlockOfbirds.js
View file

@ -271,7 +271,7 @@ function loadBirds(howMany) {
dimensions: { x: BIRD_SIZE, y: BIRD_SIZE, z: BIRD_SIZE }, dimensions: { x: BIRD_SIZE, y: BIRD_SIZE, z: BIRD_SIZE },
gravity: { x: 0, y: BIRD_GRAVITY, z: 0 }, gravity: { x: 0, y: BIRD_GRAVITY, z: 0 },
velocity: { x: 0, y: -0.1, z: 0 }, velocity: { x: 0, y: -0.1, z: 0 },
linearDamping: LINEAR_DAMPING, damping: LINEAR_DAMPING,
collisionsWillMove: true, collisionsWillMove: true,
lifetime: STARTING_LIFETIME, lifetime: STARTING_LIFETIME,
color: colors[whichBird] color: colors[whichBird]

2
examples/libraries/easyStarExample.js
View file

@ -76,7 +76,7 @@ var playerSphere = Entities.addEntity({
z: 0 z: 0
}, },
collisionsWillMove: true, collisionsWillMove: true,
linearDamping: 0.2 damping: 0.2
}); });
Script.setInterval(function(){ Script.setInterval(function(){

4
examples/toybox/basketball/createRack.js
View file

@ -41,7 +41,7 @@ var rack = Entities.addEntity({
y: -9.8, y: -9.8,
z: 0 z: 0
}, },
linearDamping: 1, damping: 1,
dimensions: { dimensions: {
x: 0.4, x: 0.4,
y: 1.37, y: 1.37,
@ -83,7 +83,7 @@ function createBalls() {
z: DIAMETER z: DIAMETER
}, },
restitution: 1.0, restitution: 1.0,
linearDamping: 0.00001, damping: 0.00001,
gravity: { gravity: {
x: 0, x: 0,
y: -9.8, y: -9.8,

2
examples/toybox/basketball/createSingleBasketball.js
View file

@ -46,7 +46,7 @@ function makeBasketball() {
collisionSoundURL: collisionSoundURL, collisionSoundURL: collisionSoundURL,
modelURL: basketballURL, modelURL: basketballURL,
restitution: 1.0, restitution: 1.0,
linearDamping: 0.00001, damping: 0.00001,
shapeType: "sphere" shapeType: "sphere"
}); });
originalPosition = position; originalPosition = position;

6
examples/toybox/blockers/createTestBlocks.js
View file

@ -88,7 +88,7 @@ var topBlock = Entities.addEntity({
dimensions: blockDimensions, dimensions: blockDimensions,
position: topBlock_position, position: topBlock_position,
rotation: topBlock_rotation, rotation: topBlock_rotation,
linearDamping: LINEAR_DAMPING, damping: LINEAR_DAMPING,
gravity: BLOCK_GRAVITY, gravity: BLOCK_GRAVITY,
collisionsWillMove: true, collisionsWillMove: true,
velocity: { velocity: {
@ -106,7 +106,7 @@ var sideBlock1 = Entities.addEntity({
dimensions: blockDimensions, dimensions: blockDimensions,
position: sideBlock1_position, position: sideBlock1_position,
rotation: sideBlock1_rotation, rotation: sideBlock1_rotation,
linearDamping: LINEAR_DAMPING, damping: LINEAR_DAMPING,
gravity: BLOCK_GRAVITY, gravity: BLOCK_GRAVITY,
collisionsWillMove: true collisionsWillMove: true
}); });
@ -120,7 +120,7 @@ var sideBlock2 = Entities.addEntity({
position: sideBlock2_position, position: sideBlock2_position,
rotation: sideBlock2_rotation, rotation: sideBlock2_rotation,
collsionsWillMove: true, collsionsWillMove: true,
linearDamping: LINEAR_DAMPING, damping: LINEAR_DAMPING,
gravity: BLOCK_GRAVITY, gravity: BLOCK_GRAVITY,
collisionsWillMove: true collisionsWillMove: true
}); });

4
examples/toybox/bubblewand/wand.js
View file

@ -28,7 +28,7 @@
var BUBBLE_LIFETIME_MAX = 8; var BUBBLE_LIFETIME_MAX = 8;
var BUBBLE_SIZE_MIN = 0.02; var BUBBLE_SIZE_MIN = 0.02;
var BUBBLE_SIZE_MAX = 0.1; var BUBBLE_SIZE_MAX = 0.1;
var BUBBLE_LINEAR_DAMPING = 0.4; var BUBBLE_LINEAR_DAMPING = 0.2;
var BUBBLE_GRAVITY_MIN = 0.1; var BUBBLE_GRAVITY_MIN = 0.1;
var BUBBLE_GRAVITY_MAX = 0.3; var BUBBLE_GRAVITY_MAX = 0.3;
var GROWTH_FACTOR = 0.005; var GROWTH_FACTOR = 0.005;
@ -163,7 +163,7 @@
dimensions: BUBBLE_INITIAL_DIMENSIONS, dimensions: BUBBLE_INITIAL_DIMENSIONS,
collisionsWillMove: false, collisionsWillMove: false,
ignoreForCollisions: true, ignoreForCollisions: true,
linearDamping: BUBBLE_LINEAR_DAMPING, damping: BUBBLE_LINEAR_DAMPING,
shapeType: "sphere" shapeType: "sphere"
}); });

2
examples/toybox/ping_pong_gun/pingPongGun.js
View file

@ -123,7 +123,7 @@
type:'Sphere', type:'Sphere',
color: BALL_COLOR, color: BALL_COLOR,
dimensions: BALL_DIMENSIONS, dimensions: BALL_DIMENSIONS,
linearDamping: BALL_LINEAR_DAMPING, damping: BALL_LINEAR_DAMPING,
gravity: BALL_GRAVITY, gravity: BALL_GRAVITY,
restitution: BALL_RESTITUTION, restitution: BALL_RESTITUTION,
collisionsWillMove: true, collisionsWillMove: true,

2
unpublishedScripts/basketballsResetter.js
View file

@ -75,7 +75,7 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
z: DIAMETER z: DIAMETER
}, },
restitution: 1.0, restitution: 1.0,
linearDamping: 0.00001, damping: 0.00001,
gravity: { gravity: {
x: 0, x: 0,
y: -9.8, y: -9.8,

12
unpublishedScripts/hiddenEntityReset.js
View file

@ -253,7 +253,7 @@
y: -9.8, y: -9.8,
z: 0 z: 0
}, },
linearDamping: 1, damping: 1,
dimensions: { dimensions: {
x: 0.4, x: 0.4,
y: 1.37, y: 1.37,
@ -301,7 +301,7 @@
z: DIAMETER z: DIAMETER
}, },
restitution: 1.0, restitution: 1.0,
linearDamping: 0.00001, damping: 0.00001,
gravity: { gravity: {
x: 0, x: 0,
y: -9.8, y: -9.8,
@ -871,7 +871,7 @@
y: -100, y: -100,
z: 0 z: 0
}, },
linearDamping: 1, damping: 1,
angularDamping: 10, angularDamping: 10,
mass: 10, mass: 10,
userData: JSON.stringify({ userData: JSON.stringify({
@ -990,7 +990,7 @@
z: 0 z: 0
}, },
restitution: 10, restitution: 10,
linearDamping: 0.0, damping: 0.0,
velocity: { velocity: {
x: 0, x: 0,
y: -0.01, y: -0.01,
@ -1113,7 +1113,7 @@
y: 0, y: 0,
z: 0 z: 0
}, },
linearDamping: 0.4, damping: 0.4,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -1156,7 +1156,7 @@
y: 0, y: 0,
z: 0 z: 0
}, },
linearDamping: 0.2, damping: 0.2,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true

12
unpublishedScripts/masterReset.js
View file

@ -233,7 +233,7 @@ MasterReset = function() {
y: -9.8, y: -9.8,
z: 0 z: 0
}, },
linearDamping: 1, damping: 1,
dimensions: { dimensions: {
x: 0.4, x: 0.4,
y: 1.37, y: 1.37,
@ -282,7 +282,7 @@ MasterReset = function() {
z: DIAMETER z: DIAMETER
}, },
restitution: 1.0, restitution: 1.0,
linearDamping: 0.00001, damping: 0.00001,
gravity: { gravity: {
x: 0, x: 0,
y: -9.8, y: -9.8,
@ -853,7 +853,7 @@ MasterReset = function() {
y: -100, y: -100,
z: 0 z: 0
}, },
linearDamping: 1, damping: 1,
angularDamping: 10, angularDamping: 10,
mass: 10, mass: 10,
userData: JSON.stringify({ userData: JSON.stringify({
@ -973,7 +973,7 @@ MasterReset = function() {
z: 0 z: 0
}, },
restitution: 10, restitution: 10,
linearDamping: 0.0, damping: 0.01,
velocity: { velocity: {
x: 0, x: 0,
y: -0.01, y: -0.01,
@ -1096,7 +1096,7 @@ MasterReset = function() {
y: 0, y: 0,
z: 0 z: 0
}, },
linearDamping: 0.4, damping: 0.4,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true
@ -1139,7 +1139,7 @@ MasterReset = function() {
y: 0, y: 0,
z: 0 z: 0
}, },
linearDamping: 0.2, damping: 0.2,
userData: JSON.stringify({ userData: JSON.stringify({
resetMe: { resetMe: {
resetMe: true resetMe: true