Update lua bindings type conversions

Author: halx99

.gitignore

@@ -214,9 +214,7 @@ extensions/libccs20
 extensions/libccs19
 extensions/fonteng
 
-tools/bindings-generator/libclang/*.dll
-tools/bindings-generator/libclang/*.dylib
-tools/bindings-generator/libclang/*.so
+tools/bindings-generator/clang/prebuilt/*
 
 templates/lua-template-default/Content/src/axmol
 tests/lua-tests/Content/src/axmol

1k/build.profiles

@@ -26,6 +26,7 @@ nuget=5.5.1.*
 # The visual studio version, @axmol-cmdline @verify
 vs=17.0+
 
+# as stable and latest as possible, @axmol-cmdline @genbindings.ps1
 llvm=17.0.6~19.1.6+
 
 # --- endregion
@@ -42,7 +43,7 @@ jdk=17.0.10~17.0.13+
 # - https://developer.android.google.cn/about/versions/15/behavior-changes-all?hl=zh-cn#16-kb
 # Android 15 16KB page size only supported by ndk r23 r25 from ci.android.com or r27+
 # In China Mainland, please download from https://pan.baidu.com/s/1neJydxOGTT7aCQvLLwbicw?pwd=qqiq
-# to $AX_ROOT/tools/external/, then run `setup.ps1 -p android`
+# to $AX_ROOT/cache/, then run `setup.ps1 -p android`
 ndk=r23d
 
 # The android target sdk version, @gradle

extensions/scripting/lua-bindings/auto/axlua_backend_auto.cpp

@@ -1676,7 +1676,7 @@ int lua_ax_backend_ProgramState_getBatchId(lua_State* tolua_S)
             return 0;
         }
         auto&& ret = cobj->getBatchId();
-        #pragma warning NO CONVERSION FROM NATIVE FOR unsigned long long;
+        tolua_pushnumber(tolua_S,(lua_Number)ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "axb.ProgramState:getBatchId",argc, 0);
@@ -1689,6 +1689,53 @@ int lua_ax_backend_ProgramState_getBatchId(lua_State* tolua_S)
 
     return 0;
 }
+int lua_ax_backend_ProgramState_isBatchable(lua_State* tolua_S)
+{
+    int argc = 0;
+    ax::backend::ProgramState* cobj = nullptr;
+    bool ok  = true;
+
+#if _AX_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if _AX_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"axb.ProgramState",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (ax::backend::ProgramState*)tolua_tousertype(tolua_S,1,0);
+
+#if _AX_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_backend_ProgramState_isBatchable'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_ax_backend_ProgramState_isBatchable'", nullptr);
+            return 0;
+        }
+        auto&& ret = cobj->isBatchable();
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "axb.ProgramState:isBatchable",argc, 0);
+    return 0;
+
+#if _AX_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_ax_backend_ProgramState_isBatchable'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_ax_backend_ProgramState_updateBatchId(lua_State* tolua_S)
 {
     int argc = 0;
@@ -1847,6 +1894,7 @@ int lua_register_ax_backend_ProgramState(lua_State* tolua_S)
         tolua_function(tolua_S,"getMutableVertexLayout",lua_ax_backend_ProgramState_getMutableVertexLayout);
         tolua_function(tolua_S,"setSharedVertexLayout",lua_ax_backend_ProgramState_setSharedVertexLayout);
         tolua_function(tolua_S,"getBatchId",lua_ax_backend_ProgramState_getBatchId);
+        tolua_function(tolua_S,"isBatchable",lua_ax_backend_ProgramState_isBatchable);
         tolua_function(tolua_S,"updateBatchId",lua_ax_backend_ProgramState_updateBatchId);
         tolua_function(tolua_S,"validateSharedVertexLayout",lua_ax_backend_ProgramState_validateSharedVertexLayout);
     tolua_endmodule(tolua_S);
@@ -3662,7 +3710,7 @@ int lua_ax_backend_ProgramManager_registerCustomProgram(lua_State* tolua_S)
             return 0;
         }
         auto&& ret = cobj->registerCustomProgram(arg0, arg1);
-        #pragma warning NO CONVERSION FROM NATIVE FOR unsigned long long;
+        tolua_pushnumber(tolua_S,(lua_Number)ret);
         return 1;
     }
     if (argc == 3) 
@@ -3682,7 +3730,7 @@ int lua_ax_backend_ProgramManager_registerCustomProgram(lua_State* tolua_S)
             return 0;
         }
         auto&& ret = cobj->registerCustomProgram(arg0, arg1, arg2);
-        #pragma warning NO CONVERSION FROM NATIVE FOR unsigned long long;
+        tolua_pushnumber(tolua_S,(lua_Number)ret);
         return 1;
     }
     if (argc == 4) 
@@ -3705,7 +3753,7 @@ int lua_ax_backend_ProgramManager_registerCustomProgram(lua_State* tolua_S)
             return 0;
         }
         auto&& ret = cobj->registerCustomProgram(arg0, arg1, arg2, arg3);
-        #pragma warning NO CONVERSION FROM NATIVE FOR unsigned long long;
+        tolua_pushnumber(tolua_S,(lua_Number)ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "axb.ProgramManager:registerCustomProgram",argc, 2);
@@ -3778,8 +3826,7 @@ int lua_ax_backend_ProgramManager_loadProgram(lua_State* tolua_S)
     do{
         if (argc == 1) {
             unsigned long long arg0;
-            #pragma warning NO CONVERSION TO NATIVE FOR unsigned long long
-		ok = false;
+            ok &= luaval_to_long_long(tolua_S, 2,(long long*)&arg0, "axb.ProgramManager:loadProgram");
 
             if (!ok) { break; }
             ax::backend::Program* ret = cobj->loadProgram(arg0);

extensions/scripting/lua-bindings/auto/axlua_base_auto.cpp

@@ -11286,8 +11286,7 @@ int lua_ax_base_Node_setProgramStateByProgramId(lua_State* tolua_S)
     {
         unsigned long long arg0;
 
-        #pragma warning NO CONVERSION TO NATIVE FOR unsigned long long
-		ok = false;
+        ok &= luaval_to_long_long(tolua_S, 2,(long long*)&arg0, "ax.Node:setProgramStateByProgramId");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_Node_setProgramStateByProgramId'", nullptr);

manifest.json

@@ -5,8 +5,7 @@
     "kcp": "v1.7-f2aa30e",
     "lz4": "v1.10.0",
     "yaml-cpp": "0.8.0",
-    "sample-assets": "master",
-    "llvm": "19.1.5"
+    "sample-assets": "master"
   },
   "mirrors": {
     "github": {

tools/bindings-generator/generator.py

@@ -1865,7 +1865,7 @@ def generate_one(cfg, section, target, outdir, out_file):
 
     print('Using userconfig \n ', config.items('DEFAULT'))
 
-    clang_lib_path = os.path.join(config.get('DEFAULT', 'cxxgeneratordir'), 'libclang')
+    clang_lib_path = os.path.join(config.get('DEFAULT', 'cxxgeneratordir'), 'clang/prebuilt')
     cindex.Config.set_library_path(clang_lib_path)
 
     if (0 == len(config.sections())):

tools/bindings-generator/libclang/.empty

@@ -41,6 +41,7 @@ conversions:
     double: "ok &= luaval_to_number(tolua_S, ${arg_idx},&${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     ssize_t: "ok &= luaval_to_ssize_t(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "long long": "ok &= luaval_to_long_long(tolua_S, ${arg_idx},&${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
+    "unsigned long long": "ok &= luaval_to_long_long(tolua_S, ${arg_idx},(long long*)&${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "string": "ok &= luaval_to_std_string(tolua_S, ${arg_idx},&${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "string_view": "ok &= luaval_to_std_string_view(tolua_S, ${arg_idx},&${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "String*": "std::string ${out_value}_tmp; ok &= luaval_to_std_string(tolua_S, ${arg_idx}, &${out_value}_tmp, \"${lua_namespaced_class_name}:${func_name}\"); ${out_value} = ax::String::create(${out_value}_tmp)"
@@ -98,6 +99,7 @@ conversions:
     short: "tolua_pushnumber(tolua_S,(lua_Number)${in_value})"
     char: "tolua_pushnumber(tolua_S,(lua_Number)${in_value})"
     "long long": "tolua_pushnumber(tolua_S,(lua_Number)${in_value})"
+    "unsigned long long": "tolua_pushnumber(tolua_S,(lua_Number)${in_value})"
     "string": "lua_pushlstring(tolua_S,${in_value}.c_str(),${in_value}.length())"
     "string_view": "lua_pushlstring(tolua_S,${in_value}.data(),${in_value}.length())"
     "__thread_id": "std_thread_id_to_luaval(tolua_S, ${in_value})"

tools/bindings-generator/targets/lua/conversions.yaml

@@ -25,10 +25,11 @@ if (($stage -band 1)) {
 
     ## download win64 libclang.dll
     $lib_name = @('libclang.dll', 'libclang.so', 'libclang.dylib')[$HOST_OS]
-    $lib_path = Join-Path $AX_ROOT "tools/bindings-generator/libclang/$lib_name"
+    $lib_path = Join-Path $AX_ROOT "tools/bindings-generator/clang/prebuilt/$lib_name"
     if (!(Test-Path $lib_path -PathType Leaf)) {
         setup_7z
-        $llvm_ver = $mirror_conf.versions.'llvm'
+        $llvm_ver_pred = $manifest['llvm'].Split('~')
+        $llvm_ver = $llvm_ver_pred[$llvm_ver_pred.Count -ge 1].TrimLast('+')
         $llvm_pkg = "llvm-$llvm_ver.7z"
 
         $prefix = Join-Path $AX_ROOT "cache/devtools"
@@ -38,6 +39,8 @@ if (($stage -band 1)) {
         $1k.mkdirs($prefix)
         download_and_expand -url $llvm_url -out $llvm_out -dest $prefix
         $suffix = @('win32/x64/libclang.dll', 'linux/libclang.so', 'mac/libclang.dylib')[$HOST_OS]
+        $lib_dir = Split-Path $lib_path -Parent
+        $1k.mkdirs($lib_dir)
         Copy-Item "$prefix/llvm-$llvm_ver/lib/$suffix" -Destination $lib_path
     }