Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:15:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle case where obj at rest but still falls

Browse source
This commit is contained in:
Andrew Meadows 2014-12-17 15:52:34 -08:00
parent 1e5c44f117
commit 44ebf37510
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -650,7 +650,7 @@ void EntityItem::simulate(const quint64& now) {
} }
} }
if (hasVelocity()) { if (hasVelocity() || hasGravity()) {
glm::vec3 position = getPosition(); glm::vec3 position = getPosition();
glm::vec3 velocity = getVelocity(); glm::vec3 velocity = getVelocity();
glm::vec3 newPosition = position + (velocity * timeElapsed); glm::vec3 newPosition = position + (velocity * timeElapsed);
@ -731,7 +731,7 @@ void EntityItem::simulate(const quint64& now) {
} }
bool EntityItem::isMoving() const { bool EntityItem::isMoving() const {
return hasVelocity() || hasAngularVelocity(); return hasVelocity() (hasGravity() && !isRestingOnSurface()) || hasAngularVelocity();
} }
bool EntityItem::lifetimeHasExpired() const { bool EntityItem::lifetimeHasExpired() const {