diff --git a/examples/FlockOfbirds.js b/examples/FlockOfbirds.js
index 5d67c25c17..514e8a5fab 100644
--- a/examples/FlockOfbirds.js
+++ b/examples/FlockOfbirds.js
@@ -272,7 +272,7 @@ function loadBirds(howMany) {
gravity: { x: 0, y: BIRD_GRAVITY, z: 0 },
velocity: { x: 0, y: -0.1, z: 0 },
damping: LINEAR_DAMPING,
- collisionsWillMove: true,
+ dynamic: true,
lifetime: STARTING_LIFETIME,
color: colors[whichBird]
}),
@@ -289,4 +289,4 @@ function loadBirds(howMany) {
color: {red: 100, green: 100, blue: 100}
});
}
-}
\ No newline at end of file
+}
diff --git a/examples/animationPerfTest.js b/examples/animationPerfTest.js
index b832d2e61f..93d362299c 100644
--- a/examples/animationPerfTest.js
+++ b/examples/animationPerfTest.js
@@ -53,7 +53,7 @@ for (var i = 0; i < NUM_MOONS; i++) {
dimensions: { x: radius, y: radius, z: radius },
color: color,
ignoreCollisions: true,
- collisionsWillMove: false
+ dynamic: false
}));
}
diff --git a/examples/baseball/createBatButton.js b/examples/baseball/createBatButton.js
index 37cc7f0a5e..20f020a716 100644
--- a/examples/baseball/createBatButton.js
+++ b/examples/baseball/createBatButton.js
@@ -65,7 +65,7 @@
modelURL: BAT_MODEL,
position: dropPosition,
compoundShapeURL: BAT_COLLISION_HULL,
- collisionsWillMove: true,
+ dynamic: true,
velocity: { x: 0, y: 0.05, z: 0}, // workaround for gravity not taking effect on add
gravity: { x: 0, y: -9.81, z: 0},
rotation: Quat.fromPitchYawRollDegrees(0.0, 0.0, -90.0),
diff --git a/examples/baseball/pitching.js b/examples/baseball/pitching.js
index 09f33c9dd4..01aae28a55 100644
--- a/examples/baseball/pitching.js
+++ b/examples/baseball/pitching.js
@@ -107,7 +107,7 @@ var PITCHING_MACHINE_PROPERTIES = {
y: 0.61,
z: 0.39
},
- collisionsWillMove: false,
+ dynamic: false,
shapeType: "Box"
};
PITCHING_MACHINE_PROPERTIES.dimensions = Vec3.multiply(2.5, PITCHING_MACHINE_PROPERTIES.dimensions);
@@ -217,7 +217,7 @@ var BASEBALL_PROPERTIES = {
y: BASEBALL_RADIUS,
z: BASEBALL_RADIUS
},
- collisionsWillMove: true,
+ dynamic: true,
angularVelocity: {
x: 17.0,
y: 0,
diff --git a/examples/blockWorld.js b/examples/blockWorld.js
index 53809612ed..12e531e8de 100644
--- a/examples/blockWorld.js
+++ b/examples/blockWorld.js
@@ -104,7 +104,7 @@ function generateFloor() {
green: randFloat(70, 71),
blue: randFloat(70, 80)
},
- // collisionsWillMove: true
+ // dynamic: true
}));
}
@@ -132,7 +132,7 @@ function dropBlock() {
shapeType: 'box',
position: dropPos,
dimensions: BLOCK_SIZE,
- collisionsWillMove: true,
+ dynamic: true,
gravity: {
x: 0,
y: -9,
@@ -198,4 +198,4 @@ function map(value, min1, max1, min2, max2) {
}
Script.scriptEnding.connect(cleanup);
-Controller.mousePressEvent.connect(mousePressEvent);
\ No newline at end of file
+Controller.mousePressEvent.connect(mousePressEvent);
diff --git a/examples/blocks.js b/examples/blocks.js
index 29ccd9fff0..a52c7c278e 100644
--- a/examples/blocks.js
+++ b/examples/blocks.js
@@ -101,7 +101,7 @@ for (var i = 0; i < NUM_BLOCKS; i++) {
ignoreCollisions: false,
damping: DAMPING,
lifetime: LIFETIME,
- collisionsWillMove: true }));
+ dynamic: true }));
}
function scriptEnding() {
@@ -121,4 +121,4 @@ function scriptEnding() {
}
}
-Script.scriptEnding.connect(scriptEnding);
\ No newline at end of file
+Script.scriptEnding.connect(scriptEnding);
diff --git a/examples/controllers/hydra/gun.js b/examples/controllers/hydra/gun.js
index 576c4335f6..42dd1144eb 100644
--- a/examples/controllers/hydra/gun.js
+++ b/examples/controllers/hydra/gun.js
@@ -234,7 +234,7 @@ function shootBullet(position, velocity, grenade) {
damping: 0.01,
density: 8000,
ignoreCollisions: false,
- collisionsWillMove: true
+ dynamic: true
});
Script.addEventHandler(bulletID, "collisionWithEntity", entityCollisionWithEntity);
@@ -294,7 +294,7 @@ function shootTarget() {
rotation: Camera.getOrientation(),
damping: 0.1,
density: 100.0,
- collisionsWillMove: true
+ dynamic: true
});
// Record start time
@@ -349,7 +349,7 @@ function makeGrid(type, scale, size) {
rotation: Camera.getOrientation(),
damping: 0.1,
density: 100.0,
- collisionsWillMove: true
+ dynamic: true
});
}
}
@@ -401,7 +401,7 @@ function makePlatform(gravity, scale, size) {
lifetime: TARGET_LIFE,
damping: 0.1,
density: 100.0,
- collisionsWillMove: true
+ dynamic: true
});
}
}
diff --git a/examples/controllers/hydra/paddleBall.js b/examples/controllers/hydra/paddleBall.js
index d90a78c260..9bf558ef21 100644
--- a/examples/controllers/hydra/paddleBall.js
+++ b/examples/controllers/hydra/paddleBall.js
@@ -59,7 +59,7 @@ function createEntities() {
gravity: { x: 0, y: GRAVITY, z: 0 },
ignoreCollisions: false,
damping: 0.50,
- collisionsWillMove: true });
+ dynamic: true });
paddle = Entities.addEntity(
{ type: "Box",
@@ -71,7 +71,7 @@ function createEntities() {
damping: 0.10,
visible: false,
rotation : leftHanded ? MyAvatar.leftHandPose.rotation : MyAvatar.rightHandPose.rotation,
- collisionsWillMove: false });
+ dynamic: false });
modelURL = "http://public.highfidelity.io/models/attachments/pong_paddle.fbx";
paddleModel = Entities.addEntity(
@@ -84,7 +84,7 @@ function createEntities() {
modelURL: modelURL,
damping: 0.10,
rotation : leftHanded ? MyAvatar.leftHandPose.rotation : MyAvatar.rightHandPose.rotation,
- collisionsWillMove: false });
+ dynamic: false });
line = Overlays.addOverlay("line3d", {
start: { x: 0, y: 0, z: 0 },
diff --git a/examples/controllers/hydra/toyball.js b/examples/controllers/hydra/toyball.js
index 10f8a82ec9..0d5faea317 100644
--- a/examples/controllers/hydra/toyball.js
+++ b/examples/controllers/hydra/toyball.js
@@ -154,7 +154,7 @@ function checkControllerSide(whichSide) {
dimensions: { x: BALL_RADIUS * 2, y: BALL_RADIUS * 2, z: BALL_RADIUS * 2 },
damping: 0.00001,
shapeType: "sphere",
- collisionsWillMove: false,
+ dynamic: false,
color: HELD_COLOR,
lifetime: LIFETIME_SECONDS
};
@@ -200,7 +200,7 @@ function checkControllerSide(whichSide) {
velocity: linearVelocity,
rotation: palmRotation,
angularVelocity: angularVelocity,
- collisionsWillMove: true,
+ dynamic: true,
color: THROWN_COLOR,
gravity: { x: 0, y: -GRAVITY_STRENGTH, z: 0},
};
diff --git a/examples/controllers/toybox.js b/examples/controllers/toybox.js
index bf03974fda..9ca0a069fc 100644
--- a/examples/controllers/toybox.js
+++ b/examples/controllers/toybox.js
@@ -175,7 +175,7 @@ function createTable() {
damping: 0.1,
restitution: 0.01,
density: 0.5,
- collisionsWillMove: true,
+ dynamic: true,
color: { red: randInt(0, 255), green: randInt(0, 255), blue: randInt(0, 255) },
});
if (type == "Model") {
@@ -196,4 +196,4 @@ function removeTable() {
}
Script.scriptEnding.connect(cleanUp);
-Controller.mousePressEvent.connect(onClick);
\ No newline at end of file
+Controller.mousePressEvent.connect(onClick);
diff --git a/examples/cubePerfTest.js b/examples/cubePerfTest.js
index f2f4d48b22..7e26556891 100644
--- a/examples/cubePerfTest.js
+++ b/examples/cubePerfTest.js
@@ -42,7 +42,7 @@ for (var x = 0; x < SIDE_SIZE; x++) {
dimensions: { x: radius, y: radius, z: radius },
color: color,
ignoreCollisions: true,
- collisionsWillMove: false,
+ dynamic: false,
lifetime: LIFETIME
}));
}
diff --git a/examples/data_visualization/earthquakes_live.js b/examples/data_visualization/earthquakes_live.js
index 8594f827a0..ad0c9ec6a6 100644
--- a/examples/data_visualization/earthquakes_live.js
+++ b/examples/data_visualization/earthquakes_live.js
@@ -51,7 +51,7 @@ function createEarth() {
z: EARTH_SPHERE_RADIUS
},
rotation: Quat.fromPitchYawRollDegrees(0, 90, 0),
- // collisionsWillMove: true,
+ // dynamic: true,
//if you have a shapetype it blocks the smaller markers
// shapeType:'sphere'
// userData: JSON.stringify({
diff --git a/examples/debugging/grabInspector.js b/examples/debugging/grabInspector.js
index aeea2c20b4..11367d8832 100644
--- a/examples/debugging/grabInspector.js
+++ b/examples/debugging/grabInspector.js
@@ -108,7 +108,7 @@ Script.setInterval(function() {
var grabData = userData["grabKey"]
// {"grabbableKey":{"invertSolidWhileHeld":true},
- // "grabKey":{"activated":true,"avatarId":"{6ea8b092-10e0-4058-888b-6facc40d0fe9}","refCount":1,"gravity":{"x":0,"y":0,"z":0},"ignoreForCollisions":0,"collisionsWillMove":1}
+ // "grabKey":{"activated":true,"avatarId":"{6ea8b092-10e0-4058-888b-6facc40d0fe9}","refCount":1,"gravity":{"x":0,"y":0,"z":0},"ignoreForCollisions":0,"dynamic":1}
// }
if (typeof grabData != 'undefined') {
diff --git a/examples/dice.js b/examples/dice.js
index 29b522f16b..f687a3823b 100644
--- a/examples/dice.js
+++ b/examples/dice.js
@@ -110,7 +110,7 @@ function shootDice(position, velocity) {
},
lifetime: LIFETIME,
shapeType: "box",
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav"
}));
position = Vec3.sum(position, Vec3.multiply(DIE_SIZE, Vec3.normalize(Quat.getRight(Camera.getOrientation()))));
@@ -151,4 +151,4 @@ function scriptEnding() {
}
Controller.mousePressEvent.connect(mousePressEvent);
-Script.scriptEnding.connect(scriptEnding);
\ No newline at end of file
+Script.scriptEnding.connect(scriptEnding);
diff --git a/examples/dropStuffNearMe.js b/examples/dropStuffNearMe.js
index 1c7c1f4f48..89a1e14a10 100644
--- a/examples/dropStuffNearMe.js
+++ b/examples/dropStuffNearMe.js
@@ -77,7 +77,7 @@ Script.setInterval(function () {
damping: DAMPING,
angularDamping: ANGULAR_DAMPING,
gravity: (gravity ? GRAVITY : { x: 0, y: 0, z: 0}),
- collisionsWillMove: collidable,
+ dynamic: collidable,
lifetime: LIFETIME
});
diff --git a/examples/drylake/createAvatarDetector.js b/examples/drylake/createAvatarDetector.js
index 51ca55248e..c858512ba0 100644
--- a/examples/drylake/createAvatarDetector.js
+++ b/examples/drylake/createAvatarDetector.js
@@ -24,7 +24,7 @@ function createAvatarDetector() {
y: 2,
z: 1
},
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
visible: false,
color: {
@@ -52,4 +52,4 @@ var cleanup = function() {
createAvatarDetector();
Script.scriptEnding.connect(cleanup);
-Script.update.connect(updateAvatarDetector);
\ No newline at end of file
+Script.update.connect(updateAvatarDetector);
diff --git a/examples/drylake/explodeHelicopter.js b/examples/drylake/explodeHelicopter.js
index efca1a91cc..6275a9f43b 100644
--- a/examples/drylake/explodeHelicopter.js
+++ b/examples/drylake/explodeHelicopter.js
@@ -56,7 +56,7 @@ function explodeHelicopter(explodePosition) {
dimensions: partsURLS[i].dimensions,
position: position,
shapeType: "box",
- collisionsWillMove: true,
+ dynamic: true,
damping: 0,
gravity: {
x: 0,
@@ -141,4 +141,4 @@ function cleanup() {
})
}
-Script.scriptEnding.connect(cleanup);
\ No newline at end of file
+Script.scriptEnding.connect(cleanup);
diff --git a/examples/drylake/ratCreator.js b/examples/drylake/ratCreator.js
index 237b8ec32f..60a026084e 100644
--- a/examples/drylake/ratCreator.js
+++ b/examples/drylake/ratCreator.js
@@ -90,7 +90,7 @@ var modelRatProperties = {
damping: 0.8,
angularDamping: 0.99,
friction: 0.75,
- collisionsWillMove: true,
+ dynamic: true,
ignoreForCollisions: false,
gravity: {
x: 0,
@@ -194,7 +194,7 @@ function addAvoiderBlock(position) {
z: 1
},
position: position,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
visible: false
};
@@ -468,4 +468,4 @@ if (USE_CONSTANT_SPAWNER === true) {
}
}, RAT_SPAWN_RATE);
- }
\ No newline at end of file
+ }
diff --git a/examples/example/brownianFun.js b/examples/example/brownianFun.js
index b7f7fe3b32..533fb170dd 100644
--- a/examples/example/brownianFun.js
+++ b/examples/example/brownianFun.js
@@ -165,7 +165,7 @@ function spawnBalls() {
blue: randFloat(10, 180)
},
ignoreCollisions: false,
- collisionsWillMove: true,
+ dynamic: true,
gravity: {
x: 0,
y: -9.9,
@@ -244,4 +244,4 @@ Script.scriptEnding.connect(cleanup);
Script.scriptEnding.connect(cleanup);
-Controller.mousePressEvent.connect(mousePressEvent);
\ No newline at end of file
+Controller.mousePressEvent.connect(mousePressEvent);
diff --git a/examples/example/entities/collidingEntities.js b/examples/example/entities/collidingEntities.js
index 37c35e971d..65bbaf7d02 100644
--- a/examples/example/entities/collidingEntities.js
+++ b/examples/example/entities/collidingEntities.js
@@ -43,7 +43,7 @@ function draw(deltaTime) {
var properties = {
type: "Sphere",
- collisionsWillMove: true,
+ dynamic: true,
position: startPosition,
dimensions: {x: largeRadius, y: largeRadius, z: largeRadius},
registrationPoint: { x: 0.5, y: 0.5, z: 0.5 },
@@ -84,7 +84,7 @@ function draw(deltaTime) {
if (numberEntitiesAdded <= MAX_ENTITIES) {
var properties = {
type: "Sphere",
- collisionsWillMove: true,
+ dynamic: true,
position: center,
dimensions: {x: entitySize, y: entitySize, z: entitySize},
registrationPoint: { x: 0.5, y: 0.5, z: 0.5 },
diff --git a/examples/example/entityCollisionExample.js b/examples/example/entityCollisionExample.js
index de50d52753..ae8594e3b0 100644
--- a/examples/example/entityCollisionExample.js
+++ b/examples/example/entityCollisionExample.js
@@ -19,7 +19,7 @@ var position = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));
var properties = {
type: "Box",
position: position,
- collisionsWillMove: true,
+ dynamic: true,
color: { red: 200, green: 0, blue: 0 }
};
var collider = Entities.addEntity(properties);
diff --git a/examples/example/games/airHockey.js b/examples/example/games/airHockey.js
index ca7f007df6..ffd237c89c 100755
--- a/examples/example/games/airHockey.js
+++ b/examples/example/games/airHockey.js
@@ -177,7 +177,7 @@ function makeNewProp(which, position) {
damping: PUCK_DAMPING,
angularDamping: ANGULAR_DAMPING,
lifetime: LIFETIME,
- collisionsWillMove: true
+ dynamic: true
});
} else if (which == "paddle1") {
paddle1Pos = Vec3.sum(center, {
@@ -211,7 +211,7 @@ function makeNewProp(which, position) {
damping: PADDLE_DAMPING,
angularDamping: PADDLE_ANGULAR_DAMPING,
lifetime: LIFETIME,
- collisionsWillMove: true
+ dynamic: true
});
} else if (which == "paddle2") {
paddle2Pos = Vec3.sum(center, {
@@ -245,7 +245,7 @@ function makeNewProp(which, position) {
damping: PADDLE_DAMPING,
angularDamping: PADDLE_ANGULAR_DAMPING,
lifetime: LIFETIME,
- collisionsWillMove: true
+ dynamic: true
});
}
}
diff --git a/examples/example/games/billiards.js b/examples/example/games/billiards.js
index c110b33042..f1329987b2 100644
--- a/examples/example/games/billiards.js
+++ b/examples/example/games/billiards.js
@@ -128,7 +128,7 @@ function makeBalls(pos) {
damping: 0.50,
shapeType: "sphere",
collisionSoundURL: hitSound,
- collisionsWillMove: true }));
+ dynamic: true }));
ballPosition.z += (BALL_SIZE + BALL_GAP) * SCALE;
ballNumber++;
}
@@ -149,7 +149,7 @@ function makeBalls(pos) {
ignoreCollisions: false,
damping: 0.50,
shapeType: "sphere",
- collisionsWillMove: true });
+ dynamic: true });
}
@@ -184,7 +184,7 @@ function shootCue(velocity) {
damping: 0.10,
density: 8000,
ignoreCollisions: false,
- collisionsWillMove: true
+ dynamic: true
});
print("Shot, velocity = " + velocity);
}
diff --git a/examples/example/games/color_busters/colorBusterWand.js b/examples/example/games/color_busters/colorBusterWand.js
index f9d69e8414..825883d3fd 100644
--- a/examples/example/games/color_busters/colorBusterWand.js
+++ b/examples/example/games/color_busters/colorBusterWand.js
@@ -219,7 +219,7 @@
type: 'Box',
dimensions: COLOR_INDICATOR_DIMENSIONS,
position: this.currentProperties.position,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true
}
@@ -262,4 +262,4 @@
};
return new ColorBusterWand();
-});
\ No newline at end of file
+});
diff --git a/examples/example/games/color_busters/createColorBusterCubes.js b/examples/example/games/color_busters/createColorBusterCubes.js
index 3fdd772704..bcec021676 100644
--- a/examples/example/games/color_busters/createColorBusterCubes.js
+++ b/examples/example/games/color_busters/createColorBusterCubes.js
@@ -81,7 +81,7 @@ function createColorBusterCube(row, column, vertical) {
name: 'Hifi-ColorBusterCube',
type: 'Box',
dimensions: CUBE_DIMENSIONS,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: false,
color: startingColor[1],
position: position,
@@ -127,4 +127,4 @@ if (DELETE_AT_ENDING === true) {
}
-createBoard();
\ No newline at end of file
+createBoard();
diff --git a/examples/example/games/color_busters/createColorBusterWand.js b/examples/example/games/color_busters/createColorBusterWand.js
index a08f529aa8..d57b5ab3b6 100644
--- a/examples/example/games/color_busters/createColorBusterWand.js
+++ b/examples/example/games/color_busters/createColorBusterWand.js
@@ -71,7 +71,7 @@ function createColorBusterWand() {
dimensions: COLOR_WAND_DIMENSIONS,
position: center,
script: COLOR_WAND_SCRIPT_URL,
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
hifiColorBusterWandKey: {
owner: MyAvatar.sessionUUID,
@@ -96,4 +96,4 @@ if (DELETE_AT_ENDING === true) {
Script.scriptEnding.connect(deleteWand);
}
-createColorBusterWand();
\ No newline at end of file
+createColorBusterWand();
diff --git a/examples/example/games/exterminatorGame/pistol.js b/examples/example/games/exterminatorGame/pistol.js
index e1923835c3..2cccf95986 100644
--- a/examples/example/games/exterminatorGame/pistol.js
+++ b/examples/example/games/exterminatorGame/pistol.js
@@ -169,8 +169,8 @@ function fire(side, value) {
if (intersection.intersects) {
Script.setTimeout(function() {
createEntityHitEffect(intersection.intersection);
- if (shootAnything && intersection.properties.collisionsWillMove === 1) {
- // Any entity with collisions will move can be shot
+ if (shootAnything && intersection.properties.dynamic === 1) {
+ // Any dynamic entity can be shot
Entities.editEntity(intersection.entityID, {
velocity: Vec3.multiply(shotDirection, GUN_FORCE)
});
diff --git a/examples/example/games/grabHockey.js b/examples/example/games/grabHockey.js
index fc21caee1d..961a8af6ad 100644
--- a/examples/example/games/grabHockey.js
+++ b/examples/example/games/grabHockey.js
@@ -142,7 +142,7 @@ function mousePressEvent(event) {
if (!pickResults.intersects) {
return;
}
- if (pickResults.properties.collisionsWillMove) {
+ if (pickResults.properties.dynamic) {
grabbedEntity = pickResults.entityID;
var props = Entities.getEntityProperties(grabbedEntity)
originalGravity = props.gravity;
diff --git a/examples/example/games/hydraGrabHockey.js b/examples/example/games/hydraGrabHockey.js
index 26f9a443ab..e7d6746309 100644
--- a/examples/example/games/hydraGrabHockey.js
+++ b/examples/example/games/hydraGrabHockey.js
@@ -190,7 +190,7 @@ function controller(side) {
direction: Vec3.normalize(Vec3.subtract(this.tipPosition, this.palmPosition))
};
var intersection = getRayIntersection(pickRay, true);
- if (intersection.intersects && intersection.properties.collisionsWillMove) {
+ if (intersection.intersects && intersection.properties.dynamic) {
this.laserWasHovered = true;
if (this.triggerHeld && !this.grabbing) {
this.grab(intersection.entityID);
@@ -298,4 +298,4 @@ var leftController = new controller(LEFT);
Script.update.connect(update);
-Script.scriptEnding.connect(scriptEnding);
\ No newline at end of file
+Script.scriptEnding.connect(scriptEnding);
diff --git a/examples/example/games/make-dummy.js b/examples/example/games/make-dummy.js
index 068a8b7f9a..c74433aedf 100644
--- a/examples/example/games/make-dummy.js
+++ b/examples/example/games/make-dummy.js
@@ -49,7 +49,7 @@ function mousePressEvent(event) {
dimensions: {x: 0.3, y: 0.7, z: 0.3},
gravity: {x: 0.0, y: -3.0, z: 0.0},
damping: 0.2,
- collisionsWillMove: true
+ dynamic: true
});
var pointToOffsetFrom = Vec3.sum(position, {x: 0.0, y: 2.0, z: 0.0});
diff --git a/examples/example/games/planky.js b/examples/example/games/planky.js
index 78e7bf9cbe..5f16097bb1 100644
--- a/examples/example/games/planky.js
+++ b/examples/example/games/planky.js
@@ -289,7 +289,7 @@ PlankyStack = function() {
}
if (!editMode) {
_this.planks.forEach(function(plank, index, object) {
- Entities.editEntity(plank.entity, {ignoreForCollisions: false, collisionsWillMove: true});
+ Entities.editEntity(plank.entity, {ignoreForCollisions: false, dynamic: true});
});
}
};
diff --git a/examples/example/games/satellite.js b/examples/example/games/satellite.js
index 9ae0105917..2d71be8ed8 100644
--- a/examples/example/games/satellite.js
+++ b/examples/example/games/satellite.js
@@ -67,7 +67,7 @@ SatelliteCreator = function() {
damping: 0.0,
ignoreCollisions: false,
lifetime: 6000,
- collisionsWillMove: false,
+ dynamic: false,
visible: true
});
@@ -90,7 +90,7 @@ SatelliteCreator = function() {
damping: 0.0,
ignoreCollisions: false,
lifetime: LIFETIME,
- collisionsWillMove: false,
+ dynamic: false,
visible: true
});
@@ -174,7 +174,7 @@ SatelliteCreator = function() {
damping: 0.0,
ignoreCollisions: false,
lifetime: LIFETIME,
- collisionsWillMove: false,
+ dynamic: false,
});
this.getProperties = function() {
diff --git a/examples/example/games/spaceInvadersExample.js b/examples/example/games/spaceInvadersExample.js
index 330351e009..df7649d942 100644
--- a/examples/example/games/spaceInvadersExample.js
+++ b/examples/example/games/spaceInvadersExample.js
@@ -191,7 +191,7 @@ function initializeInvaders() {
dimensions: { x: invaderSize * 2, y: invaderSize * 2, z: invaderSize * 2 },
color: { red: 255, green: 0, blue: 0 },
modelURL: invaderModels[row].modelURL,
- collisionsWillMove: true,
+ dynamic: true,
lifetime: itemLifetimes
});
}
@@ -341,7 +341,7 @@ function fireMissile() {
velocity: { x: 0, y: 5, z: 0},
gravity: { x: 0, y: 0, z: 0 },
damping: 0,
- collisionsWillMove: true,
+ dynamic: true,
dimensions: { x: missileSize, y: missileSize, z: missileSize },
color: { red: 0, green: 0, blue: 255 },
lifetime: 5
diff --git a/examples/example/games/sword.js b/examples/example/games/sword.js
index 31a9a82d87..6000ea52fe 100644
--- a/examples/example/games/sword.js
+++ b/examples/example/games/sword.js
@@ -286,7 +286,7 @@ function makeSword() {
damping: 0.1,
collisionSoundURL: swordCollisionSoundURL,
restitution: 0.01,
- collisionsWillMove: true,
+ dynamic: true,
});
if (originalAvatarCollisionSound === undefined) {
diff --git a/examples/example/hmd/colorCube.js b/examples/example/hmd/colorCube.js
index a138f38190..4acde2951f 100644
--- a/examples/example/hmd/colorCube.js
+++ b/examples/example/hmd/colorCube.js
@@ -30,7 +30,7 @@ ColorCube.prototype.create = function() {
name: that.NAME,
color: that.COLOR,
ignoreCollisions: true,
- collisionsWillMove: false,
+ dynamic: false,
dimensions: { x: size, y: size, z: size },
lifetime: 3600,
userData: JSON.stringify(that.USER_DATA)
diff --git a/examples/example/solarsystem.js b/examples/example/solarsystem.js
index 7b9967b001..6d28a6c8a9 100644
--- a/examples/example/solarsystem.js
+++ b/examples/example/solarsystem.js
@@ -55,7 +55,7 @@ CreateSimulation = function() {
damping: DAMPING,
ignoreCollisions: false,
lifetime: LIFETIME,
- collisionsWillMove: false
+ dynamic: false
});
@@ -187,7 +187,7 @@ CreateSimulation = function() {
damping: DAMPING,
ignoreCollisions: false,
lifetime: LIFETIME,
- collisionsWillMove: false,
+ dynamic: false,
});
this.computeAcceleration = function() {
diff --git a/examples/example/soundToys.js b/examples/example/soundToys.js
index 9d8c824b90..d46d5d8b60 100644
--- a/examples/example/soundToys.js
+++ b/examples/example/soundToys.js
@@ -37,7 +37,7 @@ function makeAll() {
type: "Model",
modelURL: HIFI_PUBLIC_BUCKET + model,
collisionSoundURL: sound,
- collisionsWillMove: true,
+ dynamic: true,
shapeType: "box",
restitution: 0.8,
dimensions: currentDimensions,
diff --git a/examples/flowArts/arcBall/arcBall.js b/examples/flowArts/arcBall/arcBall.js
index 12ef2df48a..1c8d7cf3c8 100644
--- a/examples/flowArts/arcBall/arcBall.js
+++ b/examples/flowArts/arcBall/arcBall.js
@@ -46,7 +46,7 @@ ArcBall = function(spawnPosition) {
},
ignoreForCollisions: true,
damping: 0.8,
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
grabbableKey: {
spatialKey: {
@@ -142,4 +142,4 @@ ArcBall = function(spawnPosition) {
}
this.cleanup = cleanup;
-}
\ No newline at end of file
+}
diff --git a/examples/flowArts/lightBall/lightBall.js b/examples/flowArts/lightBall/lightBall.js
index b2ed00f326..bbeac3a357 100644
--- a/examples/flowArts/lightBall/lightBall.js
+++ b/examples/flowArts/lightBall/lightBall.js
@@ -41,7 +41,7 @@ LightBall = function(spawnPosition) {
green: 10,
blue: 150
},
- collisionsWillMove: true,
+ dynamic: true,
// gravity: {
// x: 0,
// y: -0.5,
diff --git a/examples/flowArts/lightSaber/lightSaber.js b/examples/flowArts/lightSaber/lightSaber.js
index c4ab49e8e6..a6f14ebe7b 100644
--- a/examples/flowArts/lightSaber/lightSaber.js
+++ b/examples/flowArts/lightSaber/lightSaber.js
@@ -23,7 +23,7 @@ LightSaber = function(spawnPosition) {
modelURL: modelURL,
position: spawnPosition,
shapeType: 'box',
- collisionsWillMove: true,
+ dynamic: true,
script: scriptURL,
dimensions: {
x: 0.06,
diff --git a/examples/flowArts/raveStick/raveStick.js b/examples/flowArts/raveStick/raveStick.js
index d1180e2b34..3b51430f91 100644
--- a/examples/flowArts/raveStick/raveStick.js
+++ b/examples/flowArts/raveStick/raveStick.js
@@ -33,7 +33,7 @@ RaveStick = function(spawnPosition) {
modelURL: modelURL,
position: spawnPosition,
shapeType: 'box',
- collisionsWillMove: true,
+ dynamic: true,
script: scriptURL,
dimensions: {
x: 0.06,
diff --git a/examples/grab.js b/examples/grab.js
index cb0723b8eb..64a8ea16e2 100644
--- a/examples/grab.js
+++ b/examples/grab.js
@@ -320,7 +320,7 @@ Grabber.prototype.pressEvent = function(event) {
return;
}
- if (!pickResults.properties.collisionsWillMove) {
+ if (!pickResults.properties.dynamic) {
// only grab dynamic objects
return;
}
@@ -510,7 +510,7 @@ Grabber.prototype.activateEntity = function(entityID, grabbedProperties) {
if (data["refCount"] == 1) {
data["gravity"] = grabbedProperties.gravity;
data["ignoreForCollisions"] = grabbedProperties.ignoreForCollisions;
- data["collisionsWillMove"] = grabbedProperties.collisionsWillMove;
+ data["dynamic"] = grabbedProperties.dynamic;
var whileHeldProperties = {gravity: {x:0, y:0, z:0}};
if (invertSolidWhileHeld) {
whileHeldProperties["ignoreForCollisions"] = ! grabbedProperties.ignoreForCollisions;
@@ -528,7 +528,7 @@ Grabber.prototype.deactivateEntity = function(entityID) {
Entities.editEntity(entityID, {
gravity: data["gravity"],
ignoreForCollisions: data["ignoreForCollisions"],
- collisionsWillMove: data["collisionsWillMove"]
+ dynamic: data["dynamic"]
});
data = null;
}
diff --git a/examples/grenade.js b/examples/grenade.js
index 7b987b1091..ab0e6b5a47 100644
--- a/examples/grenade.js
+++ b/examples/grenade.js
@@ -52,7 +52,7 @@ function makeGrenade() {
dimensions: { x: 0.09,
y: 0.20,
z: 0.09 },
- collisionsWillMove: true,
+ dynamic: true,
modelURL: grenadeURL,
shapeType: "box"
});
@@ -160,7 +160,7 @@ function blowShitUp(position, radius) {
var SPIN_RATE = 20.0;
for (var i = 0; i < stuff.length; i++) {
var properties = Entities.getEntityProperties(stuff[i]);
- if (properties.collisionsWillMove) {
+ if (properties.dynamic) {
var diff = Vec3.subtract(properties.position, position);
var distance = Vec3.length(diff);
var velocity = Vec3.sum(properties.velocity, Vec3.multiply(STRENGTH * 1.0 / distance, Vec3.normalize(diff)));
diff --git a/examples/gridTest.js b/examples/gridTest.js
index 2baa4650e3..0d6040470f 100644
--- a/examples/gridTest.js
+++ b/examples/gridTest.js
@@ -46,7 +46,7 @@ Script.setInterval(function () {
position: position,
dimensions: MODEL_DIMENSION,
ignoreCollisions: true,
- collisionsWillMove: false,
+ dynamic: false,
lifetime: LIFETIME
});
} else {
@@ -57,7 +57,7 @@ Script.setInterval(function () {
dimensions: { x: SIZE, y: SIZE, z: SIZE },
color: { red: x / ROWS_X * 255, green: 50, blue: z / ROWS_Z * 255 },
ignoreCollisions: true,
- collisionsWillMove: false,
+ dynamic: false,
lifetime: LIFETIME
});
}
diff --git a/examples/harmonicOscillator.js b/examples/harmonicOscillator.js
index 4cd2989f3d..953820922b 100644
--- a/examples/harmonicOscillator.js
+++ b/examples/harmonicOscillator.js
@@ -25,7 +25,7 @@ ball = Entities.addEntity(
position: basePosition,
dimensions: { x: 0.1, y: 0.1, z: 0.1 },
color: { red: 255, green: 0, blue: 255 },
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true
});
diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index daf85664fb..7ee86ac4b4 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -262,7 +262,7 @@
var elDensity = document.getElementById("property-density");
var elIgnoreForCollisions = document.getElementById("property-ignore-for-collisions");
- var elCollisionsWillMove = document.getElementById("property-collisions-will-move");
+ var elDynamic = document.getElementById("property-dyanmic" );
var elCollisionSoundURL = document.getElementById("property-collision-sound-url");
var elLifetime = document.getElementById("property-lifetime");
var elScriptURL = document.getElementById("property-script-url");
@@ -492,7 +492,7 @@
elDensity.value = properties.density.toFixed(2);
elIgnoreForCollisions.checked = properties.ignoreForCollisions;
- elCollisionsWillMove.checked = properties.collisionsWillMove;
+ elDynamic.checked = properties.dynamic;
elCollisionSoundURL.value = properties.collisionSoundURL;
elLifetime.value = properties.lifetime;
elScriptURL.value = properties.script;
@@ -719,7 +719,7 @@
elDensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('density'));
elIgnoreForCollisions.addEventListener('change', createEmitCheckedPropertyUpdateFunction('ignoreForCollisions'));
- elCollisionsWillMove.addEventListener('change', createEmitCheckedPropertyUpdateFunction('collisionsWillMove'));
+ elDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('dynamic'));
elCollisionSoundURL.addEventListener('change', createEmitTextPropertyUpdateFunction('collisionSoundURL'));
elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));
@@ -1242,9 +1242,9 @@
- Collisions Will Move
+ Dynamic
-
+
diff --git a/examples/libraries/easyStarExample.js b/examples/libraries/easyStarExample.js
index 76c791a81f..67811e2b72 100644
--- a/examples/libraries/easyStarExample.js
+++ b/examples/libraries/easyStarExample.js
@@ -75,7 +75,7 @@ var playerSphere = Entities.addEntity({
y: -9.8,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
damping: 0.2
});
@@ -267,4 +267,4 @@ function cleanup() {
}
-Script.scriptEnding.connect(cleanup);
\ No newline at end of file
+Script.scriptEnding.connect(cleanup);
diff --git a/examples/libraries/entityPropertyDialogBox.js b/examples/libraries/entityPropertyDialogBox.js
index 39ffbed629..2b720392b0 100644
--- a/examples/libraries/entityPropertyDialogBox.js
+++ b/examples/libraries/entityPropertyDialogBox.js
@@ -201,7 +201,7 @@ EntityPropertyDialogBox = (function () {
index++;
array.push({ label: "Ignore for Collisions:", type: "checkbox", value: properties.ignoreForCollisions });
index++;
- array.push({ label: "Collisions Will Move:", type: "checkbox", value: properties.collisionsWillMove });
+ array.push({ label: "Dynamic:", type: "checkbox", value: properties.dynamic });
index++;
array.push({ label: "Collision Sound URL:", value: properties.collisionSoundURL });
index++;
@@ -413,7 +413,7 @@ EntityPropertyDialogBox = (function () {
index++; // skip header
properties.density = array[index++].value;
properties.ignoreForCollisions = array[index++].value;
- properties.collisionsWillMove = array[index++].value;
+ properties.dynamic = array[index++].value;
properties.lifetime = array[index++].value;
properties.visible = array[index++].value;
diff --git a/examples/light_modifier/lightModifier.js b/examples/light_modifier/lightModifier.js
index b50bbe9478..84ef3430fc 100644
--- a/examples/light_modifier/lightModifier.js
+++ b/examples/light_modifier/lightModifier.js
@@ -227,7 +227,7 @@ entitySlider.prototype = {
type: 'Line',
name: 'Hifi-Slider-Axis::' + this.sliderType,
color: this.color,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
dimensions: {
x: 3,
@@ -250,7 +250,7 @@ entitySlider.prototype = {
var properties = {
name: 'Hifi-End-Of-Axis',
type: 'Box',
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
dimensions: {
x: 0.01,
@@ -360,7 +360,7 @@ entitySlider.prototype = {
type: 'Sphere',
name: 'Hifi-Slider-' + this.sliderType,
dimensions: SLIDER_DIMENSIONS,
- collisionsWillMove: true,
+ dynamic: true,
color: this.color,
position: sliderPosition,
script: SLIDER_SCRIPT_URL,
@@ -558,7 +558,7 @@ function createPanelEntity(position) {
z: 0.1
},
visible: false,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true
}
@@ -582,7 +582,7 @@ function createVisiblePanel() {
z: SLIDER_DIMENSIONS.z / 4
},
visible: true,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
position: moveDown,
rotation: avatarRot,
@@ -602,7 +602,7 @@ function createLightModel(position, rotation) {
shapeType: 'box',
modelURL: LIGHT_MODEL_URL,
dimensions: LIGHT_MODEL_DIMENSIONS,
- collisionsWillMove: true,
+ dynamic: true,
position: position,
rotation: rotation,
script: PARENT_SCRIPT_URL,
@@ -639,7 +639,7 @@ function createCloseButton(axisStart) {
position: Vec3.sum(position, VERTICAL_OFFFSET),
rotation: Quat.multiply(avatarRot, Quat.fromPitchYawRollDegrees(90, 0, 45)),
//rotation: Quat.fromPitchYawRollDegrees(0, 0, 90),
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
script: CLOSE_BUTTON_SCRIPT_URL,
userData: JSON.stringify({
@@ -873,4 +873,4 @@ subscribeToCleanupMessages();
// linearAttenuation: 0,
// quadraticAttenuation: 0,
// exponent: 0,
-// cutoff: 180, // in degrees
\ No newline at end of file
+// cutoff: 180, // in degrees
diff --git a/examples/lotsoBlocks.js b/examples/lotsoBlocks.js
index 63ed774d2d..3539988f0b 100644
--- a/examples/lotsoBlocks.js
+++ b/examples/lotsoBlocks.js
@@ -42,7 +42,7 @@ for (var i = 0; i < NUM_BLOCKS; i++) {
z: basePosition.z + randFloat(-SPAWN_RANGE, SPAWN_RANGE)
},
color: {red: Math.random() * 255, green: Math.random() * 255, blue: Math.random() * 255},
- collisionsWillMove: true,
+ dynamic: true,
gravity: {x: 0, y: 0, z: 0}
}));
}
@@ -60,4 +60,4 @@ Script.scriptEnding.connect(cleanup);
function randFloat(low, high) {
return low + Math.random() * ( high - low );
-}
\ No newline at end of file
+}
diff --git a/examples/magBalls/constants.js b/examples/magBalls/constants.js
index d9dee94329..3b06fcf167 100644
--- a/examples/magBalls/constants.js
+++ b/examples/magBalls/constants.js
@@ -39,7 +39,7 @@ BALL_PROTOTYPE = {
dimensions: BALL_DIMENSIONS,
color: BALL_COLOR,
ignoreCollisions: true,
- collisionsWillMove: false
+ dynamic: false
};
// 2 millimeters
@@ -62,7 +62,7 @@ LINE_PROTOTYPE = {
lineWidth: 5,
visible: true,
ignoreCollisions: true,
- collisionsWillMove: false,
+ dynamic: false,
}
EDGE_PROTOTYPE = LINE_PROTOTYPE;
@@ -76,7 +76,7 @@ EDGE_PROTOTYPE = LINE_PROTOTYPE;
// rotation: rotation,
// visible: true,
// ignoreCollisions: true,
-// collisionsWillMove: false
+// dynamic: false
// }
diff --git a/examples/particle_explorer/main.js b/examples/particle_explorer/main.js
index a2a112d8e5..3f15efb836 100644
--- a/examples/particle_explorer/main.js
+++ b/examples/particle_explorer/main.js
@@ -9,7 +9,7 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-/*global window, alert, EventBridge, dat, convertBinaryToBoolean, listenForSettingsUpdates,createVec3Folder,createQuatFolder,writeVec3ToInterface,writeDataToInterface*/
+/*global window, alert, EventBridge, dat, listenForSettingsUpdates,createVec3Folder,createQuatFolder,writeVec3ToInterface,writeDataToInterface*/
var Settings = function() {
this.exportSettings = function() {
@@ -66,7 +66,7 @@ var keysToIgnore = [
'angularVelocity',
'angularDamping',
'ignoreForCollisions',
- 'collisionsWillMove',
+ 'dynamic',
'href',
'actionData',
'marketplaceID',
@@ -502,11 +502,3 @@ function registerDOMElementsForListenerBlocking() {
});
}
-///utility method for converting weird collisionWillMove type propertyies from binary to new Boolean()
-//
-// function convertBinaryToBoolean(value) {
-// if (value === 0) {
-// return false;
-// }
-// return true;
-// }
\ No newline at end of file
diff --git a/examples/planets.js b/examples/planets.js
index 467c642fbf..1ab26b361b 100644
--- a/examples/planets.js
+++ b/examples/planets.js
@@ -58,7 +58,7 @@ for (var i = 0; i < planetTypes.length; i++) {
angularDamping: 0.0,
ignoreCollisions: false,
lifetime: LIFETIME,
- collisionsWillMove: false }));
+ dynamic: false }));
}
Script.setTimeout(createParticles, 1000);
@@ -82,7 +82,7 @@ function createParticles() {
ignoreCollisions: false,
damping: DAMPING,
lifetime: LIFETIME,
- collisionsWillMove: true }));
+ dynamic: true }));
}
Script.update.connect(update);
}
diff --git a/examples/playa/playaSpawner.js b/examples/playa/playaSpawner.js
index 61101a0e62..84a6093441 100644
--- a/examples/playa/playaSpawner.js
+++ b/examples/playa/playaSpawner.js
@@ -113,7 +113,7 @@ function spawnBoxes() {
collisionSoundURL: collisionSoundURL,
shapeType: "box",
position: position,
- collisionsWillMove: true,
+ dynamic: true,
dimensions: {x: 1, y: 2, z: 3},
velocity: {x: 0, y: -.01, z: 0},
gravity: {x: 0, y: -2.5 - Math.random() * 6, z: 0}
diff --git a/examples/popcorn.js b/examples/popcorn.js
index ec24b962f2..00e3014ada 100644
--- a/examples/popcorn.js
+++ b/examples/popcorn.js
@@ -148,7 +148,7 @@ for (var i = 0; i < NUM_BALLS; i++) {
ignoreCollisions: false,
damping: DAMPING,
lifetime: LIFETIME,
- collisionsWillMove: true }));
+ dynamic: true }));
}
var VEL_MAG = 2.0;
diff --git a/examples/stick-hydra.js b/examples/stick-hydra.js
index a74f7954bb..495ab7be5c 100644
--- a/examples/stick-hydra.js
+++ b/examples/stick-hydra.js
@@ -37,7 +37,7 @@ function makeNewStick() {
damping: .1,
collisionSoundURL: "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/67LCollision07.wav",
restitution: 0.01,
- collisionsWillMove: true
+ dynamic: true
});
actionID = Entities.addAction("hold", stickID,
{relativePosition: {x: 0.0, y: 0.0, z: -0.5},
diff --git a/examples/stick.js b/examples/stick.js
index 6683d8dcb6..7174addfc2 100644
--- a/examples/stick.js
+++ b/examples/stick.js
@@ -37,7 +37,7 @@ function makeNewStick() {
damping: .1,
collisionSoundURL: "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/67LCollision07.wav",
restitution: 0.01,
- collisionsWillMove: true
+ dynamic: true
});
actionID = Entities.addAction("hold", stickID, {relativePosition: {x: 0.0, y: 0.0, z: -0.9},
hand: hand,
diff --git a/examples/toybox/basketball/createRack.js b/examples/toybox/basketball/createRack.js
index aee492f684..995f5487f9 100644
--- a/examples/toybox/basketball/createRack.js
+++ b/examples/toybox/basketball/createRack.js
@@ -47,7 +47,7 @@ var rack = Entities.addEntity({
y: 1.37,
z: 1.73
},
- collisionsWillMove: true,
+ dynamic: true,
ignoreForCollisions: false,
collisionSoundURL: collisionSoundURL,
compoundShapeURL: rackCollisionHullURL,
@@ -89,7 +89,7 @@ function createBalls() {
y: -9.8,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
ignoreForCollisions: false,
modelURL: basketballURL,
userData: JSON.stringify({
@@ -150,4 +150,4 @@ function atEnd() {
Script.clearInterval(distanceCheckInterval);
}
-Script.scriptEnding.connect(atEnd);
\ No newline at end of file
+Script.scriptEnding.connect(atEnd);
diff --git a/examples/toybox/basketball/createSingleBasketball.js b/examples/toybox/basketball/createSingleBasketball.js
index 6765e5e075..7663b40c42 100644
--- a/examples/toybox/basketball/createSingleBasketball.js
+++ b/examples/toybox/basketball/createSingleBasketball.js
@@ -42,7 +42,7 @@ function makeBasketball() {
y: DIAMETER,
z: DIAMETER
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: collisionSoundURL,
modelURL: basketballURL,
restitution: 1.0,
@@ -94,4 +94,4 @@ function deleteStuff() {
}
Script.update.connect(update);
-Script.scriptEnding.connect(scriptEnding);
\ No newline at end of file
+Script.scriptEnding.connect(scriptEnding);
diff --git a/examples/toybox/blockers/createTestBlocks.js b/examples/toybox/blockers/createTestBlocks.js
index 10bdb14d76..487770b1bc 100644
--- a/examples/toybox/blockers/createTestBlocks.js
+++ b/examples/toybox/blockers/createTestBlocks.js
@@ -90,7 +90,7 @@ var topBlock = Entities.addEntity({
rotation: topBlock_rotation,
damping: LINEAR_DAMPING,
gravity: BLOCK_GRAVITY,
- collisionsWillMove: true,
+ dynamic: true,
velocity: {
x: 0,
y: -0.01,
@@ -108,7 +108,7 @@ var sideBlock1 = Entities.addEntity({
rotation: sideBlock1_rotation,
damping: LINEAR_DAMPING,
gravity: BLOCK_GRAVITY,
- collisionsWillMove: true
+ dynamic: true
});
var sideBlock2 = Entities.addEntity({
@@ -119,10 +119,10 @@ var sideBlock2 = Entities.addEntity({
dimensions: blockDimensions,
position: sideBlock2_position,
rotation: sideBlock2_rotation,
- collsionsWillMove: true,
+ dynamic: true,
damping: LINEAR_DAMPING,
gravity: BLOCK_GRAVITY,
- collisionsWillMove: true
+ dynamic: true
});
var ground = Entities.addEntity({
diff --git a/examples/toybox/bow/bow.js b/examples/toybox/bow/bow.js
index c04bb7a72c..5c27b61e9e 100644
--- a/examples/toybox/bow/bow.js
+++ b/examples/toybox/bow/bow.js
@@ -234,7 +234,7 @@
compoundShapeURL: ARROW_COLLISION_HULL_URL,
dimensions: ARROW_DIMENSIONS,
position: this.bowProperties.position,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
collisionSoundURL: ARROW_HIT_SOUND_URL,
damping: 0.01,
@@ -264,7 +264,7 @@
z: 0
},
position: collision.contactPoint,
- collisionsWillMove: false
+ dynamic: false
})
// print('ARROW COLLIDED WITH::' + entityB);
Script.removeEventHandler(arrow, "collisionWithEntity", makeArrowStick)
@@ -286,7 +286,7 @@
type: 'Line',
position: Vec3.sum(this.bowProperties.position, TOP_NOTCH_OFFSET),
dimensions: LINE_DIMENSIONS,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
userData: JSON.stringify({
grabbableKey: {
@@ -304,7 +304,7 @@
type: 'Line',
position: Vec3.sum(this.bowProperties.position, BOTTOM_NOTCH_OFFSET),
dimensions: LINE_DIMENSIONS,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
userData: JSON.stringify({
grabbableKey: {
@@ -389,7 +389,7 @@
position: Vec3.sum(this.bowProperties.position, TOP_NOTCH_OFFSET),
dimensions: LINE_DIMENSIONS,
visible: true,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
userData: JSON.stringify({
grabbableKey: {
@@ -538,7 +538,7 @@
//make the arrow physical, give it gravity, a lifetime, and set our velocity
var arrowProperties = {
- collisionsWillMove: true,
+ dynamic: true,
ignoreForCollisions: false,
collisionMask: "static,dynamic,otherAvatar", // workaround: not with kinematic --> no collision with bow
velocity: releaseVelocity,
diff --git a/examples/toybox/bow/createBow.js b/examples/toybox/bow/createBow.js
index 4f0cddfc0d..abe0238de1 100644
--- a/examples/toybox/bow/createBow.js
+++ b/examples/toybox/bow/createBow.js
@@ -39,7 +39,7 @@ var bow = Entities.addEntity({
modelURL: MODEL_URL,
position: center,
dimensions: BOW_DIMENSIONS,
- collisionsWillMove: true,
+ dynamic: true,
gravity: BOW_GRAVITY,
shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL,
@@ -68,4 +68,4 @@ function cleanup() {
Entities.deleteEntity(bow);
}
-Script.scriptEnding.connect(cleanup);
\ No newline at end of file
+Script.scriptEnding.connect(cleanup);
diff --git a/examples/toybox/bubblewand/createWand.js b/examples/toybox/bubblewand/createWand.js
index efd86b046f..d859d7cb9f 100644
--- a/examples/toybox/bubblewand/createWand.js
+++ b/examples/toybox/bubblewand/createWand.js
@@ -41,7 +41,7 @@ var wand = Entities.addEntity({
z: 0.05
},
//must be enabled to be grabbable in the physics engine
- collisionsWillMove: true,
+ dynamic: true,
compoundShapeURL: WAND_COLLISION_SHAPE,
script: WAND_SCRIPT_URL,
userData: JSON.stringify({
diff --git a/examples/toybox/bubblewand/wand.js b/examples/toybox/bubblewand/wand.js
index a6e4eae34d..02dcdb2cb9 100644
--- a/examples/toybox/bubblewand/wand.js
+++ b/examples/toybox/bubblewand/wand.js
@@ -71,7 +71,7 @@
addCollisionsToBubbleAfterCreation: function(bubble) {
//if the bubble collide immediately, we get weird effects. so we add collisions after release
Entities.editEntity(bubble, {
- collisionsWillMove: true
+ dynamic: true
});
},
randomizeBubbleGravity: function() {
@@ -161,7 +161,7 @@
modelURL: BUBBLE_MODEL,
position: this.getWandTipPosition(properties),
dimensions: BUBBLE_INITIAL_DIMENSIONS,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
damping: BUBBLE_LINEAR_DAMPING,
shapeType: "sphere"
@@ -198,4 +198,4 @@
return new BubbleWand();
-});
\ No newline at end of file
+});
diff --git a/examples/toybox/doll/createDoll.js b/examples/toybox/doll/createDoll.js
index 52ba5a5291..4a3f1cfbd8 100644
--- a/examples/toybox/doll/createDoll.js
+++ b/examples/toybox/doll/createDoll.js
@@ -47,7 +47,7 @@ function createDoll() {
y: 0,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
grabbableKey: {
invertSolidWhileHeld: true
@@ -57,4 +57,4 @@ function createDoll() {
return doll;
}
-createDoll();
\ No newline at end of file
+createDoll();
diff --git a/examples/toybox/flashlight/createFlashlight.js b/examples/toybox/flashlight/createFlashlight.js
index 108d519d3e..897ba516e1 100644
--- a/examples/toybox/flashlight/createFlashlight.js
+++ b/examples/toybox/flashlight/createFlashlight.js
@@ -33,7 +33,7 @@ var flashlight = Entities.addEntity({
y: 0.30,
z: 0.08
},
- collisionsWillMove: true,
+ dynamic: true,
shapeType: 'box',
script: scriptURL,
userData: JSON.stringify({
@@ -41,4 +41,4 @@ var flashlight = Entities.addEntity({
invertSolidWhileHeld: true
}
})
-});
\ No newline at end of file
+});
diff --git a/examples/toybox/ping_pong_gun/createPingPongGun.js b/examples/toybox/ping_pong_gun/createPingPongGun.js
index 7835dbf7f9..c8f7093b7e 100644
--- a/examples/toybox/ping_pong_gun/createPingPongGun.js
+++ b/examples/toybox/ping_pong_gun/createPingPongGun.js
@@ -34,7 +34,7 @@ var pingPongGun = Entities.addEntity({
y: 0.21,
z: 0.47
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: COLLISION_SOUND_URL,
userData: JSON.stringify({
grabbableKey: {
@@ -54,4 +54,4 @@ var pingPongGun = Entities.addEntity({
function cleanUp() {
Entities.deleteEntity(pingPongGun);
}
-Script.scriptEnding.connect(cleanUp);
\ No newline at end of file
+Script.scriptEnding.connect(cleanUp);
diff --git a/examples/toybox/ping_pong_gun/createTargets.js b/examples/toybox/ping_pong_gun/createTargets.js
index c421352a9d..baeca9c065 100644
--- a/examples/toybox/ping_pong_gun/createTargets.js
+++ b/examples/toybox/ping_pong_gun/createTargets.js
@@ -55,7 +55,7 @@ var targetIntervalClearer = Entities.addEntity({
},
rotation: rotation,
visible: false,
- collisionsWillMove: false,
+ dynamic: false,
ignoreForCollisions: true,
});
@@ -89,7 +89,7 @@ function addTargets() {
type: 'Model',
modelURL: MODEL_URL,
shapeType: 'compound',
- collisionsWillMove: true,
+ dynamic: true,
dimensions: TARGET_DIMENSIONS,
compoundShapeURL: COLLISION_HULL_URL,
position: position,
@@ -122,7 +122,7 @@ function testTargetDistanceFromStart() {
type: 'Model',
modelURL: MODEL_URL,
shapeType: 'compound',
- collisionsWillMove: true,
+ dynamic: true,
dimensions: TARGET_DIMENSIONS,
compoundShapeURL: COLLISION_HULL_URL,
position: originalPositions[index],
@@ -167,4 +167,4 @@ function atEnd() {
deleteTargets();
}
-Script.scriptEnding.connect(atEnd);
\ No newline at end of file
+Script.scriptEnding.connect(atEnd);
diff --git a/examples/toybox/ping_pong_gun/pingPongGun.js b/examples/toybox/ping_pong_gun/pingPongGun.js
index bd8b5f710d..5b928719fa 100644
--- a/examples/toybox/ping_pong_gun/pingPongGun.js
+++ b/examples/toybox/ping_pong_gun/pingPongGun.js
@@ -126,7 +126,7 @@
damping: BALL_LINEAR_DAMPING,
gravity: BALL_GRAVITY,
restitution: BALL_RESTITUTION,
- collisionsWillMove: true,
+ dynamic: true,
rotation: gunProperties.rotation,
position: this.getGunTipPosition(gunProperties),
velocity: forwardVec,
diff --git a/examples/toybox/pistol/createPistol.js b/examples/toybox/pistol/createPistol.js
index 693c53b9b4..8449a2234a 100644
--- a/examples/toybox/pistol/createPistol.js
+++ b/examples/toybox/pistol/createPistol.js
@@ -19,7 +19,7 @@ var pistol = Entities.addEntity({
blue: 20
},
shapeType: 'box',
- collisionsWillMove: true,
+ dynamic: true,
gravity: {x: 0, y: -5.0, z: 0},
restitution: 0,
collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav",
@@ -43,4 +43,4 @@ function cleanup() {
Entities.deleteEntity(pistol);
}
-Script.scriptEnding.connect(cleanup);
\ No newline at end of file
+Script.scriptEnding.connect(cleanup);
diff --git a/examples/toybox/pistol/pistol.js b/examples/toybox/pistol/pistol.js
index e0f063d463..6ed3407ea9 100644
--- a/examples/toybox/pistol/pistol.js
+++ b/examples/toybox/pistol/pistol.js
@@ -153,8 +153,8 @@
});
}, randFloat(10, 200));
}
- if (intersection.properties.collisionsWillMove === 1) {
- // Any entity with collisions will move can be shot
+ if (intersection.properties.dynamic === 1) {
+ // Any dynaic entity can be shot
Entities.editEntity(intersection.entityID, {
velocity: Vec3.multiply(this.firingDirection, this.bulletForce)
});
@@ -359,4 +359,4 @@
// entity scripts always need to return a newly constructed object of our type
return new Pistol();
-});
\ No newline at end of file
+});
diff --git a/examples/weapons/shootingRangeSpawner.js b/examples/weapons/shootingRangeSpawner.js
index e5e76a71fc..6d21d20d7f 100644
--- a/examples/weapons/shootingRangeSpawner.js
+++ b/examples/weapons/shootingRangeSpawner.js
@@ -62,7 +62,7 @@ function initMonsters() {
y: 1.6,
z: 0.07
},
- collisionsWillMove: true,
+ dynamic: true,
shapeType: 'box',
velocity: {
x: randFloat(1, 3),
@@ -114,4 +114,4 @@ function cleanup() {
});
}
-Script.scriptEnding.connect(cleanup);
\ No newline at end of file
+Script.scriptEnding.connect(cleanup);
diff --git a/examples/winterSmashUp/targetPractice/shooterPlatform.js b/examples/winterSmashUp/targetPractice/shooterPlatform.js
index 4fae47a415..9666b90d5e 100644
--- a/examples/winterSmashUp/targetPractice/shooterPlatform.js
+++ b/examples/winterSmashUp/targetPractice/shooterPlatform.js
@@ -37,7 +37,7 @@
modelURL: MODEL_URL,
position: MyAvatar.position,
dimensions: {x: 0.04, y: 1.3, z: 0.21},
- collisionsWillMove: true,
+ dynamic: true,
gravity: {x: 0, y: 0, z: 0},
shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL,
diff --git a/examples/winterSmashUp/targetPractice/targetPracticeGame.js b/examples/winterSmashUp/targetPractice/targetPracticeGame.js
index d58258af5a..72c10ddb01 100644
--- a/examples/winterSmashUp/targetPractice/targetPracticeGame.js
+++ b/examples/winterSmashUp/targetPractice/targetPracticeGame.js
@@ -157,7 +157,7 @@ var onTargetHit = function(targetEntity, projectileEntity, collision) {
parentID: targetEntity
});
Entities.editEntity(targetEntity, {
- collisionsWillMove: true,
+ dynamic: true,
gravity: {x: 0, y: GRAVITY, z: 0},
velocity: {x: 0, y: -0.01, z: 0}
});
diff --git a/interface/src/avatar/AvatarMotionState.cpp b/interface/src/avatar/AvatarMotionState.cpp
index 7f11c83c4a..84f276529a 100644
--- a/interface/src/avatar/AvatarMotionState.cpp
+++ b/interface/src/avatar/AvatarMotionState.cpp
@@ -41,7 +41,7 @@ void AvatarMotionState::clearIncomingDirtyFlags() {
}
}
-MotionType AvatarMotionState::computeObjectMotionType() const {
+PhysicsMotionType AvatarMotionState::computePhysicsMotionType() const {
// TODO?: support non-DYNAMIC motion for avatars? (e.g. when sitting)
return MOTION_TYPE_DYNAMIC;
}
diff --git a/interface/src/avatar/AvatarMotionState.h b/interface/src/avatar/AvatarMotionState.h
index f02dba54bd..51b4e5627e 100644
--- a/interface/src/avatar/AvatarMotionState.h
+++ b/interface/src/avatar/AvatarMotionState.h
@@ -22,12 +22,12 @@ class AvatarMotionState : public ObjectMotionState {
public:
AvatarMotionState(Avatar* avatar, btCollisionShape* shape);
- virtual MotionType getMotionType() const override { return _motionType; }
+ virtual PhysicsMotionType getMotionType() const override { return _motionType; }
virtual uint32_t getIncomingDirtyFlags() override;
virtual void clearIncomingDirtyFlags() override;
- virtual MotionType computeObjectMotionType() const override;
+ virtual PhysicsMotionType computePhysicsMotionType() const override;
virtual bool isMoving() const override;
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 0a7a30f098..93826d0fbf 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -65,7 +65,7 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
_visible(ENTITY_ITEM_DEFAULT_VISIBLE),
_ignoreForCollisions(ENTITY_ITEM_DEFAULT_IGNORE_FOR_COLLISIONS),
_collisionMask(ENTITY_COLLISION_MASK_DEFAULT),
- _collisionsWillMove(ENTITY_ITEM_DEFAULT_COLLISIONS_WILL_MOVE),
+ _dynamic(ENTITY_ITEM_DEFAULT_DYNAMIC),
_locked(ENTITY_ITEM_DEFAULT_LOCKED),
_userData(ENTITY_ITEM_DEFAULT_USER_DATA),
_simulationOwner(),
@@ -125,7 +125,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
requestedProperties += PROP_VISIBLE;
requestedProperties += PROP_IGNORE_FOR_COLLISIONS;
requestedProperties += PROP_COLLISION_MASK;
- requestedProperties += PROP_COLLISIONS_WILL_MOVE;
+ requestedProperties += PROP_DYNAMIC;
requestedProperties += PROP_LOCKED;
requestedProperties += PROP_USER_DATA;
requestedProperties += PROP_MARKETPLACE_ID;
@@ -262,7 +262,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
APPEND_ENTITY_PROPERTY(PROP_VISIBLE, getVisible());
APPEND_ENTITY_PROPERTY(PROP_IGNORE_FOR_COLLISIONS, getIgnoreForCollisions());
APPEND_ENTITY_PROPERTY(PROP_COLLISION_MASK, getCollisionMask());
- APPEND_ENTITY_PROPERTY(PROP_COLLISIONS_WILL_MOVE, getCollisionsWillMove());
+ APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, getDynamic());
APPEND_ENTITY_PROPERTY(PROP_LOCKED, getLocked());
APPEND_ENTITY_PROPERTY(PROP_USER_DATA, getUserData());
APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, getMarketplaceID());
@@ -682,7 +682,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
READ_ENTITY_PROPERTY(PROP_VISIBLE, bool, setVisible);
READ_ENTITY_PROPERTY(PROP_IGNORE_FOR_COLLISIONS, bool, updateIgnoreForCollisions);
READ_ENTITY_PROPERTY(PROP_COLLISION_MASK, uint8_t, updateCollisionMask);
- READ_ENTITY_PROPERTY(PROP_COLLISIONS_WILL_MOVE, bool, updateCollisionsWillMove);
+ READ_ENTITY_PROPERTY(PROP_DYNAMIC, bool, updateDynamic);
READ_ENTITY_PROPERTY(PROP_LOCKED, bool, setLocked);
READ_ENTITY_PROPERTY(PROP_USER_DATA, QString, setUserData);
@@ -1046,7 +1046,7 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper
COPY_ENTITY_PROPERTY_TO_PROPERTIES(visible, getVisible);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(ignoreForCollisions, getIgnoreForCollisions);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionMask, getCollisionMask);
- COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionsWillMove, getCollisionsWillMove);
+ COPY_ENTITY_PROPERTY_TO_PROPERTIES(dynamic, getDynamic);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(locked, getLocked);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(userData, getUserData);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(marketplaceID, getMarketplaceID);
@@ -1102,7 +1102,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
SET_ENTITY_PROPERTY_FROM_PROPERTIES(friction, updateFriction);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(ignoreForCollisions, updateIgnoreForCollisions);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(collisionMask, updateCollisionMask);
- SET_ENTITY_PROPERTY_FROM_PROPERTIES(collisionsWillMove, updateCollisionsWillMove);
+ SET_ENTITY_PROPERTY_FROM_PROPERTIES(dynamic, updateDynamic);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(created, updateCreated);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(lifetime, updateLifetime);
@@ -1458,9 +1458,9 @@ void EntityItem::updateCollisionMask(uint8_t value) {
}
}
-void EntityItem::updateCollisionsWillMove(bool value) {
- if (_collisionsWillMove != value) {
- _collisionsWillMove = value;
+void EntityItem::updateDynamic(bool value) {
+ if (_dynamic != value) {
+ _dynamic = value;
_dirtyFlags |= Simulation::DIRTY_MOTION_TYPE;
}
}
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index d0b79723d1..f00ad7691a 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -278,8 +278,8 @@ public:
uint8_t getFinalCollisionMask() const { return _ignoreForCollisions ? 0 : _collisionMask; }
void setCollisionMask(uint8_t value) { _collisionMask = value; }
- bool getCollisionsWillMove() const { return _collisionsWillMove; }
- void setCollisionsWillMove(bool value) { _collisionsWillMove = value; }
+ bool getDynamic() const { return _dynamic; }
+ void setDynamic(bool value) { _dynamic = value; }
virtual bool shouldBePhysical() const { return false; }
@@ -333,7 +333,7 @@ public:
void updateAngularDamping(float value);
void updateIgnoreForCollisions(bool value);
void updateCollisionMask(uint8_t value);
- void updateCollisionsWillMove(bool value);
+ void updateDynamic(bool value);
void updateLifetime(float value);
void updateCreated(uint64_t value);
virtual void updateShapeType(ShapeType type) { /* do nothing */ }
@@ -447,8 +447,7 @@ protected:
bool _visible;
bool _ignoreForCollisions;
uint8_t _collisionMask { ENTITY_COLLISION_MASK_DEFAULT };
- uint8_t _collisionGroupOverride;
- bool _collisionsWillMove;
+ bool _dynamic;
bool _locked;
QString _userData;
SimulationOwner _simulationOwner;
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index f8dcb6ee56..cc53b35c3b 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -257,7 +257,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
CHECK_PROPERTY_CHANGE(PROP_ANGULAR_DAMPING, angularDamping);
CHECK_PROPERTY_CHANGE(PROP_IGNORE_FOR_COLLISIONS, ignoreForCollisions);
CHECK_PROPERTY_CHANGE(PROP_COLLISION_MASK, collisionMask);
- CHECK_PROPERTY_CHANGE(PROP_COLLISIONS_WILL_MOVE, collisionsWillMove);
+ CHECK_PROPERTY_CHANGE(PROP_DYNAMIC, dynamic);
CHECK_PROPERTY_CHANGE(PROP_IS_SPOTLIGHT, isSpotlight);
CHECK_PROPERTY_CHANGE(PROP_INTENSITY, intensity);
CHECK_PROPERTY_CHANGE(PROP_EXPONENT, exponent);
@@ -372,7 +372,8 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_VISIBLE, visible);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IGNORE_FOR_COLLISIONS, ignoreForCollisions);
COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_COLLISION_MASK, collisionMask, getCollisionMaskAsString());
- COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISIONS_WILL_MOVE, collisionsWillMove);
+ COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_DYNAMIC, dynamic);
+ COPY_PROXY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_DYNAMIC, dynamic, collisionsWillMove, getDynamic()); // legacy support
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_HREF, href);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_DESCRIPTION, description);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_FACE_CAMERA, faceCamera);
@@ -594,7 +595,8 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
COPY_PROPERTY_FROM_QSCRIPTVALUE(localRenderAlpha, float, setLocalRenderAlpha);
COPY_PROPERTY_FROM_QSCRIPTVALUE(ignoreForCollisions, bool, setIgnoreForCollisions);
COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(collisionMask, CollisionMask);
- COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionsWillMove, bool, setCollisionsWillMove);
+ COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(collisionsWillMove, bool, setDynamic, getDynamic); // legacy support
+ COPY_PROPERTY_FROM_QSCRIPTVALUE(dynamic, bool, setDynamic);
COPY_PROPERTY_FROM_QSCRIPTVALUE(isSpotlight, bool, setIsSpotlight);
COPY_PROPERTY_FROM_QSCRIPTVALUE(intensity, float, setIntensity);
COPY_PROPERTY_FROM_QSCRIPTVALUE(exponent, float, setExponent);
@@ -757,7 +759,8 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
ADD_PROPERTY_TO_MAP(PROP_ANGULAR_DAMPING, AngularDamping, angularDamping, float);
ADD_PROPERTY_TO_MAP(PROP_IGNORE_FOR_COLLISIONS, IgnoreForCollisions, ignoreForCollisions, bool);
ADD_PROPERTY_TO_MAP(PROP_COLLISION_MASK, CollisionMask, collisionMask, uint8_t);
- ADD_PROPERTY_TO_MAP(PROP_COLLISIONS_WILL_MOVE, CollisionsWillMove, collisionsWillMove, bool);
+ ADD_PROPERTY_TO_MAP(PROP_DYNAMIC, unused, collisionsWillMove, unused); // legacy support
+ ADD_PROPERTY_TO_MAP(PROP_DYNAMIC, unused, dynamic, unused);
ADD_PROPERTY_TO_MAP(PROP_IS_SPOTLIGHT, IsSpotlight, isSpotlight, bool);
ADD_PROPERTY_TO_MAP(PROP_INTENSITY, Intensity, intensity, float);
ADD_PROPERTY_TO_MAP(PROP_EXPONENT, Exponent, exponent, float);
@@ -1004,7 +1007,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
APPEND_ENTITY_PROPERTY(PROP_VISIBLE, properties.getVisible());
APPEND_ENTITY_PROPERTY(PROP_IGNORE_FOR_COLLISIONS, properties.getIgnoreForCollisions());
APPEND_ENTITY_PROPERTY(PROP_COLLISION_MASK, properties.getCollisionMask());
- APPEND_ENTITY_PROPERTY(PROP_COLLISIONS_WILL_MOVE, properties.getCollisionsWillMove());
+ APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, properties.getDynamic());
APPEND_ENTITY_PROPERTY(PROP_LOCKED, properties.getLocked());
APPEND_ENTITY_PROPERTY(PROP_USER_DATA, properties.getUserData());
APPEND_ENTITY_PROPERTY(PROP_HREF, properties.getHref());
@@ -1297,7 +1300,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VISIBLE, bool, setVisible);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IGNORE_FOR_COLLISIONS, bool, setIgnoreForCollisions);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
- READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISIONS_WILL_MOVE, bool, setCollisionsWillMove);
+ READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DYNAMIC, bool, setDynamic);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LOCKED, bool, setLocked);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_USER_DATA, QString, setUserData);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_HREF, QString, setHref);
@@ -1479,7 +1482,7 @@ void EntityItemProperties::markAllChanged() {
_isSpotlightChanged = true;
_ignoreForCollisionsChanged = true;
_collisionMaskChanged = true;
- _collisionsWillMoveChanged = true;
+ _dynamicChanged = true;
_intensityChanged = true;
_exponentChanged = true;
@@ -1597,7 +1600,7 @@ bool EntityItemProperties::hasTerseUpdateChanges() const {
bool EntityItemProperties::hasMiscPhysicsChanges() const {
return _gravityChanged || _dimensionsChanged || _densityChanged || _frictionChanged
|| _restitutionChanged || _dampingChanged || _angularDampingChanged || _registrationPointChanged ||
- _compoundShapeURLChanged || _collisionsWillMoveChanged || _ignoreForCollisionsChanged || _collisionMaskChanged;
+ _compoundShapeURLChanged || _dynamicChanged || _ignoreForCollisionsChanged || _collisionMaskChanged;
}
void EntityItemProperties::clearSimulationOwner() {
@@ -1716,8 +1719,8 @@ QList EntityItemProperties::listChangedProperties() {
if (collisionMaskChanged()) {
out += "collisionMask";
}
- if (collisionsWillMoveChanged()) {
- out += "collisionsWillMove";
+ if (dynamicChanged()) {
+ out += "dynamic";
}
if (isSpotlightChanged()) {
out += "isSpotlight";
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 087925b139..f9072e2e89 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -129,7 +129,7 @@ public:
DEFINE_PROPERTY(PROP_ANGULAR_DAMPING, AngularDamping, angularDamping, float, ENTITY_ITEM_DEFAULT_ANGULAR_DAMPING);
DEFINE_PROPERTY(PROP_IGNORE_FOR_COLLISIONS, IgnoreForCollisions, ignoreForCollisions, bool, ENTITY_ITEM_DEFAULT_IGNORE_FOR_COLLISIONS);
DEFINE_PROPERTY(PROP_COLLISION_MASK, CollisionMask, collisionMask, uint8_t, ENTITY_COLLISION_MASK_DEFAULT);
- DEFINE_PROPERTY(PROP_COLLISIONS_WILL_MOVE, CollisionsWillMove, collisionsWillMove, bool, ENTITY_ITEM_DEFAULT_COLLISIONS_WILL_MOVE);
+ DEFINE_PROPERTY(PROP_DYNAMIC, Dynamic, dynamic, bool, ENTITY_ITEM_DEFAULT_DYNAMIC);
DEFINE_PROPERTY(PROP_IS_SPOTLIGHT, IsSpotlight, isSpotlight, bool, false);
DEFINE_PROPERTY(PROP_INTENSITY, Intensity, intensity, float, 1.0f);
DEFINE_PROPERTY(PROP_EXPONENT, Exponent, exponent, float, 0.0f);
@@ -356,7 +356,7 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
DEBUG_PROPERTY_IF_CHANGED(debug, properties, AngularVelocity, angularVelocity, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, AngularDamping, angularDamping, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, IgnoreForCollisions, ignoreForCollisions, "");
- DEBUG_PROPERTY_IF_CHANGED(debug, properties, CollisionsWillMove, collisionsWillMove, "");
+ DEBUG_PROPERTY_IF_CHANGED(debug, properties, Dynamic, dynamic, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, IsSpotlight, isSpotlight, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, Intensity, intensity, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, Exponent, exponent, "");
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index 06c6565d1b..39b144c014 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -69,7 +69,7 @@ const float ENTITY_ITEM_MAX_FRICTION = 0.99f;
const float ENTITY_ITEM_DEFAULT_FRICTION = 0.5f;
const bool ENTITY_ITEM_DEFAULT_IGNORE_FOR_COLLISIONS = false;
-const bool ENTITY_ITEM_DEFAULT_COLLISIONS_WILL_MOVE = false;
+const bool ENTITY_ITEM_DEFAULT_DYNAMIC = false;
const bool ENTITY_ITEM_DEFAULT_BILLBOARDED = false;
const float ENTITY_ITEM_DEFAULT_CUTOFF = PI / 2;
diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index 860da87705..c1ac9f454b 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -168,7 +168,15 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const AACube& v) { retu
QScriptValue V = convertScriptValue(engine, G); \
properties.setProperty(#P, V); \
}
-
+
+// same as COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER but uses #X instead of #P in the setProperty() step
+#define COPY_PROXY_PROPERTY_TO_QSCRIPTVALUE_GETTER(p, P, X, G) \
+ if ((_desiredProperties.isEmpty() || _desiredProperties.getHasProperty(p)) && \
+ (!skipDefaults || defaultEntityProperties._##P != _##P)) { \
+ QScriptValue V = convertScriptValue(engine, G); \
+ properties.setProperty(#X, V); \
+ }
+
#define COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_ALWAYS(P, G) \
if (!skipDefaults || defaultEntityProperties._##P != _##P) { \
QScriptValue V = convertScriptValue(engine, G); \
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 81301cb52d..dec2a607da 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -17,7 +17,7 @@
enum EntityPropertyList {
PROP_PAGED_PROPERTY,
PROP_CUSTOM_PROPERTIES_INCLUDED,
-
+
// these properties are supported by the EntityItem base class
PROP_VISIBLE,
PROP_POSITION,
@@ -33,7 +33,7 @@ enum EntityPropertyList {
// these properties are supported by some derived classes
PROP_COLOR,
-
+
// these are used by models only
PROP_MODEL_URL,
PROP_ANIMATION_URL,
@@ -46,7 +46,7 @@ enum EntityPropertyList {
PROP_ANGULAR_VELOCITY,
PROP_ANGULAR_DAMPING,
PROP_IGNORE_FOR_COLLISIONS,
- PROP_COLLISIONS_WILL_MOVE,
+ PROP_DYNAMIC,
// property used by Light entity
PROP_IS_SPOTLIGHT,
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 9861252d63..1017f54f67 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -734,15 +734,15 @@ void EntityTree::fixupTerseEditLogging(EntityItemProperties& properties, QList= 0) {
- bool value = properties.getCollisionsWillMove();
+ bool value = properties.getDynamic();
QString changeHint = "0";
if (value) {
changeHint = "1";
}
- changedProperties[index] = QString("collisionsWillMove:") + changeHint;
+ changedProperties[index] = QString("dynamic:") + changeHint;
}
}
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 2c09c3aa55..d0de720fa3 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -139,12 +139,12 @@ bool EntityMotionState::handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine*
return ObjectMotionState::handleHardAndEasyChanges(flags, engine);
}
-MotionType EntityMotionState::computeObjectMotionType() const {
+PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
if (!_entity) {
return MOTION_TYPE_STATIC;
}
assert(entityTreeIsLocked());
- if (_entity->getCollisionsWillMove()) {
+ if (_entity->getDynamic()) {
return MOTION_TYPE_DYNAMIC;
}
return (_entity->isMoving() || _entity->hasActions()) ? MOTION_TYPE_KINEMATIC : MOTION_TYPE_STATIC;
@@ -157,7 +157,7 @@ bool EntityMotionState::isMoving() const {
// This callback is invoked by the physics simulation in two cases:
// (1) when the RigidBody is first added to the world
-// (irregardless of MotionType: STATIC, DYNAMIC, or KINEMATIC)
+// (irregardless of PhysicsMotionType: STATIC, DYNAMIC, or KINEMATIC)
// (2) at the beginning of each simulation step for KINEMATIC RigidBody's --
// it is an opportunity for outside code to update the object's simulation position
void EntityMotionState::getWorldTransform(btTransform& worldTrans) const {
@@ -608,7 +608,7 @@ glm::vec3 EntityMotionState::getObjectLinearVelocityChange() const {
}
// virtual
-void EntityMotionState::setMotionType(MotionType motionType) {
+void EntityMotionState::setMotionType(PhysicsMotionType motionType) {
ObjectMotionState::setMotionType(motionType);
resetMeasuredBodyAcceleration();
}
@@ -627,7 +627,7 @@ void EntityMotionState::computeCollisionGroupAndMask(int16_t& group, int16_t& ma
if (_entity->getIgnoreForCollisions()) {
group = BULLET_COLLISION_GROUP_COLLISIONLESS;
}
- switch (computeObjectMotionType()){
+ switch (computePhysicsMotionType()){
case MOTION_TYPE_STATIC:
group = BULLET_COLLISION_GROUP_STATIC;
break;
diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h
index 7d7987b641..b579d4442d 100644
--- a/libraries/physics/src/EntityMotionState.h
+++ b/libraries/physics/src/EntityMotionState.h
@@ -32,8 +32,8 @@ public:
virtual bool handleEasyChanges(uint32_t& flags);
virtual bool handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine* engine);
- /// \return MOTION_TYPE_DYNAMIC or MOTION_TYPE_STATIC based on params set in EntityItem
- virtual MotionType computeObjectMotionType() const;
+ /// \return PhysicsMotionType based on params set in EntityItem
+ virtual PhysicsMotionType computePhysicsMotionType() const;
virtual bool isMoving() const;
@@ -94,7 +94,7 @@ protected:
virtual bool isReadyToComputeShape() const override;
virtual btCollisionShape* computeNewShape();
- virtual void setMotionType(MotionType motionType);
+ virtual void setMotionType(PhysicsMotionType motionType);
// In the glorious future (when entities lib depends on physics lib) the EntityMotionState will be
// properly "owned" by the EntityItem and will be deleted by it in the dtor. In pursuit of that
diff --git a/libraries/physics/src/ObjectMotionState.cpp b/libraries/physics/src/ObjectMotionState.cpp
index ecce821adf..482c3146f8 100644
--- a/libraries/physics/src/ObjectMotionState.cpp
+++ b/libraries/physics/src/ObjectMotionState.cpp
@@ -120,7 +120,7 @@ void ObjectMotionState::releaseShape() {
}
}
-void ObjectMotionState::setMotionType(MotionType motionType) {
+void ObjectMotionState::setMotionType(PhysicsMotionType motionType) {
_motionType = motionType;
}
diff --git a/libraries/physics/src/ObjectMotionState.h b/libraries/physics/src/ObjectMotionState.h
index 4a90b1d985..539327ce0c 100644
--- a/libraries/physics/src/ObjectMotionState.h
+++ b/libraries/physics/src/ObjectMotionState.h
@@ -23,13 +23,13 @@
#include "ContactInfo.h"
#include "ShapeManager.h"
-enum MotionType {
+enum PhysicsMotionType {
MOTION_TYPE_STATIC, // no motion
MOTION_TYPE_DYNAMIC, // motion according to physical laws
MOTION_TYPE_KINEMATIC // keyframed motion
};
-inline QString motionTypeToString(MotionType motionType) {
+inline QString motionTypeToString(PhysicsMotionType motionType) {
switch(motionType) {
case MOTION_TYPE_STATIC: return QString("static");
case MOTION_TYPE_DYNAMIC: return QString("dynamic");
@@ -88,7 +88,7 @@ public:
virtual void updateBodyMassProperties();
MotionStateType getType() const { return _type; }
- virtual MotionType getMotionType() const { return _motionType; }
+ virtual PhysicsMotionType getMotionType() const { return _motionType; }
void setMass(float mass) { _mass = fabsf(mass); }
float getMass() { return _mass; }
@@ -105,7 +105,7 @@ public:
virtual uint32_t getIncomingDirtyFlags() = 0;
virtual void clearIncomingDirtyFlags() = 0;
- virtual MotionType computeObjectMotionType() const = 0;
+ virtual PhysicsMotionType computePhysicsMotionType() const = 0;
btCollisionShape* getShape() const { return _shape; }
btRigidBody* getRigidBody() const { return _body; }
@@ -150,13 +150,13 @@ public:
protected:
virtual bool isReadyToComputeShape() const = 0;
virtual btCollisionShape* computeNewShape() = 0;
- void setMotionType(MotionType motionType);
+ void setMotionType(PhysicsMotionType motionType);
void updateCCDConfiguration();
void setRigidBody(btRigidBody* body);
MotionStateType _type = MOTIONSTATE_TYPE_INVALID; // type of MotionState
- MotionType _motionType; // type of motion: KINEMATIC, DYNAMIC, or STATIC
+ PhysicsMotionType _motionType; // type of motion: KINEMATIC, DYNAMIC, or STATIC
btCollisionShape* _shape;
btRigidBody* _body;
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index b665be5d53..691f2b89c5 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -98,7 +98,7 @@ void PhysicsEngine::addObjectToDynamicsWorld(ObjectMotionState* motionState) {
float mass = 0.0f;
// NOTE: the body may or may not already exist, depending on whether this corresponds to a reinsertion, or a new insertion.
btRigidBody* body = motionState->getRigidBody();
- MotionType motionType = motionState->computeObjectMotionType();
+ PhysicsMotionType motionType = motionState->computePhysicsMotionType();
motionState->setMotionType(motionType);
switch(motionType) {
case MOTION_TYPE_KINEMATIC: {
diff --git a/unpublishedScripts/basketballsResetter.js b/unpublishedScripts/basketballsResetter.js
index 6b8bc75f0d..e4938a2b79 100644
--- a/unpublishedScripts/basketballsResetter.js
+++ b/unpublishedScripts/basketballsResetter.js
@@ -81,7 +81,7 @@ var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
y: -9.8,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: basketballCollisionSoundURL,
ignoreForCollisions: false,
modelURL: basketballURL,
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 8f095ba0c5..ec50264811 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -177,7 +177,7 @@
rotation: rotation,
position: position,
shapeType: 'box',
- collisionsWillMove: true,
+ dynamic: true,
script: raveStickEntityScriptURL,
dimensions: {
x: 0.06,
@@ -295,7 +295,7 @@
y: -3.0,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
grabbableKey: {
spatialKey: {
@@ -351,7 +351,7 @@
position: startPosition,
rotation: BOW_ROTATION,
dimensions: BOW_DIMENSIONS,
- collisionsWillMove: true,
+ dynamic: true,
gravity: BOW_GRAVITY,
shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL,
@@ -493,7 +493,7 @@
y: 1.37,
z: 1.73
},
- collisionsWillMove: true,
+ dynamic: true,
ignoreForCollisions: false,
compoundShapeURL: rackCollisionHullURL,
userData: JSON.stringify({
@@ -541,7 +541,7 @@
y: -9.8,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
ignoreForCollisions: false,
modelURL: basketballURL,
@@ -686,7 +686,7 @@
type: 'Model',
modelURL: MODEL_URL,
shapeType: 'compound',
- collisionsWillMove: true,
+ dynamic: true,
dimensions: TARGET_DIMENSIONS,
compoundShapeURL: COLLISION_HULL_URL,
position: position,
@@ -767,7 +767,7 @@
y: 0.30,
z: 0.08
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav",
gravity: {
x: 0,
@@ -1057,7 +1057,7 @@
z: 0
},
shapeType: "box",
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
resetMe: {
resetMe: true
@@ -1101,7 +1101,7 @@
z: 0.2
},
rotation: rotation,
- collisionsWillMove: true,
+ dynamic: true,
gravity: {
x: 0,
y: -100,
@@ -1152,7 +1152,7 @@
y: 0.21,
z: 0.47
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: COLLISION_SOUND_URL,
userData: JSON.stringify({
resetMe: {
@@ -1200,7 +1200,7 @@
z: 0.05
},
//must be enabled to be grabbable in the physics engine
- collisionsWillMove: true,
+ dynamic: true,
compoundShapeURL: WAND_COLLISION_SHAPE,
script: wandScriptURL,
userData: JSON.stringify({
@@ -1231,7 +1231,7 @@
type: "Model",
modelURL: modelURL,
position: position,
- collisionsWillMove: true,
+ dynamic: true,
shapeType: "sphere",
name: "basketball",
dimensions: {
@@ -1291,7 +1291,7 @@
y: -0.1,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
resetMe: {
resetMe: true
@@ -1319,7 +1319,7 @@
y: 0.17,
z: 0.07
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
shapeType: 'box',
restitution: 0,
@@ -1358,7 +1358,7 @@
y: 2.18,
z: 1.07
},
- collisionsWillMove: true,
+ dynamic: true,
shapeType: 'box',
gravity: {
x: 0,
@@ -1402,7 +1402,7 @@
y: 1.56,
z: 1.35
},
- collisionsWillMove: true,
+ dynamic: true,
gravity: {
x: 0,
y: -0.8,
@@ -1484,7 +1484,7 @@
shapeType: 'box',
name: "block",
dimensions: blockTypes[i].dimensions,
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: collisionSoundURL,
gravity: {
x: 0,
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index e6605c17e0..72074da5f1 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -157,7 +157,7 @@ MasterReset = function() {
rotation: rotation,
position: position,
shapeType: 'box',
- collisionsWillMove: true,
+ dynamic: true,
script: raveStickEntityScriptURL,
dimensions: {
x: 0.06,
@@ -279,7 +279,7 @@ MasterReset = function() {
z: 0
},
restitution: 0,
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav",
userData: JSON.stringify({
grabbableKey: {
@@ -336,7 +336,7 @@ MasterReset = function() {
position: startPosition,
rotation: BOW_ROTATION,
dimensions: BOW_DIMENSIONS,
- collisionsWillMove: true,
+ dynamic: true,
gravity: BOW_GRAVITY,
shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL,
@@ -477,7 +477,7 @@ MasterReset = function() {
y: 1.37,
z: 1.73
},
- collisionsWillMove: true,
+ dynamic: true,
ignoreForCollisions: false,
compoundShapeURL: rackCollisionHullURL,
userData: JSON.stringify({
@@ -526,7 +526,7 @@ MasterReset = function() {
y: -9.8,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: 'http://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav',
ignoreForCollisions: false,
modelURL: basketballURL,
@@ -672,7 +672,7 @@ MasterReset = function() {
type: 'Model',
modelURL: MODEL_URL,
shapeType: 'compound',
- collisionsWillMove: true,
+ dynamic: true,
dimensions: TARGET_DIMENSIONS,
compoundShapeURL: COLLISION_HULL_URL,
position: position,
@@ -753,7 +753,7 @@ MasterReset = function() {
y: 0.30,
z: 0.08
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/flashlight_drop.L.wav",
gravity: {
x: 0,
@@ -1043,7 +1043,7 @@ MasterReset = function() {
z: 0
},
shapeType: "box",
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
resetMe: {
resetMe: true
@@ -1087,7 +1087,7 @@ MasterReset = function() {
z: 0.2
},
rotation: rotation,
- collisionsWillMove: true,
+ dynamic: true,
gravity: {
x: 0,
y: -100,
@@ -1138,7 +1138,7 @@ MasterReset = function() {
y: 0.21,
z: 0.47
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: COLLISION_SOUND_URL,
userData: JSON.stringify({
resetMe: {
@@ -1186,7 +1186,7 @@ MasterReset = function() {
z: 0.05
},
//must be enabled to be grabbable in the physics engine
- collisionsWillMove: true,
+ dynamic: true,
compoundShapeURL: WAND_COLLISION_SHAPE,
script: wandScriptURL,
userData: JSON.stringify({
@@ -1217,7 +1217,7 @@ MasterReset = function() {
type: "Model",
modelURL: modelURL,
position: position,
- collisionsWillMove: true,
+ dynamic: true,
shapeType: "sphere",
name: "basketball",
dimensions: {
@@ -1277,7 +1277,7 @@ MasterReset = function() {
y: -0.1,
z: 0
},
- collisionsWillMove: true,
+ dynamic: true,
userData: JSON.stringify({
resetMe: {
resetMe: true
@@ -1305,7 +1305,7 @@ MasterReset = function() {
y: 0.17,
z: 0.07
},
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: "http://hifi-public.s3.amazonaws.com/sounds/SpryPntCnDrp1.L.wav",
shapeType: 'box',
gravity: {
@@ -1344,7 +1344,7 @@ MasterReset = function() {
y: 2.18,
z: 1.07
},
- collisionsWillMove: true,
+ dynamic: true,
shapeType: 'box',
gravity: {
x: 0,
@@ -1388,7 +1388,7 @@ MasterReset = function() {
y: 1.56,
z: 1.35
},
- collisionsWillMove: true,
+ dynamic: true,
gravity: {
x: 0,
y: -0.8,
@@ -1470,7 +1470,7 @@ MasterReset = function() {
shapeType: 'box',
name: "block",
dimensions: blockTypes[i].dimensions,
- collisionsWillMove: true,
+ dynamic: true,
collisionSoundURL: collisionSoundURL,
gravity: {
x: 0,
diff --git a/unpublishedScripts/targetsResetter.js b/unpublishedScripts/targetsResetter.js
index 326c0ce1be..ccec8173de 100644
--- a/unpublishedScripts/targetsResetter.js
+++ b/unpublishedScripts/targetsResetter.js
@@ -93,7 +93,7 @@
type: 'Model',
modelURL: MODEL_URL,
shapeType: 'compound',
- collisionsWillMove: true,
+ dynamic: true,
dimensions: TARGET_DIMENSIONS,
compoundShapeURL: COLLISION_HULL_URL,
position: position,