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

Work around bug undoing physics where entities can end at wrong position

Browse source
This commit is contained in:
David Rowe 2017-10-03 16:26:00 +13:00
parent a59d590111
commit 31e72c5503
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/shapes/modules/history.js
View file

@ -145,9 +145,17 @@ History = (function () {
return undoPosition < history.length - 1;
}
function undoSetProperties(entityID, properties) {
Entities.editEntity(entityID, properties);
if (properties.gravity) {
kickPhysics(entityID);
}
}
function undo() {
var undoData,
entityID,
REPEAT_UNDO_DELAY = 500, // ms
i,
length;
@ -163,9 +171,16 @@ History = (function () {
if (undoData.setProperties) {
for (i = 0, length = undoData.setProperties.length; i < length; i++) {
Entities.editEntity(undoData.setProperties[i].entityID, undoData.setProperties[i].properties);
if (undoData.setProperties[i].properties.gravity) {
kickPhysics(undoData.setProperties[i].entityID);
undoSetProperties(undoData.setProperties[i].entityID, undoData.setProperties[i].properties);
if (undoData.setProperties[i].properties.velocity
&& Vec3.equal(undoData.setProperties[i].properties.velocity, Vec3.ZERO)
&& undoData.setProperties[i].properties.angularVelocity
&& Vec3.equal(undoData.setProperties[i].properties.angularVelocity, Vec3.ZERO)) {
// Work around physics bug wherein the entity doesn't always end up at the correct position.
Script.setTimeout(
undoSetProperties(undoData.setProperties[i].entityID, undoData.setProperties[i].properties),
REPEAT_UNDO_DELAY
);
}
}
}