Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 10:49:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

unjack AvatarData locks

Browse source
This commit is contained in:
Seth Alves 2015-03-18 14:11:02 -07:00
parent 1cab14064d
commit e2a104c38a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/physics/src/PhysicsEngine.cpp
View file

@ -298,6 +298,7 @@ void PhysicsEngine::stepSimulation() {
_clock.reset(); _clock.reset();
float timeStep = btMin(dt, MAX_TIMESTEP); float timeStep = btMin(dt, MAX_TIMESTEP);
_avatarData->lockForRead();
if (_avatarData->isPhysicsEnabled()) { if (_avatarData->isPhysicsEnabled()) {
// update character controller // update character controller
glm::quat rotation = _avatarData->getOrientation(); glm::quat rotation = _avatarData->getOrientation();
@ -307,6 +308,7 @@ void PhysicsEngine::stepSimulation() {
btVector3 walkVelocity = glmToBullet(_avatarData->getVelocity()); btVector3 walkVelocity = glmToBullet(_avatarData->getVelocity());
_characterController->setVelocityForTimeInterval(walkVelocity, timeStep); _characterController->setVelocityForTimeInterval(walkVelocity, timeStep);
} }
_avatarData->unlock();
// This is step (2). // This is step (2).
int numSubsteps = _dynamicsWorld->stepSimulation(timeStep, MAX_NUM_SUBSTEPS, PHYSICS_ENGINE_FIXED_SUBSTEP); int numSubsteps = _dynamicsWorld->stepSimulation(timeStep, MAX_NUM_SUBSTEPS, PHYSICS_ENGINE_FIXED_SUBSTEP);
@ -342,7 +344,6 @@ void PhysicsEngine::stepSimulation() {
} }
unlock(); unlock();
_avatarData->unlock();
_entityTree->unlock(); _entityTree->unlock();
computeCollisionEvents(); computeCollisionEvents();