From 280c39c65f47b4d1395d0dfe583a67a058804a27 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 24 Oct 2018 08:20:13 +0800
Subject: =?UTF-8?q?*=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libjin/Game/je_entity.h | 79 ++++++---------------------------------------
 1 file changed, 9 insertions(+), 70 deletions(-)

(limited to 'src/libjin/Game/je_entity.h')

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
-- 
cgit v1.1-26-g67d0