From 7322a090355af1989d7a1de0de431b6c89844fe2 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 25 Oct 2018 08:18:13 +0800 Subject: =?UTF-8?q?*=E5=A2=9E=E5=8A=A0lua=E5=AF=BC=E5=87=BA=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Game/je_entity.h | 8 ++-- src/libjin/Game/je_game_object.cpp | 11 ----- src/libjin/Game/je_game_object.h | 86 -------------------------------------- src/libjin/Game/je_gameobject.cpp | 11 +++++ src/libjin/Game/je_gameobject.h | 86 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 100 deletions(-) delete mode 100644 src/libjin/Game/je_game_object.cpp delete mode 100644 src/libjin/Game/je_game_object.h create mode 100644 src/libjin/Game/je_gameobject.cpp create mode 100644 src/libjin/Game/je_gameobject.h (limited to 'src/libjin/Game') diff --git a/src/libjin/Game/je_entity.h b/src/libjin/Game/je_entity.h index cf4eeb0..92976b4 100644 --- a/src/libjin/Game/je_entity.h +++ b/src/libjin/Game/je_entity.h @@ -1,7 +1,7 @@ #ifndef __JE_ENTITY_H #define __JE_ENTITY_H -#include "je_game_object.h" +#include "je_gameobject.h" namespace JinEngine { @@ -14,12 +14,14 @@ namespace JinEngine class Entity : public GameObject { public: + Entity(); private: + }; - } -} + } // namespace Game +} // namespace JinEngine #endif \ No newline at end of file diff --git a/src/libjin/Game/je_game_object.cpp b/src/libjin/Game/je_game_object.cpp deleted file mode 100644 index 1396518..0000000 --- a/src/libjin/Game/je_game_object.cpp +++ /dev/null @@ -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_game_object.h b/src/libjin/Game/je_game_object.h deleted file mode 100644 index 08a103f..0000000 --- a/src/libjin/Game/je_game_object.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef __JE_GAME_OBJECT_H -#define __JE_GAME_OBJECT_H - -#include "../core/je_configuration.h" -#if defined(jin_game) - -#include -#include -#include - -#include "../common/je_object.h" -#include "../common/je_types.h" -#include "../graphics/je_sprite.h" - -namespace JinEngine -{ - namespace Game - { - - /// - /// Game object base class. - /// - class GameObject : public Object - { - public: - - /// - /// - /// - virtual ~GameObject(); - - /// - /// - /// - 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 mPosition; - - }; - - /// - /// Entity list. For quickly adding and removing entities. - /// - typedef std::list EntityList; - - /// - /// Entity set. For searching and keeps entities unique and sorted. - /// - typedef std::set EntitySet; - - } // namespace Game -} // namespace JinEngine - -#endif // jin_game - -#endif \ No newline at end of file diff --git a/src/libjin/Game/je_gameobject.cpp b/src/libjin/Game/je_gameobject.cpp new file mode 100644 index 0000000..1396518 --- /dev/null +++ b/src/libjin/Game/je_gameobject.cpp @@ -0,0 +1,11 @@ +#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_gameobject.h b/src/libjin/Game/je_gameobject.h new file mode 100644 index 0000000..08a103f --- /dev/null +++ b/src/libjin/Game/je_gameobject.h @@ -0,0 +1,86 @@ +#ifndef __JE_GAME_OBJECT_H +#define __JE_GAME_OBJECT_H + +#include "../core/je_configuration.h" +#if defined(jin_game) + +#include +#include +#include + +#include "../common/je_object.h" +#include "../common/je_types.h" +#include "../graphics/je_sprite.h" + +namespace JinEngine +{ + namespace Game + { + + /// + /// Game object base class. + /// + class GameObject : public Object + { + public: + + /// + /// + /// + virtual ~GameObject(); + + /// + /// + /// + 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 mPosition; + + }; + + /// + /// Entity list. For quickly adding and removing entities. + /// + typedef std::list EntityList; + + /// + /// Entity set. For searching and keeps entities unique and sorted. + /// + typedef std::set EntitySet; + + } // namespace Game +} // namespace JinEngine + +#endif // jin_game + +#endif \ No newline at end of file -- cgit v1.1-26-g67d0