Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-07 09:12:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

taking something off now makes it an entity-server-aware entity

Browse source
This commit is contained in:
Seth Alves 2016-05-11 16:41:00 -07:00
parent 73c06b3bf4
commit 032fbd9a55
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/system/attachedEntitiesManager.js
View file

@ -166,7 +166,6 @@ function AttachedEntitiesManager() {
} }
} }
// Entities.editEntity(grabbedEntity, wearProps);
Entities.deleteEntity(grabbedEntity); Entities.deleteEntity(grabbedEntity);
Entities.addEntity(wearProps, true); Entities.addEntity(wearProps, true);
} else if (props.parentID != NULL_UUID) { } else if (props.parentID != NULL_UUID) {
@ -179,8 +178,23 @@ function AttachedEntitiesManager() {
var wearProps = Entities.getEntityProperties(grabbedEntity); var wearProps = Entities.getEntityProperties(grabbedEntity);
wearProps.parentID = NULL_UUID; wearProps.parentID = NULL_UUID;
wearProps.parentJointIndex = -1; wearProps.parentJointIndex = -1;
delete wearProps.id;
delete wearProps.created;
delete wearProps.age;
delete wearProps.ageAsText;
delete wearProps.naturalDimensions;
delete wearProps.naturalPosition;
delete wearProps.actionData;
delete wearProps.sittingPoints;
delete wearProps.boundingBox;
delete wearProps.clientOnly;
delete wearProps.owningAvatarID;
delete wearProps.localPosition;
delete wearProps.localRotation;
Entities.deleteEntity(grabbedEntity); Entities.deleteEntity(grabbedEntity);
Entities.addEntity(wearProps, false); Entities.addEntity(wearProps);
} }
} }
} }
@ -271,7 +285,7 @@ function AttachedEntitiesManager() {
this.scrubProperties(savedProps); this.scrubProperties(savedProps);
delete savedProps["id"]; delete savedProps["id"];
savedProps.parentID = MyAvatar.sessionUUID; // this will change between sessions savedProps.parentID = MyAvatar.sessionUUID; // this will change between sessions
var loadedEntityID = Entities.addEntity(savedProps); var loadedEntityID = Entities.addEntity(savedProps, true);
Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
action: 'loaded', action: 'loaded',