From 774a0acb51b7e97c1f7951fc90ddd51c19527a50 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 22 Jun 2018 00:07:37 +0100 Subject: Expanding entity system --- yage/entity/entity.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'yage/entity/entity.cpp') diff --git a/yage/entity/entity.cpp b/yage/entity/entity.cpp index 050514c3..25e8e2d0 100644 --- a/yage/entity/entity.cpp +++ b/yage/entity/entity.cpp @@ -1,5 +1,7 @@ #include "entity.h" +#include "component.h" + #include namespace yage @@ -27,14 +29,23 @@ bool EntityManager::is_valid(Entity entity) const return false; } +EntityManager &EntityManager::add_component(Entity entity, + BaseComponent *component) +{ + auto id = component->getGroup(); + component_masks_[entity] = + component_masks_[entity] | ComponentMask(1 << id); + return *this; +} + Entity EntityManager::update_next_entity() { if (deleted_.empty()) { - return ++next_entity_; + return next_entity_++; } - next_entity_ = deleted_.back(); + Entity ent = deleted_.back(); deleted_.pop_back(); - return next_entity_; + return ent; } } // namespace yage -- cgit