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
34443444 getEntities()->getTree()->withWriteLock([&] {
34453445 PerformanceTimer perfTimer("handleOutgoingChanges");
34463446 const VectorOfMotionStates& outgoingChanges = _physicsEngine->getOutgoingChanges();
3447− _entitySimulation.handleOutgoingChanges(outgoingChanges, Physics::getSessionUUID());
3447+ _entitySimulation.handleOutgoingChanges(outgoingChanges);
34483448 avatarManager->handleOutgoingChanges(outgoingChanges);
34493449 });
34503450
@@ -4540,10 +4540,7 @@ bool Application::acceptURL(const QString& urlString, bool defaultUpload) { · 1089 unmodified lines
45404540 }
45414541
45424542 void Application::setSessionUUID(const QUuid& sessionUUID) const {
4543− // HACK: until we swap the library dependency order between physics and entities
4544− // we cache the sessionID in two distinct places for physics.
4545− Physics::setSessionUUID(sessionUUID); // TODO: remove this one
4546− _physicsEngine->setSessionUUID(sessionUUID);
4543+ Physics::setSessionUUID(sessionUUID);
45474544 }
45484545
45494546 bool Application::askToSetAvatarUrl(const QString& url) {