Showing the changes to interface/src/Application.cpp (1 of 55 files). Show all
Unified · Split
| @@ -1080,6 +1080,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1079 unmodified lines | ||
| 1080 | 1080 | |
| 1081 | 1081 | auto nodeList = DependencyManager::get<NodeList>(); |
| 1082 | 1082 | nodeList->startThread(); |
| 1083 | + nodeList->setFlagTimeForConnectionStep(true); | |
| 1083 | 1084 | |
| 1084 | 1085 | // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur |
| 1085 | 1086 | // before we tell MyAvatar to go to a new location in the new domain |
| @@ -4914,7 +4915,7 @@ void Application::calibrateEyeTracker5Points() { · 3828 unmodified lines | ||
| 4914 | 4915 | #endif |
| 4915 | 4916 | |
| 4916 | 4917 | bool Application::exportEntities(const QString& filename, |
| 4917 | − const QVector<EntityItemID>& entityIDs, | |
| 4918 | + const QVector<QUuid>& entityIDs, | |
| 4918 | 4919 | const glm::vec3* givenOffset) { |
| 4919 | 4920 | QHash<EntityItemID, EntityItemPointer> entities; |
| 4920 | 4921 | |
| @@ -4989,16 +4990,12 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa · 68 unmodified lines | ||
| 4989 | 4990 | glm::vec3 minCorner = center - vec3(scale); |
| 4990 | 4991 | float cubeSize = scale * 2; |
| 4991 | 4992 | AACube boundingCube(minCorner, cubeSize); |
| 4992 | − QVector<EntityItemPointer> entities; | |
| 4993 | − QVector<EntityItemID> ids; | |
| 4993 | + QVector<QUuid> entities; | |
| 4994 | 4994 | auto entityTree = getEntities()->getTree(); |
| 4995 | 4995 | entityTree->withReadLock([&] { |
| 4996 | − entityTree->findEntities(boundingCube, entities); | |
| 4997 | − foreach(EntityItemPointer entity, entities) { | |
| 4998 | − ids << entity->getEntityItemID(); | |
| 4999 | − } | |
| 4996 | + entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities); | |
| 5000 | 4997 | }); |
| 5001 | − return exportEntities(filename, ids, ¢er); | |
| 4998 | + return exportEntities(filename, entities, ¢er); | |
| 5002 | 4999 | } |
| 5003 | 5000 | |
| 5004 | 5001 | void Application::loadSettings() { |