Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

all code that asks isMoving appears to mean relative to parent

Browse source
This commit is contained in:
Seth Alves 2016-02-10 18:21:44 -08:00
parent 3f922240d0
commit 3e71efcdbb
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -993,10 +993,6 @@ void EntityItem::simulateKinematicMotion(float timeElapsed, bool setFlags) {
} }
bool EntityItem::isMoving() const { bool EntityItem::isMoving() const {
return hasVelocity() || hasAngularVelocity();
}
bool EntityItem::isMovingRelativeToParent() const {
return hasLocalVelocity() || hasLocalAngularVelocity(); return hasLocalVelocity() || hasLocalAngularVelocity();
} }

1
libraries/entities/src/EntityItem.h
View file

@ -345,7 +345,6 @@ public:
void clearDirtyFlags(uint32_t mask = 0xffffffff) { _dirtyFlags &= ~mask; } void clearDirtyFlags(uint32_t mask = 0xffffffff) { _dirtyFlags &= ~mask; }
bool isMoving() const; bool isMoving() const;
bool isMovingRelativeToParent() const;
bool isSimulated() const { return _simulated; } bool isSimulated() const { return _simulated; }

2
libraries/entities/src/EntitySimulation.cpp
View file

@ -254,7 +254,7 @@ void EntitySimulation::moveSimpleKinematics(const quint64& now) {
SetOfEntities::iterator itemItr = _simpleKinematicEntities.begin(); SetOfEntities::iterator itemItr = _simpleKinematicEntities.begin();
while (itemItr != _simpleKinematicEntities.end()) { while (itemItr != _simpleKinematicEntities.end()) {
EntityItemPointer entity = *itemItr; EntityItemPointer entity = *itemItr;
if (entity->isMovingRelativeToParent() && !entity->getPhysicsInfo()) { if (entity->isMoving() && !entity->getPhysicsInfo()) {
entity->simulate(now); entity->simulate(now);
_entitiesToSort.insert(entity); _entitiesToSort.insert(entity);
++itemItr; ++itemItr;