From bf6b8f9ca752068620323cd0922c1f4e464a1ae7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 5 Jan 2015 12:01:09 -0800 Subject: [PATCH] do not zero small velocities for non-bullet case --- libraries/entities/src/EntityItem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 99c55740f7..05ef9cd101 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -714,10 +714,12 @@ void EntityItem::simulate(const quint64& now) { if (position.y <= getDistanceToBottomOfEntity()) { 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) { velocity = NO_VELOCITY; } +#endif // !USE_BULLET_PHYSICS position.y = getDistanceToBottomOfEntity(); }