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

Remade component ids

Browse Source 
No longer based on incrementing counter


Former-commit-id: b875e17781d8bcda48ea9ada523adf0823b22a8b
This commit is contained in:
Lynix
2015-03-17 19:53:59 +01:00
parent 0ba034f7e9
commit bc40fbb02f
14 changed files with 83 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SDK/include/NDK/Entity.hpp
View File

@@ -11,6 +11,7 @@
#include <NDK/Component.hpp>
#include <memory>
#include <vector>
#include <unordered_map>
namespace Ndk
{
@@ -23,8 +24,6 @@ namespace Ndk
friend World;
public:
using Id = nzUInt32;
Entity(const Entity&) = delete;
Entity(Entity&& entity);
~Entity();
@@ -34,13 +33,12 @@ namespace Ndk
EntityHandle CreateHandle();
BaseComponent& GetComponent(nzUInt32 componentId);
BaseComponent& GetComponent(ComponentId componentId);
template<typename ComponentType> ComponentType& GetComponent();
const NzBitset<>& GetComponentBits() const;
Id GetId() const;
EntityId GetId() const;
World* GetWorld() const;
bool HasComponent(nzUInt32 componentId) const;
bool HasComponent(ComponentId componentId) const;
template<typename ComponentType> bool HasComponent() const;
void Kill();
@@ -48,14 +46,14 @@ namespace Ndk
bool IsValid() const;
void RemoveAllComponents();
void RemoveComponent(nzUInt32 componentId);
void RemoveComponent(ComponentId componentId);
template<typename ComponentType> void RemoveComponent();
Entity& operator=(const Entity&) = delete;
Entity& operator=(Entity&&) = delete;
private:
Entity(World& world, Id id);
Entity(World& world, EntityId id);
void Create();
void Destroy();
@@ -63,10 +61,9 @@ namespace Ndk
void RegisterHandle(EntityHandle* handle);
void UnregisterHandle(EntityHandle* handle);
std::vector<std::unique_ptr<BaseComponent>> m_components;
std::vector<EntityHandle*> m_handles;
Id m_id;
NzBitset<> m_componentBits;
std::unordered_map<ComponentId, std::unique_ptr<BaseComponent>> m_components;
EntityId m_id;
World* m_world;
bool m_valid;
};