History

Merge branch 'master' of github.com:highfidelity/hifi into head-controller

Seth Alves committed 9 years ago

Commit d91b3702 parents 2766475 bc2311c22 files · +145 −76Browse files

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

Unified · Split

interface/src/Application.cpp+9−2
@@ -1459,6 +1459,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1458 unmodified lines
1459 updateSystemTabletMode();1459 updateSystemTabletMode();
1460 1460
1461 connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);1461 connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
1462
1463 qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
1462}1464}
1463 1465
1464void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {1466void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
@@ -1681,6 +1683,10 @@ Application::~Application() { · 216 unmodified lines
1681 1683
1682 _physicsEngine->setCharacterController(nullptr);1684 _physicsEngine->setCharacterController(nullptr);
1683 1685
1686 // the _shapeManager should have zero references
1687 _shapeManager.collectGarbage();
1688 assert(_shapeManager.getNumShapes() == 0);
1689
1684 // shutdown render engine1690 // shutdown render engine
1685 _main3DScene = nullptr;1691 _main3DScene = nullptr;
1686 _renderEngine = nullptr;1692 _renderEngine = nullptr;
@@ -4492,12 +4498,13 @@ void Application::update(float deltaTime) { · 2805 unmodified lines
4492 4498
4493 getEntities()->getTree()->withWriteLock([&] {4499 getEntities()->getTree()->withWriteLock([&] {
4494 PerformanceTimer perfTimer("handleOutgoingChanges");4500 PerformanceTimer perfTimer("handleOutgoingChanges");
4495 const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
4496 _entitySimulation->handleDeactivatedMotionStates(deactivations);
4497 4501
4498 const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();4502 const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
4499 _entitySimulation->handleChangedMotionStates(outgoingChanges);4503 _entitySimulation->handleChangedMotionStates(outgoingChanges);
4500 avatarManager->handleChangedMotionStates(outgoingChanges);4504 avatarManager->handleChangedMotionStates(outgoingChanges);
4505
4506 const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
4507 _entitySimulation->handleDeactivatedMotionStates(deactivations);
4501 });4508 });
4502 4509
4503 if (!_aboutToQuit) {4510 if (!_aboutToQuit) {