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

avoid resolving penetration twice

Browse source
This commit is contained in:
Andrew Meadows 2014-05-07 15:58:00 -07:00
parent b92bbafc26
commit 2d3592e367
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -994,8 +994,9 @@ void MyAvatar::updateCollisionWithVoxels(float deltaTime, float radius) {
} else { } else {
totalPenetration = addPenetrations(totalPenetration, collision->_penetration); totalPenetration = addPenetrations(totalPenetration, collision->_penetration);
} }
} else {
totalPenetration = addPenetrations(totalPenetration, collision->_penetration);
} }
totalPenetration = addPenetrations(totalPenetration, collision->_penetration);
} }
applyHardCollision(totalPenetration, VOXEL_ELASTICITY, VOXEL_DAMPING); applyHardCollision(totalPenetration, VOXEL_ELASTICITY, VOXEL_DAMPING);
_wasStuck = isStuck; _wasStuck = isStuck;