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

avoid calling editEntity on overlays

Browse source
This commit is contained in:
Seth Alves 2017-05-04 18:52:17 -07:00
parent 0406cc41e0
commit 70efe4aa4f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/controllers/handControllerGrab.js
View file

@ -3878,6 +3878,7 @@ function MyController(hand) {
// we appear to be holding something and this script isn't in a state that would be holding something. // we appear to be holding something and this script isn't in a state that would be holding something.
// unhook it. if we previously took note of this entity's parent, put it back where it was. This // unhook it. if we previously took note of this entity's parent, put it back where it was. This
// works around some problems that happen when more than one hand or avatar is passing something around. // works around some problems that happen when more than one hand or avatar is passing something around.
var childType = Entities.getNestableType(childID);
if (_this.previousParentID[childID]) { if (_this.previousParentID[childID]) {
var previousParentID = _this.previousParentID[childID]; var previousParentID = _this.previousParentID[childID];
var previousParentJointIndex = _this.previousParentJointIndex[childID]; var previousParentJointIndex = _this.previousParentJointIndex[childID];
@ -3895,7 +3896,7 @@ function MyController(hand) {
} }
_this.previouslyUnhooked[childID] = now; _this.previouslyUnhooked[childID] = now;
if (Overlays.getProperty(childID, "grabbable")) { if (childType == "overlay" && Overlays.getProperty(childID, "grabbable")) {
// only auto-unhook overlays that were flagged as grabbable. this avoids unhooking overlays // only auto-unhook overlays that were flagged as grabbable. this avoids unhooking overlays
// used in tutorial. // used in tutorial.
Overlays.editOverlay(childID, { Overlays.editOverlay(childID, {
@ -3903,7 +3904,12 @@ function MyController(hand) {
parentJointIndex: previousParentJointIndex parentJointIndex: previousParentJointIndex
}); });
} }
Entities.editEntity(childID, { parentID: previousParentID, parentJointIndex: previousParentJointIndex }); if (childType == "entity") {
Entities.editEntity(childID, {
parentID: previousParentID,
parentJointIndex: previousParentJointIndex
});
}
} else { } else {
Entities.editEntity(childID, { parentID: NULL_UUID }); Entities.editEntity(childID, { parentID: NULL_UUID });