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

when new wearables are added or removed, rerun getWearablesLocked() and update UI

Browse source
This commit is contained in:
Seth Alves 2019-03-21 14:16:18 -07:00
parent 29af3b1612
commit 4fe94a4b32
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/avatarapp.js
View file

@ -79,6 +79,7 @@ function updateAvatarWearables(avatar, callback, wearablesOverride) {
avatar[ENTRY_AVATAR_ENTITIES] = wearables;
sendToQml({'method' : 'wearablesUpdated', 'wearables' : wearables});
sendToQml({ method : 'wearablesLockedChanged', wearablesLocked : getWearablesLocked()});
if(callback)
callback();
@ -239,6 +240,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
AvatarBookmarks.loadBookmark(message.name);
Entities.addingWearable.connect(onAddingWearable);
Entities.deletingWearable.connect(onDeletingWearable);
sendToQml({ method : 'wearablesLockedChanged', wearablesLocked : getWearablesLocked()});
break;
case 'deleteAvatar':
AvatarBookmarks.removeBookmark(message.name);
@ -406,9 +408,11 @@ function isGrabbable(entityID) {
}
function setGrabbable(entityID, grabbable) {
var properties = Entities.getEntityProperties(entityID, ['avatarEntity']);
if (properties.avatarEntity) {
Entities.editEntity(entityID, { grab: { grabbable: grabbable }});
var properties = Entities.getEntityProperties(entityID, ['avatarEntity', 'grab.grabbable']);
if (properties.avatarEntity && properties.grab.grabable != grabbable) {
var editProps = { grab: { grabbable: grabbable }};
Entities.editEntity(entityID, editProps);
sendToQml({ method : 'wearablesLockedChanged', wearablesLocked : getWearablesLocked()});
}
}
@ -453,12 +457,14 @@ function onAddingWearable(entityID) {
updateAvatarWearables(currentAvatar, function() {
sendToQml({'method' : 'updateAvatarInBookmarks'});
});
sendToQml({ method : 'wearablesLockedChanged', wearablesLocked : getWearablesLocked()});
}
function onDeletingWearable(entityID) {
updateAvatarWearables(currentAvatar, function() {
sendToQml({'method' : 'updateAvatarInBookmarks'});
});
sendToQml({ method : 'wearablesLockedChanged', wearablesLocked : getWearablesLocked()});
}
function handleWearableMessages(channel, message, sender) {