Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 19:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

oops, forgot to add entities to Bullet simulation

Browse source
This commit is contained in:
Andrew Meadows 2014-12-02 15:44:07 -08:00
parent a21ebe4f6a
commit 9f11121df2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/physics/src/PhysicsEngine.cpp
View file

@ -50,7 +50,6 @@ void PhysicsEngine::updateEntities(QSet<EntityItem*>& entitiesToDelete) {
updateObject(motionState, entity->getUpdateFlags()); updateObject(motionState, entity->getUpdateFlags());
} }
entity->clearUpdateFlags(); entity->clearUpdateFlags();
// TODO: implement this
++item_itr; ++item_itr;
} }
@ -81,11 +80,16 @@ void PhysicsEngine::addEntity(EntityItem* entity) {
assert(entity); assert(entity);
void* physicsInfo = entity->getPhysicsInfo(); void* physicsInfo = entity->getPhysicsInfo();
if (!physicsInfo) { if (!physicsInfo) {
EntityMotionState* motionState = new EntityMotionState(entity);
entity->setPhysicsInfo(static_cast<void*>(motionState));
if (entity->isMortal()) { if (entity->isMortal()) {
_mortalEntities.insert(entity); _mortalEntities.insert(entity);
} }
EntityMotionState* motionState = new EntityMotionState(entity);
if (addObject(motionState)) {
entity->setPhysicsInfo(static_cast<void*>(motionState));
} else {
// We failed to add the object to the simulation. Probably because we couldn't create a shape for it.
delete motionState;
}
} }
} }