History

Merge pull request #7643 from AndrewMeadows/faster-bullet

faster Bullet kinematics

Brad Hefta-Gaub committed 10 years ago

Commit ea4da052 parents c9b0531 4d7efbc16 files · +80 −88Browse files

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

Unified · Split

interface/src/Application.cpp+2−5
@@ -3444,7 +3444,7 @@ void Application::update(float deltaTime) { · 3443 unmodified lines
3444 getEntities()->getTree()->withWriteLock([&] {3444 getEntities()->getTree()->withWriteLock([&] {
3445 PerformanceTimer perfTimer("handleOutgoingChanges");3445 PerformanceTimer perfTimer("handleOutgoingChanges");
3446 const VectorOfMotionStates& outgoingChanges = _physicsEngine->getOutgoingChanges();3446 const VectorOfMotionStates& outgoingChanges = _physicsEngine->getOutgoingChanges();
3447 _entitySimulation.handleOutgoingChanges(outgoingChanges, Physics::getSessionUUID());3447 _entitySimulation.handleOutgoingChanges(outgoingChanges);
3448 avatarManager->handleOutgoingChanges(outgoingChanges);3448 avatarManager->handleOutgoingChanges(outgoingChanges);
3449 });3449 });
3450 3450
@@ -4540,10 +4540,7 @@ bool Application::acceptURL(const QString& urlString, bool defaultUpload) { · 1089 unmodified lines
4540}4540}
4541 4541
4542void Application::setSessionUUID(const QUuid& sessionUUID) const {4542void Application::setSessionUUID(const QUuid& sessionUUID) const {
4543 // HACK: until we swap the library dependency order between physics and entities4543 Physics::setSessionUUID(sessionUUID);
4544 // we cache the sessionID in two distinct places for physics.
4545 Physics::setSessionUUID(sessionUUID); // TODO: remove this one
4546 _physicsEngine->setSessionUUID(sessionUUID);
4547}4544}
4548 4545
4549bool Application::askToSetAvatarUrl(const QString& url) {4546bool Application::askToSetAvatarUrl(const QString& url) {