Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix not kicking off physics if hand is inside entity

Browse source
This commit is contained in:
David Rowe 2017-09-15 13:43:53 +12:00
parent 9da3ed0ceb
commit f02d057a83
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/vr-edit/modules/selection.js
View file

@ -29,6 +29,7 @@ Selection = function (side) {
scaleRootOrientation,
startPosition,
startOrientation,
isEditing = false,
ENTITY_TYPE = "entity",
ENTITY_TYPES_WITH_COLOR = ["Box", "Sphere", "Shape", "PolyLine", "PolyVox"],
ENTITY_TYPES_2D = ["Text", "Web"],
@ -207,7 +208,7 @@ Selection = function (side) {
DYNAMIC_VELOCITY_THRESHOLD = 0.05, // See EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
DYNAMIC_VELOCITY_KICK = { x: 0, y: 0.1, z: 0 };
if (entityID === rootEntityID) {
if (entityID === rootEntityID && isEditing) {
// Don't kick if have started editing entity again.
return;
}
@ -247,6 +248,8 @@ Selection = function (side) {
// Stop moving.
Entities.editEntity(rootEntityID, { velocity: Vec3.ZERO, angularVelocity: Vec3.ZERO });
isEditing = true;
}
function finishEditing() {
@ -283,6 +286,8 @@ Selection = function (side) {
if (selection.length > 0 && selection[0].dynamic) {
kickPhysics(selection[0].id);
}
isEditing = false;
}
function getPositionAndOrientation() {