*merge from minimal

1 files changed, 77 insertions, 67 deletions

diff --git a/src/lua/common/Reference.hpp b/src/lua/common/Reference.hpp
index feb96bb..ba918bb 100644
--- a/src/lua/common/Reference.hpp
+++ b/src/lua/common/Reference.hpp
@@ -1,78 +1,88 @@
 #ifndef __JIN_COMMON_REFERENCE_H
 #define __JIN_COMMON_REFERENCE_H
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
-{
-
-    /*abstract*/class RefBase
+    namespace Lua
     {
-    public:
-        void retain()
-        {
-            ++count;
-        }
 
-        void release()
+        /*abstract*/class RefBase
         {
-            if (--count <= 0)
-                delete this;
-        }
-
-        // object type string
-        const char* const type;
-
-    protected:
-        RefBase(void* obj, const char* t)
-            : count(1)
-            , object(obj)
-            , type(t)
-        {
-        }
-
-        RefBase(const RefBase&);
-
-        virtual ~RefBase()
-        {
-        }
-
-        void* object;
-        int count;        
-
-    };
-
-    template<class T>
-    class Ref : public RefBase
-    {
-    public:
-        Ref(T* obj, const char* type)
-            : RefBase(obj, type)
+        public:
+            void retain()
+            {
+                ++count;
+            }
+
+            void release()
+            {
+                if (--count <= 0)
+                    delete this;
+            }
+
+            // object type string
+            const char* const type;
+
+		    void setUserdata(void* data)
+		    {
+			    userdata = data;
+		    }
+
+		    void* getUserdata()
+		    {
+			    return userdata;
+		    }
+
+        protected:
+            RefBase(void* obj, const char* t)
+                : count(1)
+                , object(obj)
+                , type(t)
+            {
+            }
+
+            RefBase(const RefBase&);
+
+            virtual ~RefBase()
+            {
+            }
+
+            void* object;
+            int count;        
+		    void* userdata;
+        };
+
+        template<class T>
+        class Ref : public RefBase
         {
-        }
-
-        ~Ref()
-        {
-            T* obj = (T*)object;
-            delete obj;
-        }
-
-        T* operator->()
-        {
-            return (T*)object;
-        }
-
-        T* getObject()
-        {
-            return (T*)object;
-        }
-
-    private:
-        Ref(const Ref<T>& ref);
-
-    };
-
-}
+        public:
+            Ref(T* obj, const char* type)
+                : RefBase(obj, type)
+            {
+            }
+
+            ~Ref()
+            {
+                T* obj = static_cast<T*>(object);
+                delete obj;
+            }
+
+            T* operator->()
+            {
+                return (T*)object;
+            }
+
+            T* getObject()
+            {
+                return (T*)object;
+            }
+
+        private:
+            Ref(const Ref<T>& ref);
+
+        };
+
+    }
 }
 
 #endif
\ No newline at end of file