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

Merge pull request #10981 from druiz17/bug/delete-avatar-entity

Browse source 
Fixed not being able to delete avatar entities when switching domains
This commit is contained in:
Andrew Meadows 2017-07-18 10:09:34 -07:00 committed by GitHub
commit 888f2f64a5
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/avatars/src/AvatarData.cpp
View file

@ -2366,6 +2366,12 @@ AvatarEntityMap AvatarData::getAvatarEntityData() const {
return result; return result;
} }
void AvatarData::insertDetachedEntityID(const QUuid entityID) {
_avatarEntitiesLock.withWriteLock([&] {
_avatarEntityDetached.insert(entityID);
});
}
void AvatarData::setAvatarEntityData(const AvatarEntityMap& avatarEntityData) { void AvatarData::setAvatarEntityData(const AvatarEntityMap& avatarEntityData) {
if (avatarEntityData.size() > MAX_NUM_AVATAR_ENTITIES) { if (avatarEntityData.size() > MAX_NUM_AVATAR_ENTITIES) {
// the data is suspect // the data is suspect

1
libraries/avatars/src/AvatarData.h
View file

@ -615,6 +615,7 @@ public:
Q_INVOKABLE AvatarEntityMap getAvatarEntityData() const; Q_INVOKABLE AvatarEntityMap getAvatarEntityData() const;
Q_INVOKABLE void setAvatarEntityData(const AvatarEntityMap& avatarEntityData); Q_INVOKABLE void setAvatarEntityData(const AvatarEntityMap& avatarEntityData);
void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; } void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; }
void insertDetachedEntityID(const QUuid entityID);
AvatarEntityIDs getAndClearRecentlyDetachedIDs(); AvatarEntityIDs getAndClearRecentlyDetachedIDs();
// thread safe // thread safe

6
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -21,6 +21,7 @@
#include <VariantMapToScriptValue.h> #include <VariantMapToScriptValue.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include <SpatialParentFinder.h> #include <SpatialParentFinder.h>
#include <AvatarHashMap.h>
#include "EntityItemID.h" #include "EntityItemID.h"
#include "EntitiesLogging.h" #include "EntitiesLogging.h"
@ -499,6 +500,11 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
const QUuid myNodeID = nodeList->getSessionUUID(); const QUuid myNodeID = nodeList->getSessionUUID();
if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) { if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
// don't delete other avatar's avatarEntities // don't delete other avatar's avatarEntities
// If you actually own the entity but the onwership property is not set because of a domain switch
// The lines below makes sure the entity is deleted once its properties are set.
auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
AvatarSharedPointer myAvatar = avatarHashMap->getAvatarBySessionID(myNodeID);
myAvatar->insertDetachedEntityID(id);
shouldDelete = false; shouldDelete = false;
return; return;
} }