Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleaner way to achieve the last commit

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

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

@ -991,12 +991,10 @@ void MyAvatar::updateCollisionWithVoxels(float deltaTime, float radius) {
} }
distance += capsuleRadius + boundingShape.getHalfHeight(); distance += capsuleRadius + boundingShape.getHalfHeight();
totalPenetration = addPenetrations(totalPenetration, - distance * _worldUpDirection); totalPenetration = addPenetrations(totalPenetration, - distance * _worldUpDirection);
} else { continue;
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;