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

update avatar collision shapes when necessary

Browse source
This commit is contained in:
Andrew Meadows 2014-04-22 20:55:28 -07:00
parent 1986ac6be3
commit 5992651c27
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/MyAvatar.cpp
View file

@ -335,7 +335,8 @@ void MyAvatar::simulate(float deltaTime) {
radius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.0f)); radius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.0f));
radius *= COLLISION_RADIUS_SCALAR; radius *= COLLISION_RADIUS_SCALAR;
} }
if (_collisionFlags) {
updateShapePositions();
if (_collisionFlags & COLLISION_GROUP_ENVIRONMENT) { if (_collisionFlags & COLLISION_GROUP_ENVIRONMENT) {
updateCollisionWithEnvironment(deltaTime, radius); updateCollisionWithEnvironment(deltaTime, radius);
} }
@ -346,6 +347,7 @@ void MyAvatar::simulate(float deltaTime) {
updateCollisionWithAvatars(deltaTime); updateCollisionWithAvatars(deltaTime);
} }
} }
}
// consider updating our billboard // consider updating our billboard
maybeUpdateBillboard(); maybeUpdateBillboard();
@ -914,7 +916,6 @@ void MyAvatar::updateCollisionWithAvatars(float deltaTime) {
// no need to compute a bunch of stuff if we have one or fewer avatars // no need to compute a bunch of stuff if we have one or fewer avatars
return; return;
} }
updateShapePositions();
float myBoundingRadius = getBoundingRadius(); float myBoundingRadius = getBoundingRadius();
const float BODY_COLLISION_RESOLUTION_FACTOR = glm::max(1.0f, deltaTime / BODY_COLLISION_RESOLUTION_TIMESCALE); const float BODY_COLLISION_RESOLUTION_FACTOR = glm::max(1.0f, deltaTime / BODY_COLLISION_RESOLUTION_TIMESCALE);