diff options
Diffstat (limited to 'src/libjin/Game')
| -rw-r--r-- | src/libjin/Game/je_entity.cpp | 11 | ||||
| -rw-r--r-- | src/libjin/Game/je_entity.h | 79 |
2 files changed, 9 insertions, 81 deletions
diff --git a/src/libjin/Game/je_entity.cpp b/src/libjin/Game/je_entity.cpp index 1396518..e69de29 100644 --- a/src/libjin/Game/je_entity.cpp +++ b/src/libjin/Game/je_entity.cpp @@ -1,11 +0,0 @@ -#include "je_entity.h" - -namespace JinEngine -{ - namespace Game - { - - - - } // namespace Game -} // namespace JinEngine
\ No newline at end of file diff --git a/src/libjin/Game/je_entity.h b/src/libjin/Game/je_entity.h index 781bdc3..cf4eeb0 100644 --- a/src/libjin/Game/je_entity.h +++ b/src/libjin/Game/je_entity.h @@ -1,16 +1,7 @@ -#ifndef __JE_GAME_OBJECT_H -#define __JE_GAME_OBJECT_H +#ifndef __JE_ENTITY_H +#define __JE_ENTITY_H -#include "../core/je_configuration.h" -#if defined(jin_game) - -#include <list> -#include <map> -#include <set> - -#include "../common/je_object.h" -#include "../common/je_types.h" -#include "../graphics/je_sprite.h" +#include "je_game_object.h" namespace JinEngine { @@ -18,69 +9,17 @@ namespace JinEngine { /// - /// Game object base class. + /// /// - class Entity : public Object + class Entity : public GameObject { public: - /// - /// - /// - virtual ~Entity(); - - /// - /// - /// - void lifecycle(); - - /// - /// - /// - void setVisible(bool isVisible); - - /// - /// - /// - void setActive(bool isActive); - - /// - /// - /// - void setOrder(uint32 order); - - protected: - virtual void onAlive(); - virtual void onUpdate(float dt); - virtual void onDraw(); - virtual void onDestroy(); - - uint32 mLayer; // layer where entity belongs - uint32 mOrder; // render index in layer - uint32 mTag; // tag of entity, support 32 tags now - bool mIsVisible; // if the entity is visible or not - bool mIsActive; // if the entity is joined into the logic - - /// - /// Position of entity. - /// - Math::Vector2<float> mPosition; + private: }; - /// - /// Entity list. For quickly adding and removing entities. - /// - typedef std::list<Entity*> EntityList; - - /// - /// Entity set. For searching and keeps entities unique and sorted. - /// - typedef std::set<Entity*> EntitySet; - - } // namespace Game -} // namespace JinEngine - -#endif // jin_game + } +} -#endif
\ No newline at end of file +#endif
\ No newline at end of file |