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

Improved interface

Browse Source 
EntityHandle are no longer required to pass Entity as arguments
World::CreateEntity() now returns a const EntityHandle&

Former-commit-id: 6fc53ce5759a2a508094bdc61b4471f13f0844ec
This commit is contained in:
Lynix
2015-03-18 00:49:44 +01:00
parent e91313b62d
commit be8f6edeb4
9 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SDK/include/NDK/BaseSystem.inl
View File

@@ -27,8 +27,11 @@ namespace Ndk
return *m_world;
}
inline bool BaseSystem::HasEntity(const EntityHandle& entity) const
inline bool BaseSystem::HasEntity(const Entity* entity) const
{
if (!entity)
return false;
return m_entityBits.UnboundedTest(entity->GetId());
}
@@ -72,9 +75,11 @@ namespace Ndk
m_requiredComponents.insert(componentId);
}
inline void BaseSystem::AddEntity(const EntityHandle& entity)
inline void BaseSystem::AddEntity(Entity* entity)
{
m_entities.push_back(entity);
NazaraAssert(entity, "Invalid entity");
m_entities.push_back(entity->CreateHandle());
m_entityBits.UnboundedSet(entity->GetId(), true);
entity->RegisterSystem(m_systemId);
@@ -82,9 +87,11 @@ namespace Ndk
OnEntityAdded(entity);
}
inline void BaseSystem::RemoveEntity(const EntityHandle& entity)
inline void BaseSystem::RemoveEntity(Entity* entity)
{
auto it = std::find(m_entities.begin(), m_entities.end(), entity);
NazaraAssert(entity, "Invalid entity");
auto it = std::find(m_entities.begin(), m_entities.end(), *entity);
NazaraAssert(it != m_entities.end(), "Entity is not part of this system");
// Pour éviter de déplacer beaucoup de handles, on swap le dernier avec celui à supprimer