sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sdk/World: Refactor 

Former-commit-id: abdef9b717866de6ab91624242583830573d9320
This commit is contained in:
Lynix 2015-12-10 23:50:35 +01:00
parent 8adc0097df
commit f8f3dbd696
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
SDK/src/NDK/World.cpp
View File

@ -127,34 +127,33 @@ namespace Ndk
Entity* entity = &m_entities[i].entity; Entity* entity = &m_entities[i].entity;
// Aucun intérêt de traiter une entité n'existant plus // Check entity validity (as it could have been reported as dirty and killed during the same iteration)
if (entity->IsValid()) if (!entity->IsValid())
continue;
for (auto& system : m_systems)
{ {
for (auto& system : m_systems) // Ignore non-existent systems
if (!system)
continue;
// Is our entity already part of this system?
bool partOfSystem = system->HasEntity(entity);
// Should it be part of it?
if (entity->IsEnabled() && system->Filters(entity))
{ {
// Ignore non-existent systems // Yes it should, add it to the system if not already done and validate it (again)
if (!system) if (!partOfSystem)
continue; system->AddEntity(entity);
// L'entité est-elle enregistrée comme faisant partie du système ? system->ValidateEntity(entity, !partOfSystem);
bool partOfSystem = system->HasEntity(entity); }
else
// Doit-elle en faire partie ? {
if (system->Filters(entity)) // No, it shouldn't, remove it if it's part of the system
if (entity->IsEnabled() && system->Filters(entity)) if (partOfSystem)
{ system->RemoveEntity(entity);
// L'entité doit faire partie du système, revalidons-là (événement système) ou ajoutons-la au système
if (!partOfSystem)
system->AddEntity(entity);
system->ValidateEntity(entity, !partOfSystem);
}
else
{
// Elle ne doit pas en faire partie, si elle en faisait partie nous devons la retirer
if (partOfSystem)
system->RemoveEntity(entity);
}
} }
} }
} }