Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename current getAvatarEntityData() method and use internally

Browse source
This commit is contained in:
David Rowe 2019-11-28 16:30:26 +13:00
parent 845d388cbf
commit 9144e78cb9
8 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/avatars/ScriptableAvatar.cpp
View file

@ -279,7 +279,7 @@ void ScriptableAvatar::setJointMappingsFromNetworkReply() {
networkReply->deleteLater();
}
AvatarEntityMap ScriptableAvatar::getAvatarEntityData() const {
AvatarEntityMap ScriptableAvatar::getAvatarEntityDataNonDefault() const {
// DANGER: Now that we store the AvatarEntityData in packed format this call is potentially Very Expensive!
// Avoid calling this method if possible.
AvatarEntityMap data;

3
assignment-client/src/avatars/ScriptableAvatar.h
View file

@ -178,7 +178,8 @@ public:
* var avatarEntityData = Avatar.getAvatarEntityData();
* print("Avatar entities: " + JSON.stringify(avatarEntityData));
*/
Q_INVOKABLE AvatarEntityMap getAvatarEntityData() const override;
AvatarEntityMap getAvatarEntityDataNonDefault() const override;
/**jsdoc
* Sets all avatar entities from an object.

4
interface/src/AvatarBookmarks.cpp
View file

@ -154,7 +154,7 @@ void AvatarBookmarks::deleteBookmark() {
void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) {
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
auto currentAvatarEntities = myAvatar->getAvatarEntityData();
auto currentAvatarEntities = myAvatar->getAvatarEntityDataNonDefault();
std::set<QUuid> newAvatarEntities;
// Update or add all the new avatar entities
@ -296,7 +296,7 @@ QVariantMap AvatarBookmarks::getAvatarDataToBookmark() {
if (entityTree) {
QScriptEngine scriptEngine;
auto avatarEntities = myAvatar->getAvatarEntityData();
auto avatarEntities = myAvatar->getAvatarEntityDataNonDefault();
for (auto entityID : avatarEntities.keys()) {
auto entity = entityTree->findEntityByID(entityID);
if (!entity || !isWearableEntity(entity)) {

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1810,7 +1810,7 @@ void MyAvatar::prepareAvatarEntityDataForReload() {
_reloadAvatarEntityDataFromSettings = true;
}
AvatarEntityMap MyAvatar::getAvatarEntityData() const {
AvatarEntityMap MyAvatar::getAvatarEntityDataNonDefault() const {
// NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs
updateStaleAvatarEntityBlobs();
AvatarEntityMap result;

3
interface/src/avatar/MyAvatar.h
View file

@ -1861,7 +1861,8 @@ public:
* var avatarEntityData = MyAvatar.getAvatarEntityData();
* print("Avatar entities: " + JSON.stringify(avatarEntityData));
*/
AvatarEntityMap getAvatarEntityData() const override;
AvatarEntityMap getAvatarEntityDataNonDefault() const override;
/**jsdoc
* Sets all avatar entities from an object.

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

@ -3046,7 +3046,7 @@ void AvatarData::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFr
}
}
AvatarEntityMap AvatarData::getAvatarEntityData() const {
AvatarEntityMap AvatarData::getAvatarEntityDataNonDefault() const {
// overridden where needed
// NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs
return AvatarEntityMap();

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

@ -1390,7 +1390,9 @@ public:
/**jsdoc
* @comment Documented in derived classes' JSDoc because implementations are different.
*/
Q_INVOKABLE virtual AvatarEntityMap getAvatarEntityData() const;
// Get avatar entity data with non-default property values. Used internally.
virtual AvatarEntityMap getAvatarEntityDataNonDefault() const;
/**jsdoc
* @comment Documented in derived classes' JSDoc because implementations are different.

2
libraries/avatars/src/ScriptAvatarData.cpp
View file

@ -278,7 +278,7 @@ AvatarEntityMap ScriptAvatarData::getAvatarEntities() const {
AvatarEntityMap scriptEntityData;
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getAvatarEntityData();
return sharedAvatarData->getAvatarEntityDataNonDefault();
}
return scriptEntityData;