Showing the changes to interface/src/Application.cpp (1 of 136 files). Show all
Unified · Split
| @@ -209,6 +209,8 @@ · 208 unmodified lines | |||
| 209 | #include "InterfaceParentFinder.h" | 209 | #include "InterfaceParentFinder.h" |
| 210 | #include "ui/OctreeStatsProvider.h" | 210 | #include "ui/OctreeStatsProvider.h" |
| 211 | 211 | ||
| 212 | #include "avatar/GrabManager.h" | ||
| 213 | |||
| 212 | #include <GPUIdent.h> | 214 | #include <GPUIdent.h> |
| 213 | #include <gl/GLHelpers.h> | 215 | #include <gl/GLHelpers.h> |
| 214 | #include <src/scripting/GooglePolyScriptingInterface.h> | 216 | #include <src/scripting/GooglePolyScriptingInterface.h> |
| @@ -920,6 +922,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 705 unmodified lines | |||
| 920 | DependencyManager::set<ResourceRequestObserver>(); | 922 | DependencyManager::set<ResourceRequestObserver>(); |
| 921 | DependencyManager::set<Keyboard>(); | 923 | DependencyManager::set<Keyboard>(); |
| 922 | DependencyManager::set<KeyboardScriptingInterface>(); | 924 | DependencyManager::set<KeyboardScriptingInterface>(); |
| 925 | DependencyManager::set<GrabManager>(); | ||
| 923 | DependencyManager::set<AvatarPackager>(); | 926 | DependencyManager::set<AvatarPackager>(); |
| 924 | 927 | ||
| 925 | return previousSessionCrashed; | 928 | return previousSessionCrashed; |
| @@ -1080,6 +1083,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 154 unmodified lines | |||
| 1080 | 1083 | ||
| 1081 | auto nodeList = DependencyManager::get<NodeList>(); | 1084 | auto nodeList = DependencyManager::get<NodeList>(); |
| 1082 | nodeList->startThread(); | 1085 | nodeList->startThread(); |
| 1086 | nodeList->setFlagTimeForConnectionStep(true); | ||
| 1083 | 1087 | ||
| 1084 | // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur | 1088 | // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur |
| 1085 | // before we tell MyAvatar to go to a new location in the new domain | 1089 | // before we tell MyAvatar to go to a new location in the new domain |
| @@ -4914,7 +4918,7 @@ void Application::calibrateEyeTracker5Points() { · 3828 unmodified lines | |||
| 4914 | #endif | 4918 | #endif |
| 4915 | 4919 | ||
| 4916 | bool Application::exportEntities(const QString& filename, | 4920 | bool Application::exportEntities(const QString& filename, |
| 4917 | const QVector<EntityItemID>& entityIDs, | 4921 | const QVector<QUuid>& entityIDs, |
| 4918 | const glm::vec3* givenOffset) { | 4922 | const glm::vec3* givenOffset) { |
| 4919 | QHash<EntityItemID, EntityItemPointer> entities; | 4923 | QHash<EntityItemID, EntityItemPointer> entities; |
| 4920 | 4924 | ||
| @@ -4989,16 +4993,12 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa · 68 unmodified lines | |||
| 4989 | glm::vec3 minCorner = center - vec3(scale); | 4993 | glm::vec3 minCorner = center - vec3(scale); |
| 4990 | float cubeSize = scale * 2; | 4994 | float cubeSize = scale * 2; |
| 4991 | AACube boundingCube(minCorner, cubeSize); | 4995 | AACube boundingCube(minCorner, cubeSize); |
| 4992 | QVector<EntityItemPointer> entities; | 4996 | QVector<QUuid> entities; |
| 4993 | QVector<EntityItemID> ids; | ||
| 4994 | auto entityTree = getEntities()->getTree(); | 4997 | auto entityTree = getEntities()->getTree(); |
| 4995 | entityTree->withReadLock([&] { | 4998 | entityTree->withReadLock([&] { |
| 4996 | entityTree->findEntities(boundingCube, entities); | 4999 | entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities); |
| 4997 | foreach(EntityItemPointer entity, entities) { | ||
| 4998 | ids << entity->getEntityItemID(); | ||
| 4999 | } | ||
| 5000 | }); | 5000 | }); |
| 5001 | return exportEntities(filename, ids, ¢er); | 5001 | return exportEntities(filename, entities, ¢er); |
| 5002 | } | 5002 | } |
| 5003 | 5003 | ||
| 5004 | void Application::loadSettings() { | 5004 | void Application::loadSettings() { |
| @@ -6091,6 +6091,9 @@ void Application::update(float deltaTime) { · 1086 unmodified lines | |||
| 6091 | updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process... | 6091 | updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process... |
| 6092 | updateDialogs(deltaTime); // update various stats dialogs if present | 6092 | updateDialogs(deltaTime); // update various stats dialogs if present |
| 6093 | 6093 | ||
| 6094 | auto grabManager = DependencyManager::get<GrabManager>(); | ||
| 6095 | grabManager->simulateGrabs(); | ||
| 6096 | |||
| 6094 | QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>(); | 6097 | QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>(); |
| 6095 | 6098 | ||
| 6096 | { | 6099 | { |
| @@ -6694,6 +6697,7 @@ void Application::resetSensors(bool andReload) { · 597 unmodified lines | |||
| 6694 | DependencyManager::get<DdeFaceTracker>()->reset(); | 6697 | DependencyManager::get<DdeFaceTracker>()->reset(); |
| 6695 | DependencyManager::get<EyeTracker>()->reset(); | 6698 | DependencyManager::get<EyeTracker>()->reset(); |
| 6696 | _overlayConductor.centerUI(); | 6699 | _overlayConductor.centerUI(); |
| 6700 | getActiveDisplayPlugin()->resetSensors(); | ||
| 6697 | getMyAvatar()->reset(true, andReload); | 6701 | getMyAvatar()->reset(true, andReload); |
| 6698 | QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection); | 6702 | QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection); |
| 6699 | } | 6703 | } |