Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 06:42:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

set kinematic accel before stepping

Browse source
This commit is contained in:
Andrew Meadows 2016-04-19 15:46:00 -07:00
parent 8efb07cfd8
commit 14abb15216
1 changed files with 3 additions and 5 deletions

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

@ -873,14 +873,12 @@ void EntityItem::simulate(const quint64& now) {
#endif
if (!hasActions()) {
setAcceleration(_gravity);
if (!stepKinematicMotion(timeElapsed)) {
// this entity is no longer moving
// flag it to transition from KINEMATIC to STATIC
_dirtyFlags |= Simulation::DIRTY_MOTION_TYPE;
setAcceleration(Vectors::ZERO);
} else {
// this object is moving kinematically, so make sure its "measured acceleration" is "gravity"
setAcceleration(_gravity);
}
}
_lastSimulated = now;
@ -938,10 +936,10 @@ bool EntityItem::stepKinematicMotion(float timeElapsed) {
}
const float MIN_KINEMATIC_LINEAR_ACCELERATION_SQUARED = 1.0e-4f; // 0.01 m/sec^2
if (glm::length2(_gravity) > MIN_KINEMATIC_LINEAR_ACCELERATION_SQUARED) {
if (glm::length2(_acceleration) > MIN_KINEMATIC_LINEAR_ACCELERATION_SQUARED) {
// yes gravity
// acceleration is in world-frame but we need it in local-frame
glm::vec3 linearAcceleration = _gravity;
glm::vec3 linearAcceleration = _acceleration;
bool success;
Transform parentTransform = getParentTransform(success);
if (success) {