# Conflicts: # interface/src/Application.cpp
Showing the changes to interface/src/Application.cpp (1 of 45 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; |
| @@ -6088,6 +6091,9 @@ void Application::update(float deltaTime) { · 5162 unmodified lines | |||
| 6088 | 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... |
| 6089 | updateDialogs(deltaTime); // update various stats dialogs if present | 6092 | updateDialogs(deltaTime); // update various stats dialogs if present |
| 6090 | 6093 | ||
| 6094 | auto grabManager = DependencyManager::get<GrabManager>(); | ||
| 6095 | grabManager->simulateGrabs(); | ||
| 6096 | |||
| 6091 | QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>(); | 6097 | QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>(); |
| 6092 | 6098 | ||
| 6093 | { | 6099 | { |