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

Added systems

Browse Source 
It's now officially an ECS, yay!


Former-commit-id: e2aacaa5c9fd362921cf3d064e346d11f942bd59
This commit is contained in:
Lynix
2015-03-17 19:55:39 +01:00
parent bc40fbb02f
commit e91313b62d
14 changed files with 476 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SDK/include/NDK/World.hpp
View File

@@ -11,25 +11,38 @@
#include <Nazara/Core/NonCopyable.hpp>
#include <NDK/Entity.hpp>
#include <NDK/EntityHandle.hpp>
#include <NDK/System.hpp>
#include <algorithm>
#include <memory>
#include <vector>
#include <unordered_map>
namespace Ndk
{
class NDK_API World : NzNonCopyable
{
friend Entity;
public:
using EntityList = std::vector<EntityHandle>;
World() = default;
~World();
BaseSystem& AddSystem(std::unique_ptr<BaseSystem>&& system);
template<typename SystemType, typename... Args> SystemType& AddSystem(Args&&... args);
EntityHandle CreateEntity();
EntityList CreateEntities(unsigned int count);
void Clear();
const EntityHandle& GetEntity(EntityId id);
BaseSystem& GetSystem(SystemId systemId);
template<typename SystemType> SystemType& GetSystem();
bool HasSystem(SystemId systemId) const;
template<typename SystemType> bool HasSystem() const;
void KillEntity(const EntityHandle& entity);
void KillEntities(const EntityList& list);
@@ -37,9 +50,16 @@ namespace Ndk
bool IsEntityValid(const EntityHandle& entity) const;
bool IsEntityIdValid(EntityId id) const;
void RemoveAllSystems();
void RemoveSystem(SystemId systemId);
template<typename SystemType> void RemoveSystem();
void Update();
private:
void MarkAllAsDirty();
void MarkAsDirty(EntityId id);
struct EntityBlock
{
EntityBlock(Entity&& e) :
@@ -53,7 +73,9 @@ namespace Ndk
std::vector<EntityId> m_freeIdList;
std::vector<EntityBlock> m_entities;
std::unordered_map<SystemId, std::unique_ptr<BaseSystem>> m_systems;
EntityList m_aliveEntities;
NzBitset<nzUInt64> m_dirtyEntities;
NzBitset<nzUInt64> m_killedEntities;
};
}