History

EnitityItem smart pointers

ZappoMan committed 11 years ago

Commit 8b78fc41 parent 603528e69 files · +354 −302Browse files

Showing the changes to interface/src/Application.cpp (1 of 69 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -1970,7 +1970,7 @@ void Application::toggleFaceTrackerMute() { · 1969 unmodified lines
1970}1970}
1971 1971
1972bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {1972bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {
1973 QVector<EntityItem*> entities;1973 QVector<EntityItemPointer> entities;
1974 1974
1975 auto entityTree = _entities.getTree();1975 auto entityTree = _entities.getTree();
1976 EntityTree exportTree;1976 EntityTree exportTree;
@@ -2011,7 +2011,7 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt · 34 unmodified lines
2011}2011}
2012 2012
2013bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {2013bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
2014 QVector<EntityItem*> entities;2014 QVector<EntityItemPointer> entities;
2015 _entities.getTree()->findEntities(AACube(glm::vec3(x, y, z), scale), entities);2015 _entities.getTree()->findEntities(AACube(glm::vec3(x, y, z), scale), entities);
2016 2016
2017 if (entities.size() > 0) {2017 if (entities.size() > 0) {