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

Re-remade component and system ids

Browse Source 
Former-commit-id: 98b76695cca904c55c7333801c3cdf693da15086
This commit is contained in:
Lynix
2015-03-30 04:18:44 +02:00
parent 3fd217b8a3
commit 6d1ac4fe18
17 changed files with 196 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SDK/src/NDK/BaseSystem.cpp
View File

@@ -9,7 +9,7 @@ namespace Ndk
BaseSystem::~BaseSystem()
{
for (const EntityHandle& entity : m_entities)
entity->UnregisterSystem(m_systemId);
entity->UnregisterSystem(m_systemIndex);
}
bool BaseSystem::Filters(const Entity* entity) const
@@ -17,19 +17,17 @@ namespace Ndk
if (!entity)
return false;
for (ComponentId component : m_requiredComponents)
{
if (!entity->HasComponent(component))
return false; // Au moins un component requis n'est pas présent
}
const NzBitset<>& components = entity->GetComponentBits();
for (ComponentId component : m_excludedComponents)
{
if (entity->HasComponent(component))
return false; // Au moins un component exclu est présent
}
m_filterResult.PerformsAND(m_requiredComponents, components);
if (m_filterResult != m_requiredComponents)
return false; // Au moins un component requis n'est pas présent
return true;
m_filterResult.PerformsAND(m_excludedComponents, components);
if (m_filterResult.TestAny())
return false; // Au moins un component exclu est présent
return true;
}
void BaseSystem::OnEntityAdded(Entity* entity)
@@ -41,4 +39,6 @@ namespace Ndk
{
NazaraUnused(entity);
}
SystemIndex BaseSystem::s_nextIndex = 0;
}