Showing the changes to libraries/entities/src/EntityCollisionSystem.cpp (1 of 2 files). Show all
Unified · Split
| @@ -43,26 +43,13 @@ void EntityCollisionSystem::init(EntityEditPacketSender* packetSender, · 42 unmodified lines | ||
| 43 | 43 | EntityCollisionSystem::~EntityCollisionSystem() { |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | −bool EntityCollisionSystem::updateOperation(OctreeElement* element, void* extraData) { | |
| 47 | − EntityCollisionSystem* system = static_cast<EntityCollisionSystem*>(extraData); | |
| 48 | − EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element); | |
| 49 | − | |
| 50 | − // iterate the Entities... | |
| 51 | − QList<EntityItem*>& entities = entityTreeElement->getEntities(); | |
| 52 | − uint16_t numberOfEntities = entities.size(); | |
| 53 | − for (uint16_t i = 0; i < numberOfEntities; i++) { | |
| 54 | − EntityItem* entity = entities[i]; | |
| 55 | − system->checkEntity(entity); | |
| 56 | − } | |
| 57 | − | |
| 58 | − return true; | |
| 59 | −} | |
| 60 | − | |
| 61 | − | |
| 62 | 46 | void EntityCollisionSystem::update() { |
| 63 | 47 | // update all Entities |
| 64 | 48 | if (_entities->tryLockForRead()) { |
| 65 | − _entities->recurseTreeWithOperation(updateOperation, this); | |
| 49 | + QList<EntityItem*>& movingEntities = _entities->getMovingEntities(); | |
| 50 | + foreach (EntityItem* entity, movingEntities) { | |
| 51 | + checkEntity(entity); | |
| 52 | + } | |
| 66 | 53 | _entities->unlock(); |
| 67 | 54 | } |
| 68 | 55 | } |