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

changed to only collide with moving entities

Browse source
This commit is contained in:
ZappoMan 2014-09-24 18:06:08 -07:00
parent 4b52fddffd
commit 2cfa14d5ad
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/entities/src/EntityCollisionSystem.cpp
View file

@ -43,26 +43,13 @@ void EntityCollisionSystem::init(EntityEditPacketSender* packetSender,
EntityCollisionSystem::~EntityCollisionSystem() { EntityCollisionSystem::~EntityCollisionSystem() {
} }
bool EntityCollisionSystem::updateOperation(OctreeElement* element, void* extraData) {
EntityCollisionSystem* system = static_cast<EntityCollisionSystem*>(extraData);
EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
// iterate the Entities...
QList<EntityItem*>& entities = entityTreeElement->getEntities();
uint16_t numberOfEntities = entities.size();
for (uint16_t i = 0; i < numberOfEntities; i++) {
EntityItem* entity = entities[i];
system->checkEntity(entity);
}
return true;
}
void EntityCollisionSystem::update() { void EntityCollisionSystem::update() {
// update all Entities // update all Entities
if (_entities->tryLockForRead()) { if (_entities->tryLockForRead()) {
_entities->recurseTreeWithOperation(updateOperation, this); QList<EntityItem*>& movingEntities = _entities->getMovingEntities();
foreach (EntityItem* entity, movingEntities) {
checkEntity(entity);
}
_entities->unlock(); _entities->unlock();
} }
} }

2
libraries/entities/src/EntityTree.h
View file

@ -139,6 +139,8 @@ public:
void trackDeletedEntity(const EntityItemID& entityID); void trackDeletedEntity(const EntityItemID& entityID);
QList<EntityItem*>& getMovingEntities() { return _movingEntities; }
private: private:
void updateChangingEntities(quint64 now, QSet<EntityItemID>& entitiesToDelete); void updateChangingEntities(quint64 now, QSet<EntityItemID>& entitiesToDelete);