修改userdata创建方式

1 files changed, 14 insertions, 5 deletions

diff --git a/src/script/graphics/luaopen_JSL.cpp b/src/script/graphics/luaopen_JSL.cpp
index b5ba125..33afa2c 100644
--- a/src/script/graphics/luaopen_JSL.cpp
+++ b/src/script/graphics/luaopen_JSL.cpp
@@ -11,7 +11,10 @@ namespace lua
 
     static inline JSLProgram* checkJSLProgram(lua_State* L)
     {
-        return (JSLProgram*)luax_checktype(L, 1, TYPE_JSL);
+        Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_JSL);
+        if(proxy != nullptr)
+            return (JSLProgram*)proxy->object;
+        return nullptr; 
     }
 
     static enum VARIABLE_TYPE
@@ -63,13 +66,15 @@ namespace lua
             }
             case IMAGE:
             {
-                Image* img = (Image*)luax_checktype(L, 4, TYPE_IMAGE);
+                Proxy* proxy = (Proxy*)luax_checktype(L, 4, TYPE_IMAGE);
+                Image* img = (Image*)proxy->object;
                 jsl->sendImage(variable, img);
                 break;
             }
             case CANVAS:
 			{
-				Canvas* canvas = (Canvas*)luax_checktype(L, 4, TYPE_IMAGE);
+                Proxy* proxy = (Proxy*)luax_checktype(L, 4, TYPE_IMAGE);
+                Canvas* canvas = (Canvas*)proxy->object;
 				jsl->sendCanvas(variable, canvas);
 				break;
 			}
@@ -116,13 +121,17 @@ namespace lua
 
     static int l_gc(lua_State* L)
     {
-
+        JSLProgram* jsl = checkJSLProgram(L);
+        if (jsl != nullptr && jsl != NULL)
+        {
+            delete jsl;
+        }
         return 0;
     }
 
     static const luaL_Reg f[] = {
+        {"__gc",  l_gc },
         {"send",  l_send},
-        {"__gc",  l_gc},
         {0, 0}
     };