Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 23:53:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities

Browse source 
Case 20826: Add damping to new dynamic entities in Create
This commit is contained in:
Ryan Huffman 2019-04-02 14:28:35 -07:00 committed by GitHub
commit ea2e62c1ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
scripts/system/edit.js
View file

@ -282,6 +282,28 @@ function checkEditPermissionsAndUpdate() {
} }
} }
// Copies the properties in `b` into `a`. `a` will be modified.
function copyProperties(a, b) {
for (var key in b) {
a[key] = b[key];
}
return a;
}
const DEFAULT_DYNAMIC_PROPERTIES = {
dynamic: true,
damping: 0.39347,
angularDamping: 0.39347,
gravity: { x: 0, y: -9.8, z: 0 },
};
const DEFAULT_NON_DYNAMIC_PROPERTIES = {
dynamic: false,
damping: 0,
angularDamping: 0,
gravity: { x: 0, y: 0, z: 0 },
};
const DEFAULT_ENTITY_PROPERTIES = { const DEFAULT_ENTITY_PROPERTIES = {
All: { All: {
description: "", description: "",
@ -299,26 +321,14 @@ const DEFAULT_ENTITY_PROPERTIES = {
y: 0, y: 0,
z: 0 z: 0
}, },
damping: 0,
angularVelocity: { angularVelocity: {
x: 0, x: 0,
y: 0, y: 0,
z: 0 z: 0
}, },
angularDamping: 0,
restitution: 0.5, restitution: 0.5,
friction: 0.5, friction: 0.5,
density: 1000, density: 1000,
gravity: {
x: 0,
y: 0,
z: 0
},
acceleration: {
x: 0,
y: 0,
z: 0
},
dynamic: false, dynamic: false,
}, },
Shape: { Shape: {
@ -484,11 +494,6 @@ var toolBar = (function () {
dialogWindow = null, dialogWindow = null,
tablet = null; tablet = null;
function applyProperties(originalProperties, newProperties) {
for (var key in newProperties) {
originalProperties[key] = newProperties[key];
}
}
function createNewEntity(requestedProperties) { function createNewEntity(requestedProperties) {
var dimensions = requestedProperties.dimensions ? requestedProperties.dimensions : DEFAULT_DIMENSIONS; var dimensions = requestedProperties.dimensions ? requestedProperties.dimensions : DEFAULT_DIMENSIONS;
var position = getPositionToCreateEntity(); var position = getPositionToCreateEntity();
@ -496,17 +501,23 @@ var toolBar = (function () {
var properties = {}; var properties = {};
applyProperties(properties, DEFAULT_ENTITY_PROPERTIES.All); copyProperties(properties, DEFAULT_ENTITY_PROPERTIES.All);
var type = requestedProperties.type; var type = requestedProperties.type;
if (type === "Box" || type === "Sphere") { if (type === "Box" || type === "Sphere") {
applyProperties(properties, DEFAULT_ENTITY_PROPERTIES.Shape); copyProperties(properties, DEFAULT_ENTITY_PROPERTIES.Shape);
} else { } else {
applyProperties(properties, DEFAULT_ENTITY_PROPERTIES[type]); copyProperties(properties, DEFAULT_ENTITY_PROPERTIES[type]);
} }
// We apply the requested properties first so that they take priority over any default properties. // We apply the requested properties first so that they take priority over any default properties.
applyProperties(properties, requestedProperties); copyProperties(properties, requestedProperties);
if (properties.dynamic) {
copyProperties(properties, DEFAULT_DYNAMIC_PROPERTIES);
} else {
copyProperties(properties, DEFAULT_NON_DYNAMIC_PROPERTIES);
}
if (position !== null && position !== undefined) { if (position !== null && position !== undefined) {
@ -675,7 +686,6 @@ var toolBar = (function () {
grabbable: result.grabbable grabbable: result.grabbable
}, },
dynamic: dynamic, dynamic: dynamic,
gravity: dynamic ? { x: 0, y: -10, z: 0 } : { x: 0, y: 0, z: 0 }
}); });
} }
} }