History

cleanup

howard-stearns committed 7 years ago

Commit cc7214f1 parent 2eb3fdb2 files · +14 −19Browse files

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

Unified · Split

interface/src/Application.cpp+0−6
@@ -2836,20 +2836,17 @@ void Application::cleanupBeforeQuit() { · 2835 unmodified lines
2836}2836}
2837 2837
2838Application::~Application() {2838Application::~Application() {
2839 qCInfo(interfaceapp) << "HRS FIXME Quit 1";
2840 // remove avatars from physics engine2839 // remove avatars from physics engine
2841 auto avatarManager = DependencyManager::get<AvatarManager>();2840 auto avatarManager = DependencyManager::get<AvatarManager>();
2842 avatarManager->clearOtherAvatars();2841 avatarManager->clearOtherAvatars();
2843 auto myCharacterController = getMyAvatar()->getCharacterController();2842 auto myCharacterController = getMyAvatar()->getCharacterController();
2844 myCharacterController->clearDetailedMotionStates();2843 myCharacterController->clearDetailedMotionStates();
2845 qCInfo(interfaceapp) << "HRS FIXME Quit 2";
2846 2844
2847 PhysicsEngine::Transaction transaction;2845 PhysicsEngine::Transaction transaction;
2848 avatarManager->buildPhysicsTransaction(transaction);2846 avatarManager->buildPhysicsTransaction(transaction);
2849 _physicsEngine->processTransaction(transaction);2847 _physicsEngine->processTransaction(transaction);
2850 avatarManager->handleProcessedPhysicsTransaction(transaction);2848 avatarManager->handleProcessedPhysicsTransaction(transaction);
2851 avatarManager->deleteAllAvatars();2849 avatarManager->deleteAllAvatars();
2852 qCInfo(interfaceapp) << "HRS FIXME Quit 3";
2853 2850
2854 _physicsEngine->setCharacterController(nullptr);2851 _physicsEngine->setCharacterController(nullptr);
2855 2852
@@ -2860,12 +2857,9 @@ Application::~Application() { · 4 unmodified lines
2860 // shutdown graphics engine2857 // shutdown graphics engine
2861 _graphicsEngine.shutdown();2858 _graphicsEngine.shutdown();
2862 2859
2863 qCInfo(interfaceapp) << "HRS FIXME Quit 4";
2864 _gameWorkload.shutdown();2860 _gameWorkload.shutdown();
2865 qCInfo(interfaceapp) << "HRS FIXME Quit 5";
2866 2861
2867 DependencyManager::destroy<Preferences>();2862 DependencyManager::destroy<Preferences>();
2868 qCInfo(interfaceapp) << "HRS FIXME Quit 6";
2869#ifdef Q_OS_MAC2863#ifdef Q_OS_MAC
2870 DependencyManager::destroy<MacHelper>();2864 DependencyManager::destroy<MacHelper>();
2871#endif2865#endif