mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 11:45:36 +02:00
update to track grab-script changes
This commit is contained in:
parent
3fe01ccf10
commit
880aedd444
1 changed files with 9 additions and 5 deletions
|
@ -120,10 +120,7 @@ function AttachedEntitiesManager() {
|
|||
parsedMessage.action === 'loaded') {
|
||||
// ignore
|
||||
} else if (parsedMessage.action === 'release') {
|
||||
manager.checkIfWearable(parsedMessage.grabbedEntity, parsedMessage.joint)
|
||||
// manager.saveAttachedEntities();
|
||||
} else if (parsedMessage.action === 'shared-release') {
|
||||
manager.updateRelativeOffsets(parsedMessage.grabbedEntity);
|
||||
manager.handleEntityRelease(parsedMessage.grabbedEntity, parsedMessage.joint)
|
||||
// manager.saveAttachedEntities();
|
||||
} else if (parsedMessage.action === 'equip') {
|
||||
// manager.saveAttachedEntities();
|
||||
|
@ -145,7 +142,14 @@ function AttachedEntitiesManager() {
|
|||
return false;
|
||||
}
|
||||
|
||||
this.checkIfWearable = function(grabbedEntity, releasedFromJoint) {
|
||||
this.handleEntityRelease = function(grabbedEntity, releasedFromJoint) {
|
||||
// if this is still equipped, just rewrite the position information.
|
||||
var grabData = getEntityCustomData('grabKey', entityID, {});
|
||||
if ("refCount" in grabData && grabData.refCount > 0) {
|
||||
manager.updateRelativeOffsets(parsedMessage.grabbedEntity);
|
||||
return;
|
||||
}
|
||||
|
||||
var allowedJoints = getEntityCustomData('wearable', grabbedEntity, DEFAULT_WEARABLE_DATA).joints;
|
||||
|
||||
var props = Entities.getEntityProperties(grabbedEntity, ["position", "parentID", "parentJointIndex"]);
|
||||
|
|
Loading…
Reference in a new issue