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

do not zero small velocities for non-bullet case

Browse source
This commit is contained in:
Andrew Meadows 2015-01-05 12:01:09 -08:00
parent 21b2d14956
commit bf6b8f9ca7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityItem.cpp
View file

@ -714,10 +714,12 @@ void EntityItem::simulate(const quint64& now) {
if (position.y <= getDistanceToBottomOfEntity()) { if (position.y <= getDistanceToBottomOfEntity()) {
velocity = velocity * glm::vec3(1,-1,1); velocity = velocity * glm::vec3(1,-1,1);
// if we've slowed considerably, then just stop moving #ifndef USE_BULLET_PHYSICS
// if we've slowed considerably, then just stop moving, but only if no BULLET
if (glm::length(velocity) <= EPSILON_VELOCITY_LENGTH) { if (glm::length(velocity) <= EPSILON_VELOCITY_LENGTH) {
velocity = NO_VELOCITY; velocity = NO_VELOCITY;
} }
#endif // !USE_BULLET_PHYSICS
position.y = getDistanceToBottomOfEntity(); position.y = getDistanceToBottomOfEntity();
} }