From 09c38b0745a75e13fb1bb7f9fccac97b87724fe4 Mon Sep 17 00:00:00 2001 From: axmol-bot <116471739+axmol-bot@users.noreply.github.com> Date: Wed, 31 Jan 2024 01:16:39 +0800 Subject: [PATCH] Update luabindings for commit 7838d7f (#1641) Co-authored-by: axmol-bot --- .../lua-bindings/auto/axlua_backend_auto.cpp | 37 ++++- .../lua-bindings/auto/axlua_backend_auto.hpp | 1 + .../lua-bindings/auto/axlua_base_auto.cpp | 137 ++++++++++++++++-- .../lua-bindings/auto/axlua_base_auto.hpp | 3 + .../auto/axlua_extension_auto.hpp | 60 ++++++++ .../lua-bindings/auto/axlua_studio_auto.cpp | 102 ------------- .../lua-bindings/auto/axlua_studio_auto.hpp | 2 - 7 files changed, 228 insertions(+), 114 deletions(-) diff --git a/extensions/scripting/lua-bindings/auto/axlua_backend_auto.cpp b/extensions/scripting/lua-bindings/auto/axlua_backend_auto.cpp index 1223fc3e13..2145421c32 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_backend_auto.cpp +++ b/extensions/scripting/lua-bindings/auto/axlua_backend_auto.cpp @@ -3518,6 +3518,40 @@ int lua_ax_backend_DriverBase_getInstance(lua_State* tolua_S) #endif return 0; } +int lua_ax_backend_DriverBase_destroyInstance(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if _AX_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if _AX_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"axb.DriverBase",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_ax_backend_DriverBase_destroyInstance'", nullptr); + return 0; + } + ax::backend::DriverBase::destroyInstance(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "axb.DriverBase:destroyInstance",argc, 0); + return 0; +#if _AX_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_ax_backend_DriverBase_destroyInstance'.",&tolua_err); +#endif + return 0; +} static int lua_ax_backend_DriverBase_finalize(lua_State* tolua_S) { printf("luabindings: finalizing LUA object (DriverBase)"); @@ -3527,7 +3561,7 @@ static int lua_ax_backend_DriverBase_finalize(lua_State* tolua_S) int lua_register_ax_backend_DriverBase(lua_State* tolua_S) { tolua_usertype(tolua_S,"axb.DriverBase"); - tolua_cclass(tolua_S,"DriverBase","axb.DriverBase","ax.Ref",nullptr); + tolua_cclass(tolua_S,"DriverBase","axb.DriverBase","",nullptr); tolua_beginmodule(tolua_S,"DriverBase"); tolua_function(tolua_S,"newDefaultRenderTarget",lua_ax_backend_DriverBase_newDefaultRenderTarget); @@ -3547,6 +3581,7 @@ int lua_register_ax_backend_DriverBase(lua_State* tolua_S) tolua_function(tolua_S,"getMaxTextureUnits",lua_ax_backend_DriverBase_getMaxTextureUnits); tolua_function(tolua_S,"getMaxSamplesAllowed",lua_ax_backend_DriverBase_getMaxSamplesAllowed); tolua_function(tolua_S,"getInstance", lua_ax_backend_DriverBase_getInstance); + tolua_function(tolua_S,"destroyInstance", lua_ax_backend_DriverBase_destroyInstance); tolua_endmodule(tolua_S); auto typeName = typeid(ax::backend::DriverBase).name(); // rtti is literal storage g_luaType[reinterpret_cast(typeName)] = "axb.DriverBase"; diff --git a/extensions/scripting/lua-bindings/auto/axlua_backend_auto.hpp b/extensions/scripting/lua-bindings/auto/axlua_backend_auto.hpp index b989d5537d..6a4b2a7949 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_backend_auto.hpp +++ b/extensions/scripting/lua-bindings/auto/axlua_backend_auto.hpp @@ -70,6 +70,7 @@ int register_all_ax_backend(lua_State* tolua_S); + #endif // __ax_backend_h__ diff --git a/extensions/scripting/lua-bindings/auto/axlua_base_auto.cpp b/extensions/scripting/lua-bindings/auto/axlua_base_auto.cpp index a415949bbb..689c06bc39 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_base_auto.cpp +++ b/extensions/scripting/lua-bindings/auto/axlua_base_auto.cpp @@ -1092,6 +1092,40 @@ int lua_ax_base_ShaderCache_getInstance(lua_State* tolua_S) #endif return 0; } +int lua_ax_base_ShaderCache_destroyInstance(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if _AX_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if _AX_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"axb.ShaderCache",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_ShaderCache_destroyInstance'", nullptr); + return 0; + } + ax::backend::ShaderCache::destroyInstance(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "axb.ShaderCache:destroyInstance",argc, 0); + return 0; +#if _AX_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_ax_base_ShaderCache_destroyInstance'.",&tolua_err); +#endif + return 0; +} static int lua_ax_base_ShaderCache_finalize(lua_State* tolua_S) { printf("luabindings: finalizing LUA object (ShaderCache)"); @@ -1101,7 +1135,7 @@ static int lua_ax_base_ShaderCache_finalize(lua_State* tolua_S) int lua_register_ax_base_ShaderCache(lua_State* tolua_S) { tolua_usertype(tolua_S,"axb.ShaderCache"); - tolua_cclass(tolua_S,"ShaderCache","axb.ShaderCache","ax.Ref",nullptr); + tolua_cclass(tolua_S,"ShaderCache","axb.ShaderCache","",nullptr); tolua_beginmodule(tolua_S,"ShaderCache"); tolua_function(tolua_S,"purge",lua_ax_base_ShaderCache_purge); @@ -1109,6 +1143,7 @@ int lua_register_ax_base_ShaderCache(lua_State* tolua_S) tolua_function(tolua_S,"newFragmentShaderModule",lua_ax_base_ShaderCache_newFragmentShaderModule); tolua_function(tolua_S,"removeUnusedShader",lua_ax_base_ShaderCache_removeUnusedShader); tolua_function(tolua_S,"getInstance", lua_ax_base_ShaderCache_getInstance); + tolua_function(tolua_S,"destroyInstance", lua_ax_base_ShaderCache_destroyInstance); tolua_endmodule(tolua_S); auto typeName = typeid(ax::backend::ShaderCache).name(); // rtti is literal storage g_luaType[reinterpret_cast(typeName)] = "axb.ShaderCache"; @@ -4768,6 +4803,56 @@ int lua_ax_base_Node_getDescription(lua_State* tolua_S) return 0; } +int lua_ax_base_Node_setLocalZOrder(lua_State* tolua_S) +{ + int argc = 0; + ax::Node* cobj = nullptr; + bool ok = true; + +#if _AX_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if _AX_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ax.Node",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (ax::Node*)tolua_tousertype(tolua_S,1,0); + +#if _AX_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_base_Node_setLocalZOrder'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ax.Node:setLocalZOrder"); + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_Node_setLocalZOrder'", nullptr); + return 0; + } + cobj->setLocalZOrder(arg0); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Node:setLocalZOrder",argc, 1); + return 0; + +#if _AX_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_ax_base_Node_setLocalZOrder'.",&tolua_err); +#endif + + return 0; +} int lua_ax_base_Node_updateOrderOfArrival(lua_State* tolua_S) { int argc = 0; @@ -4849,7 +4934,7 @@ int lua_ax_base_Node_getLocalZOrder(lua_State* tolua_S) return 0; } auto&& ret = cobj->getLocalZOrder(); - #pragma warning NO CONVERSION FROM NATIVE FOR ??; + tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Node:getLocalZOrder",argc, 0); @@ -12054,6 +12139,7 @@ int lua_register_ax_base_Node(lua_State* tolua_S) tolua_beginmodule(tolua_S,"Node"); tolua_function(tolua_S,"new",lua_ax_base_Node_constructor); tolua_function(tolua_S,"getDescription",lua_ax_base_Node_getDescription); + tolua_function(tolua_S,"setLocalZOrder",lua_ax_base_Node_setLocalZOrder); tolua_function(tolua_S,"updateOrderOfArrival",lua_ax_base_Node_updateOrderOfArrival); tolua_function(tolua_S,"getLocalZOrder",lua_ax_base_Node_getLocalZOrder); tolua_function(tolua_S,"setGlobalZOrder",lua_ax_base_Node_setGlobalZOrder); @@ -18100,6 +18186,40 @@ int lua_ax_base_Director_getInstance(lua_State* tolua_S) #endif return 0; } +int lua_ax_base_Director_destroyInstance(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if _AX_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if _AX_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ax.Director",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_Director_destroyInstance'", nullptr); + return 0; + } + ax::Director::destroyInstance(); + lua_settop(tolua_S, 1); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "ax.Director:destroyInstance",argc, 0); + return 0; +#if _AX_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_ax_base_Director_destroyInstance'.",&tolua_err); +#endif + return 0; +} static int lua_ax_base_Director_finalize(lua_State* tolua_S) { printf("luabindings: finalizing LUA object (Director)"); @@ -18183,6 +18303,7 @@ int lua_register_ax_base_Director(lua_State* tolua_S) tolua_function(tolua_S,"isChildrenIndexerEnabled",lua_ax_base_Director_isChildrenIndexerEnabled); tolua_function(tolua_S,"isValid",lua_ax_base_Director_isValid); tolua_function(tolua_S,"getInstance", lua_ax_base_Director_getInstance); + tolua_function(tolua_S,"destroyInstance", lua_ax_base_Director_destroyInstance); tolua_endmodule(tolua_S); auto typeName = typeid(ax::Director).name(); // rtti is literal storage g_luaType[reinterpret_cast(typeName)] = "ax.Director"; @@ -69161,7 +69282,7 @@ static int lua_ax_base_SpriteFrameCache_finalize(lua_State* tolua_S) int lua_register_ax_base_SpriteFrameCache(lua_State* tolua_S) { tolua_usertype(tolua_S,"ax.SpriteFrameCache"); - tolua_cclass(tolua_S,"SpriteFrameCache","ax.SpriteFrameCache","ax.Ref",nullptr); + tolua_cclass(tolua_S,"SpriteFrameCache","ax.SpriteFrameCache","",nullptr); tolua_beginmodule(tolua_S,"SpriteFrameCache"); tolua_function(tolua_S,"init",lua_ax_base_SpriteFrameCache_init); @@ -69848,7 +69969,7 @@ static int lua_ax_base_ParticleEmissionMaskCache_finalize(lua_State* tolua_S) int lua_register_ax_base_ParticleEmissionMaskCache(lua_State* tolua_S) { tolua_usertype(tolua_S,"ax.ParticleEmissionMaskCache"); - tolua_cclass(tolua_S,"ParticleEmissionMaskCache","ax.ParticleEmissionMaskCache","ax.Ref",nullptr); + tolua_cclass(tolua_S,"ParticleEmissionMaskCache","ax.ParticleEmissionMaskCache","",nullptr); tolua_beginmodule(tolua_S,"ParticleEmissionMaskCache"); tolua_function(tolua_S,"bakeEmissionMask",lua_ax_base_ParticleEmissionMaskCache_bakeEmissionMask); @@ -103709,10 +103830,8 @@ int lua_ax_base_AnimationCache_constructor(lua_State* tolua_S) return 0; } cobj = new ax::AnimationCache(); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ax.AnimationCache"); + tolua_pushusertype(tolua_S,(void*)cobj,"ax.AnimationCache"); + tolua_register_gc(tolua_S,lua_gettop(tolua_S)); return 1; } luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.AnimationCache:AnimationCache",argc, 0); @@ -103734,7 +103853,7 @@ static int lua_ax_base_AnimationCache_finalize(lua_State* tolua_S) int lua_register_ax_base_AnimationCache(lua_State* tolua_S) { tolua_usertype(tolua_S,"ax.AnimationCache"); - tolua_cclass(tolua_S,"AnimationCache","ax.AnimationCache","ax.Ref",nullptr); + tolua_cclass(tolua_S,"AnimationCache","ax.AnimationCache","",nullptr); tolua_beginmodule(tolua_S,"AnimationCache"); tolua_function(tolua_S,"new",lua_ax_base_AnimationCache_constructor); diff --git a/extensions/scripting/lua-bindings/auto/axlua_base_auto.hpp b/extensions/scripting/lua-bindings/auto/axlua_base_auto.hpp index 285c1acea7..08a978e821 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_base_auto.hpp +++ b/extensions/scripting/lua-bindings/auto/axlua_base_auto.hpp @@ -2433,6 +2433,9 @@ int register_all_ax_base(lua_State* tolua_S); + + + diff --git a/extensions/scripting/lua-bindings/auto/axlua_extension_auto.hpp b/extensions/scripting/lua-bindings/auto/axlua_extension_auto.hpp index d38d51e348..67e769f644 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_extension_auto.hpp +++ b/extensions/scripting/lua-bindings/auto/axlua_extension_auto.hpp @@ -102,6 +102,66 @@ int register_all_ax_extension(lua_State* tolua_S); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extensions/scripting/lua-bindings/auto/axlua_studio_auto.cpp b/extensions/scripting/lua-bindings/auto/axlua_studio_auto.cpp index 8cd6297651..4c59ca55c8 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_studio_auto.cpp +++ b/extensions/scripting/lua-bindings/auto/axlua_studio_auto.cpp @@ -7442,56 +7442,6 @@ int lua_ax_studio_Bone_updateZOrder(lua_State* tolua_S) return 0; } -int lua_ax_studio_Bone_setLocalZOrder(lua_State* tolua_S) -{ - int argc = 0; - cocostudio::Bone* cobj = nullptr; - bool ok = true; - -#if _AX_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if _AX_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccs.Bone",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocostudio::Bone*)tolua_tousertype(tolua_S,1,0); - -#if _AX_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_studio_Bone_setLocalZOrder'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Bone:setLocalZOrder"); - if(!ok) - { - tolua_error(tolua_S,"invalid arguments in function 'lua_ax_studio_Bone_setLocalZOrder'", nullptr); - return 0; - } - cobj->setLocalZOrder(arg0); - lua_settop(tolua_S, 1); - return 1; - } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setLocalZOrder",argc, 1); - return 0; - -#if _AX_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_ax_studio_Bone_setLocalZOrder'.",&tolua_err); -#endif - - return 0; -} int lua_ax_studio_Bone_getTween(lua_State* tolua_S) { int argc = 0; @@ -8654,7 +8604,6 @@ int lua_register_ax_studio_Bone(lua_State* tolua_S) tolua_function(tolua_S,"removeChildBone",lua_ax_studio_Bone_removeChildBone); tolua_function(tolua_S,"updateColor",lua_ax_studio_Bone_updateColor); tolua_function(tolua_S,"updateZOrder",lua_ax_studio_Bone_updateZOrder); - tolua_function(tolua_S,"setLocalZOrder",lua_ax_studio_Bone_setLocalZOrder); tolua_function(tolua_S,"getTween",lua_ax_studio_Bone_getTween); tolua_function(tolua_S,"setTransformDirty",lua_ax_studio_Bone_setTransformDirty); tolua_function(tolua_S,"isTransformDirty",lua_ax_studio_Bone_isTransformDirty); @@ -24557,56 +24506,6 @@ int lua_ax_studio_BoneNode_getVisibleSkinsRect(lua_State* tolua_S) return 0; } -int lua_ax_studio_BoneNode_setLocalZOrder(lua_State* tolua_S) -{ - int argc = 0; - cocostudio::timeline::BoneNode* cobj = nullptr; - bool ok = true; - -#if _AX_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if _AX_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccs.BoneNode",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocostudio::timeline::BoneNode*)tolua_tousertype(tolua_S,1,0); - -#if _AX_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_studio_BoneNode_setLocalZOrder'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.BoneNode:setLocalZOrder"); - if(!ok) - { - tolua_error(tolua_S,"invalid arguments in function 'lua_ax_studio_BoneNode_setLocalZOrder'", nullptr); - return 0; - } - cobj->setLocalZOrder(arg0); - lua_settop(tolua_S, 1); - return 1; - } - luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneNode:setLocalZOrder",argc, 1); - return 0; - -#if _AX_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_ax_studio_BoneNode_setLocalZOrder'.",&tolua_err); -#endif - - return 0; -} int lua_ax_studio_BoneNode_create(lua_State* tolua_S) { int argc = 0; @@ -24721,7 +24620,6 @@ int lua_register_ax_studio_BoneNode(lua_State* tolua_S) tolua_function(tolua_S,"setDebugDrawColor",lua_ax_studio_BoneNode_setDebugDrawColor); tolua_function(tolua_S,"getDebugDrawColor",lua_ax_studio_BoneNode_getDebugDrawColor); tolua_function(tolua_S,"getVisibleSkinsRect",lua_ax_studio_BoneNode_getVisibleSkinsRect); - tolua_function(tolua_S,"setLocalZOrder",lua_ax_studio_BoneNode_setLocalZOrder); tolua_function(tolua_S,"create", lua_ax_studio_BoneNode_create); tolua_endmodule(tolua_S); auto typeName = typeid(cocostudio::timeline::BoneNode).name(); // rtti is literal storage diff --git a/extensions/scripting/lua-bindings/auto/axlua_studio_auto.hpp b/extensions/scripting/lua-bindings/auto/axlua_studio_auto.hpp index 7970622021..641752dbdf 100644 --- a/extensions/scripting/lua-bindings/auto/axlua_studio_auto.hpp +++ b/extensions/scripting/lua-bindings/auto/axlua_studio_auto.hpp @@ -563,8 +563,6 @@ int register_all_ax_studio(lua_State* tolua_S); - -