Merge branch 'master' of github.com:highfidelity/hifi into feature/quest

danteruiz committed 7 years ago

Commit 95d30e52 parents b8906c3 632d6e857 files · +4509 −4Browse files

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

Unified · Split

interface/src/Application.cpp+2−0

@@ -6350,6 +6350,8 @@ void Application::update(float deltaTime) { · 6349 unmodified lines
6350	_physicsEngine->processTransaction(transaction);	6350	_physicsEngine->processTransaction(transaction);
6351	myAvatar->getCharacterController()->handleProcessedPhysicsTransaction(transaction);	6351	myAvatar->getCharacterController()->handleProcessedPhysicsTransaction(transaction);
6352	myAvatar->prepareForPhysicsSimulation();	6352	myAvatar->prepareForPhysicsSimulation();
		6353	_physicsEngine->enableGlobalContactAddedCallback(myAvatar->isFlying());
		6354
6353	_physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {	6355	_physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {
6354	dynamic->prepareForPhysicsSimulation();	6356	dynamic->prepareForPhysicsSimulation();
6355	});	6357	});