From a11b996a5104161b788de6c2fe39c987dbe6adaa Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 7 May 2014 16:00:39 -0700 Subject: [PATCH] cleaner way to achieve the last commit --- interface/src/avatar/MyAvatar.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 08cdca2a25..dd68201b46 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -991,12 +991,10 @@ void MyAvatar::updateCollisionWithVoxels(float deltaTime, float radius) { } distance += capsuleRadius + boundingShape.getHalfHeight(); totalPenetration = addPenetrations(totalPenetration, - distance * _worldUpDirection); - } else { - totalPenetration = addPenetrations(totalPenetration, collision->_penetration); + continue; } - } else { - totalPenetration = addPenetrations(totalPenetration, collision->_penetration); } + totalPenetration = addPenetrations(totalPenetration, collision->_penetration); } applyHardCollision(totalPenetration, VOXEL_ELASTICITY, VOXEL_DAMPING); _wasStuck = isStuck;