diff options
Diffstat (limited to 'src/libjin/Game')
| -rw-r--r-- | src/libjin/Game/je_entity.h | 14 | ||||
| -rw-r--r-- | src/libjin/Game/je_scene.h | 8 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/libjin/Game/je_entity.h b/src/libjin/Game/je_entity.h index 4a252da..d67a71f 100644 --- a/src/libjin/Game/je_entity.h +++ b/src/libjin/Game/je_entity.h @@ -10,6 +10,7 @@ #include "../common/je_object.h" #include "../common/je_types.h" +#include "../graphics/je_sprite.h" namespace JinEngine { @@ -43,15 +44,20 @@ namespace JinEngine /// void setActive(bool isActive); + /// + /// + /// + void setOrder(uint32 order); + protected: virtual void onAlive(); virtual void onUpdate(float dt); virtual void onDraw(); - virtual void onDie(); + virtual void onDestroy(); - uint32 layer; // layer where entity belongs - uint32 index; // render index in layer - uint64 tag; // tag of entity, 64 now + 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 diff --git a/src/libjin/Game/je_scene.h b/src/libjin/Game/je_scene.h index f510a1f..6100166 100644 --- a/src/libjin/Game/je_scene.h +++ b/src/libjin/Game/je_scene.h @@ -28,7 +28,7 @@ namespace JinEngine /// /// /// - EntityList& getEntitiesByTag(uint64 tag); + EntityList& getEntitiesByTag(uint32 tag); /// /// @@ -38,7 +38,7 @@ namespace JinEngine /// /// /// - void setEntitiesActiveByTag(uint64 tag); + void setEntitiesActiveByTag(uint32 tag); /// /// @@ -53,7 +53,7 @@ namespace JinEngine /// /// /// - void removeEntitiesByTag(uint64 tag); + void removeEntitiesByTag(uint32 tag); protected: // all entities @@ -61,7 +61,7 @@ namespace JinEngine // all entities grouped by layer, render order std::map<uint32, EntityList> layers; // all entities grouped by tag - std::map<uint64, EntityList> tags; + std::map<uint32, EntityList> tags; }; |