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

replace parent avatar-id with avatar-self-id when exporting entities

Browse source
This commit is contained in:
Seth Alves 2017-10-09 15:32:45 -07:00
parent d1d2b8a4da
commit f349ba3674
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -4027,11 +4027,13 @@ void Application::calibrateEyeTracker5Points() {
} }
#endif #endif
bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs, const glm::vec3* givenOffset) { bool Application::exportEntities(const QString& filename,
const QVector<EntityItemID>& entityIDs,
const glm::vec3* givenOffset) {
QHash<EntityItemID, EntityItemPointer> entities; QHash<EntityItemID, EntityItemPointer> entities;
auto accountManager = DependencyManager::get<AccountManager>(); auto nodeList = DependencyManager::get<NodeList>();
auto mySessionID = accountManager->getSessionID(); const QUuid myAvatarID = nodeList->getSessionUUID();
auto entityTree = getEntities()->getTree(); auto entityTree = getEntities()->getTree();
auto exportTree = std::make_shared<EntityTree>(); auto exportTree = std::make_shared<EntityTree>();
@ -4048,7 +4050,7 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
if (!givenOffset) { if (!givenOffset) {
EntityItemID parentID = entityItem->getParentID(); EntityItemID parentID = entityItem->getParentID();
bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == mySessionID); bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
if (!parentIsAvatar && (parentID.isInvalidID() || if (!parentIsAvatar && (parentID.isInvalidID() ||
!entityIDs.contains(parentID) || !entityIDs.contains(parentID) ||
!entityTree->findEntityByEntityItemID(parentID))) { !entityTree->findEntityByEntityItemID(parentID))) {
@ -4073,7 +4075,7 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
for (EntityItemPointer& entityDatum : entities) { for (EntityItemPointer& entityDatum : entities) {
auto properties = entityDatum->getProperties(); auto properties = entityDatum->getProperties();
EntityItemID parentID = properties.getParentID(); EntityItemID parentID = properties.getParentID();
bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == mySessionID); bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
if (parentIsAvatar) { if (parentIsAvatar) {
properties.setParentID(AVATAR_SELF_ID); properties.setParentID(AVATAR_SELF_ID);
} else { } else {