Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 22:47:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix use of EntityTree in import/export operations

Browse source 
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
This commit is contained in:
Ryan Huffman 2015-09-28 15:02:06 -07:00
parent 2d477ad3b9
commit dde1c8b42f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -2337,7 +2337,8 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
QVector<EntityItemPointer> entities; QVector<EntityItemPointer> entities;
auto entityTree = _entities.getTree(); auto entityTree = _entities.getTree();
EntityTree exportTree; auto exportTree = std::make_shared<EntityTree>();
exportTree->createRootElement();
glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE); glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE);
for (auto entityID : entityIDs) { for (auto entityID : entityIDs) {
@ -2364,10 +2365,10 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
auto properties = entityItem->getProperties(); auto properties = entityItem->getProperties();
properties.setPosition(properties.getPosition() - root); properties.setPosition(properties.getPosition() - root);
exportTree.addEntity(entityItem->getEntityItemID(), properties); exportTree->addEntity(entityItem->getEntityItemID(), properties);
} }
exportTree.writeToJSONFile(filename.toLocal8Bit().constData()); exportTree->writeToJSONFile(filename.toLocal8Bit().constData());
// restore the main window's active state // restore the main window's active state
_window->activateWindow(); _window->activateWindow();
@ -2380,15 +2381,16 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa
if (entities.size() > 0) { if (entities.size() > 0) {
glm::vec3 root(x, y, z); glm::vec3 root(x, y, z);
EntityTree exportTree; auto exportTree = std::make_shared<EntityTree>();
exportTree->createRootElement();
for (int i = 0; i < entities.size(); i++) { for (int i = 0; i < entities.size(); i++) {
EntityItemProperties properties = entities.at(i)->getProperties(); EntityItemProperties properties = entities.at(i)->getProperties();
EntityItemID id = entities.at(i)->getEntityItemID(); EntityItemID id = entities.at(i)->getEntityItemID();
properties.setPosition(properties.getPosition() - root); properties.setPosition(properties.getPosition() - root);
exportTree.addEntity(id, properties); exportTree->addEntity(id, properties);
} }
exportTree.writeToSVOFile(filename.toLocal8Bit().constData()); exportTree->writeToSVOFile(filename.toLocal8Bit().constData());
} else { } else {
qCDebug(interfaceapp) << "No models were selected"; qCDebug(interfaceapp) << "No models were selected";
return false; return false;