mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 08:21:24 +02:00
don't save joint information for avatar entities
This commit is contained in:
parent
fd87aad3c2
commit
8be775c2b7
1 changed files with 25 additions and 15 deletions
|
@ -247,25 +247,35 @@ QVariantMap AvatarBookmarks::getAvatarDataToBookmark() {
|
||||||
bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
|
bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
|
||||||
bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
|
bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
|
||||||
|
|
||||||
QScriptEngine scriptEngine;
|
|
||||||
QVariantList wearableEntities;
|
QVariantList wearableEntities;
|
||||||
auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
|
auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
|
||||||
EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
|
EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
|
||||||
auto avatarEntities = myAvatar->getAvatarEntityData();
|
|
||||||
for (auto entityID : avatarEntities.keys()) {
|
if (entityTree) {
|
||||||
auto entity = entityTree->findEntityByID(entityID);
|
QScriptEngine scriptEngine;
|
||||||
if (!entity || !isWearableEntity(entity)) {
|
auto avatarEntities = myAvatar->getAvatarEntityData();
|
||||||
continue;
|
for (auto entityID : avatarEntities.keys()) {
|
||||||
|
auto entity = entityTree->findEntityByID(entityID);
|
||||||
|
if (!entity || !isWearableEntity(entity)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariantMap avatarEntityData;
|
||||||
|
|
||||||
|
EncodeBitstreamParams params;
|
||||||
|
auto desiredProperties = entity->getEntityProperties(params);
|
||||||
|
desiredProperties += PROP_LOCAL_POSITION;
|
||||||
|
desiredProperties += PROP_LOCAL_ROTATION;
|
||||||
|
desiredProperties -= PROP_JOINT_ROTATIONS_SET;
|
||||||
|
desiredProperties -= PROP_JOINT_ROTATIONS;
|
||||||
|
desiredProperties -= PROP_JOINT_TRANSLATIONS_SET;
|
||||||
|
desiredProperties -= PROP_JOINT_TRANSLATIONS;
|
||||||
|
|
||||||
|
EntityItemProperties entityProperties = entity->getProperties(desiredProperties);
|
||||||
|
QScriptValue scriptProperties = EntityItemPropertiesToScriptValue(&scriptEngine, entityProperties);
|
||||||
|
avatarEntityData["properties"] = scriptProperties.toVariant();
|
||||||
|
wearableEntities.append(QVariant(avatarEntityData));
|
||||||
}
|
}
|
||||||
QVariantMap avatarEntityData;
|
|
||||||
EncodeBitstreamParams params;
|
|
||||||
auto desiredProperties = entity->getEntityProperties(params);
|
|
||||||
desiredProperties += PROP_LOCAL_POSITION;
|
|
||||||
desiredProperties += PROP_LOCAL_ROTATION;
|
|
||||||
EntityItemProperties entityProperties = entity->getProperties(desiredProperties);
|
|
||||||
QScriptValue scriptProperties = EntityItemPropertiesToScriptValue(&scriptEngine, entityProperties);
|
|
||||||
avatarEntityData["properties"] = scriptProperties.toVariant();
|
|
||||||
wearableEntities.append(QVariant(avatarEntityData));
|
|
||||||
}
|
}
|
||||||
bookmark.insert(ENTRY_AVATAR_ENTITIES, wearableEntities);
|
bookmark.insert(ENTRY_AVATAR_ENTITIES, wearableEntities);
|
||||||
return bookmark;
|
return bookmark;
|
||||||
|
|
Loading…
Reference in a new issue