1 files changed, 42 insertions, 38 deletions

diff --git a/src/lua/common/je_lua_shared.hpp b/src/lua/common/je_lua_shared.hpp
index 86ee9be..16dd943 100644
--- a/src/lua/common/je_lua_shared.hpp
+++ b/src/lua/common/je_lua_shared.hpp
@@ -5,6 +5,8 @@
 #include <vector>
 #include <functional>
 
+#include "libjin/jin.h"
+
 namespace JinEngine
 {
     namespace Lua
@@ -15,68 +17,70 @@ namespace JinEngine
         ///
         /// �̰߳�ȫ�Ĺ���ģ�塣
         ///
-        class SharedBase
+        class Shared
         {
         public:
-            bool isType(const char* t);
-
-            const char* getType();
-
-        protected:
-            friend class LuaObject;
-
-            SharedBase(void* obj, const char* t);
-
-            SharedBase(const SharedBase&);
-
-            ///
-            /// ��ͬһ���̵߳�lua_State�У�LuaObject��EngineObjectӦ����һһ��Ӧ����LuaObject(lua runtime)�������ü���
-            /// �ͻ��ա�Engine-side���ü�����Ϊ��ά����ͬ�̵߳�lua_State����ͬһ��EngineObject��ÿ����LuaObject��һ��
-            /// Sharedʱ������һ�����ü�������������ͬһ���߳��У�һ��EngineObjectֻ����һ��LuaObject�󶨣�������new 
-            /// instance�����У���ômCount�ͱ���EngineObject�Ĺ����߳�����
-            ///
-            void retain();
-
-            void release();
-
-            virtual ~SharedBase();
+            Shared(Object* obj, const char* type)
+                : mCount(0)
+                , mObject(obj)
+                , mType(type)
+            {
+            }
 
-            void* mObject;
-            int mCount;
-            const char* mType;
+            Object* operator->()
+            {
+                return static_cast<Object*>(mObject);
+            }
 
-        };
+            Object* getObject()
+            {
+                return static_cast<Object*>(mObject);
+            }
 
-        template<class T>
-        class Shared : public SharedBase
-        {
-        public:
-            Shared(T* obj, const char* type)
-                : SharedBase(obj, type)
+            inline const char* getType()
             {
+                return mType;
             }
 
-            T* operator->()
+            inline bool isType(const char* t)
             {
-                return static_cast<T*>(mObject);
+                return strcmp(mType, t) == 0;
             }
 
+            template<class T>
             T* getObject()
             {
                 return static_cast<T*>(mObject);
             }
 
         private:
-            Shared(const Shared<T>& shared);
+            friend class LuaObject;
+
+            Shared(const Shared& shared);
 
+            ///
+            /// Sharedֻ���ڶ�
+            ///
             ~Shared()
             {
-                T* obj = static_cast<T*>(mObject);
+                Object* obj = static_cast<Object*>(mObject);
                 delete obj;
             }
 
-        };
+            ///
+            /// ��ͬһ���̵߳�lua_State�У�LuaObject��EngineObjectӦ����һһ��Ӧ����LuaObject(lua runtime)�������ü���
+            /// �ͻ��ա�Engine-side���ü�����Ϊ��ά����ͬ�̵߳�lua_State����ͬһ��EngineObject��ÿ����LuaObject��һ��
+            /// Sharedʱ������һ�����ü�������������ͬһ���߳��У�һ��EngineObjectֻ����һ��LuaObject�󶨣�������new 
+            /// instance�����У���ômCount�ͱ���EngineObject�Ĺ����߳�����
+            ///
+            void retain();
+            void release();
 
+            Object* mObject;
+            int mCount;
+            const char* mType;
+        };
+        
     } // namespace Lua
 } // namespace JinEngine