update lua bindings

.luarc.json

@@ -1,4 +1,5 @@
 {
   "diagnostics.disable": ["redundant-return-value", "lowercase-global"],
-  "workspace.library": ["addons"]
+  "workspace.library": ["addons"],
+  "workspace.ignoreSubmodules": false
 }

.vscode/launch.json

@@ -22,20 +22,5 @@
                 ]
             ]
         },
-        {
-            "type": "LuaHelper-Debug",
-            "request": "launch",
-            "name": "LuaPanda",
-            "description": "通用模式,通常调试项目请选择此模式",
-            "cwd": "${workspaceFolder}/assets",
-            "luaFileExtension": "",
-            "connectionPort": 8818,
-            "stopOnEntry": true,
-            "useCHook": true,
-            "args": ["--workdir", "${workspaceFolder}/assets", "--lua-debug", "luapanda"],
-            "windows": {"program": "${workspaceFolder}/build/vs-build/bin/cocoslua/Debug/cocoslua.exe"},
-            "osx": {"program": "${workspaceFolder}/build/mac-build/bin/cocoslua/Debug/cocoslua.app/Contents/MacOS/cocoslua"},
-            "autoPathMode": true
-        }
     ]
 }

assets/src/cclua/ui/dataloader.lua

@@ -1,6 +1,7 @@
-local font                  = require "cclua.font"
-local Align                 = require "cclua.ui.Align"
-local TouchStyle            = require "cclua.ui.TouchStyle"
+local olua          = require "olua.c"
+local font          = require "cclua.font"
+local Align         = require "cclua.ui.Align"
+local TouchStyle    = require "cclua.ui.TouchStyle"
 
 local assert = assert
 

assets/src/test/SpineTest.lua

@@ -7,7 +7,7 @@ local SkeletonAnimation = require "spine.SkeletonAnimation"
 local SkeletonData = require "spine.SkeletonData"
 
 function SpineTest:ctor()
-    local data = SkeletonData.new("res/spine/raptor-pro.skel", "res/spine/raptor-pro.atlas", 0.4)
+    local data = SkeletonData.create("res/spine/raptor-pro.skel", "res/spine/raptor-pro.atlas", 0.4)
     local animation = SkeletonAnimation.createWithData(data)
     animation.x = 500
     animation.y = 100

frameworks/cclua/src/cclua/cclua-extend.cpp

@@ -520,6 +520,14 @@ olua_Return cocos2d::RectExtend::__call(lua_State *L)
     return 1;
 }
 
+void cocos2d::RenderTextureExtend::beginVisit(cocos2d::RenderTexture *rt) {
+    rt->begin();
+}
+
+void cocos2d::RenderTextureExtend::endVisit(cocos2d::RenderTexture *rt) {
+    rt->end();
+}
+
 #ifdef CCLUA_BUILD_SPINE
 using namespace spine;
 
@@ -551,6 +559,11 @@ olua_Return SkeletonDataExtend::__gc(lua_State *L)
     return 0;
 }
 
+olua_Return SkeletonDataExtend::dispose(lua_State *L)
+{
+    return SkeletonDataExtend::__gc(L);
+}
+
 olua_Return SkeletonDataExtend::create(lua_State *L, const char *skel_path, const char *atlas_path, float scale)
 {
     auto texture_loader = new spine::Cocos2dTextureLoader();

frameworks/cclua/src/cclua/cclua-extend.h

@@ -282,6 +282,12 @@ class RectExtend {
     static olua_Return __call(lua_State *L);
 };
 
+class RenderTextureExtend {
+public:
+    static void beginVisit(cocos2d::RenderTexture *rt);
+    static void endVisit(cocos2d::RenderTexture *rt);
+};
+
 NS_CC_END
 
 #ifdef CCLUA_BUILD_SPINE
@@ -292,6 +298,7 @@ namespace spine {
 class SkeletonDataExtend {
 public:
     static olua_Return __gc(lua_State *L);
+    static olua_Return dispose(lua_State *L);
     static olua_Return create(lua_State *L, const char *skelPath, const char *atlasPath, float scale = 1.0f);
 };
 

frameworks/cclua/src/lua-bindings/lua_cocos2d.cpp

@@ -2800,7 +2800,6 @@ OLUA_LIB int luaopen_cocos2d_Director(lua_State *L)
     oluacls_func(L, "convertToUI", _cocos2d_Director_convertToUI);
     oluacls_func(L, "drawScene", _cocos2d_Director_drawScene);
     oluacls_func(L, "end", _cocos2d_Director_end);
-    oluacls_func(L, "exit", _cocos2d_Director_end);
     oluacls_func(L, "getActionManager", _cocos2d_Director_getActionManager);
     oluacls_func(L, "getAnimationInterval", _cocos2d_Director_getAnimationInterval);
     oluacls_func(L, "getConsole", _cocos2d_Director_getConsole);
@@ -32164,6 +32163,22 @@ static int _cocos2d_RenderTexture_begin(lua_State *L)
     return 0;
 }
 
+static int _cocos2d_RenderTexture_beginVisit(lua_State *L)
+{
+    olua_startinvoke(L);
+
+    cocos2d::RenderTexture *arg1 = nullptr;       /** rt */
+
+    olua_check_object(L, 1, &arg1, "cc.RenderTexture");
+
+    // @extend(cocos2d::RenderTextureExtend) static void beginVisit(cocos2d::RenderTexture *rt)
+    cocos2d::RenderTextureExtend::beginVisit(arg1);
+
+    olua_endinvoke(L);
+
+    return 0;
+}
+
 static int _cocos2d_RenderTexture_beginWithClear$1(lua_State *L)
 {
     olua_startinvoke(L);
@@ -32441,6 +32456,22 @@ static int _cocos2d_RenderTexture_end(lua_State *L)
     return 0;
 }
 
+static int _cocos2d_RenderTexture_endVisit(lua_State *L)
+{
+    olua_startinvoke(L);
+
+    cocos2d::RenderTexture *arg1 = nullptr;       /** rt */
+
+    olua_check_object(L, 1, &arg1, "cc.RenderTexture");
+
+    // @extend(cocos2d::RenderTextureExtend) static void endVisit(cocos2d::RenderTexture *rt)
+    cocos2d::RenderTextureExtend::endVisit(arg1);
+
+    olua_endinvoke(L);
+
+    return 0;
+}
+
 static int _cocos2d_RenderTexture_getClearColor(lua_State *L)
 {
     olua_startinvoke(L);
@@ -33324,14 +33355,14 @@ OLUA_LIB int luaopen_cocos2d_RenderTexture(lua_State *L)
 {
     oluacls_class<cocos2d::RenderTexture, cocos2d::Node>(L, "cc.RenderTexture");
     oluacls_func(L, "begin", _cocos2d_RenderTexture_begin);
-    oluacls_func(L, "beginVisit", _cocos2d_RenderTexture_begin);
+    oluacls_func(L, "beginVisit", _cocos2d_RenderTexture_beginVisit);
     oluacls_func(L, "beginWithClear", _cocos2d_RenderTexture_beginWithClear);
     oluacls_func(L, "clear", _cocos2d_RenderTexture_clear);
     oluacls_func(L, "clearDepth", _cocos2d_RenderTexture_clearDepth);
     oluacls_func(L, "clearStencil", _cocos2d_RenderTexture_clearStencil);
     oluacls_func(L, "create", _cocos2d_RenderTexture_create);
     oluacls_func(L, "end", _cocos2d_RenderTexture_end);
-    oluacls_func(L, "endVisit", _cocos2d_RenderTexture_end);
+    oluacls_func(L, "endVisit", _cocos2d_RenderTexture_endVisit);
     oluacls_func(L, "getClearColor", _cocos2d_RenderTexture_getClearColor);
     oluacls_func(L, "getClearDepth", _cocos2d_RenderTexture_getClearDepth);
     oluacls_func(L, "getClearFlags", _cocos2d_RenderTexture_getClearFlags);