Skip to content

Commit ace0e5f

Browse files
axmol-bothalx99
andauthored
Committing luabindings for commit fdfcf00 (#2698)
* Committing luabindings for commit fdfcf00 * Committing clang-format changes --------- Co-authored-by: halx99 <6977319+halx99@users.noreply.github.com>
1 parent 2bdc47e commit ace0e5f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

axmol/2d/ActionCatmullRom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class AX_DLL PointArray : public Object, public Clonable
112112
*/
113113
void removeControlPointAtIndex(ssize_t index);
114114

115-
/** Remove all control points.
115+
/** Remove all control points.
116116
*
117117
*/
118118
void clear();

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27432,7 +27432,7 @@ int lua_ax_base_Director_setDefaultValues(lua_State* tolua_S)
2743227432

2743327433
return 0;
2743427434
}
27435-
int lua_ax_base_Director_setGLDefaultValues(lua_State* tolua_S)
27435+
int lua_ax_base_Director_setRenderDefaults(lua_State* tolua_S)
2743627436
{
2743727437
int argc = 0;
2743827438
ax::Director* cobj = nullptr;
@@ -27452,7 +27452,7 @@ int lua_ax_base_Director_setGLDefaultValues(lua_State* tolua_S)
2745227452
#if _AX_DEBUG >= 1
2745327453
if (!cobj)
2745427454
{
27455-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_base_Director_setGLDefaultValues'", nullptr);
27455+
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_base_Director_setRenderDefaults'", nullptr);
2745627456
return 0;
2745727457
}
2745827458
#endif
@@ -27462,19 +27462,19 @@ int lua_ax_base_Director_setGLDefaultValues(lua_State* tolua_S)
2746227462
{
2746327463
if(!ok)
2746427464
{
27465-
tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_Director_setGLDefaultValues'", nullptr);
27465+
tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_Director_setRenderDefaults'", nullptr);
2746627466
return 0;
2746727467
}
27468-
cobj->setGLDefaultValues();
27468+
cobj->setRenderDefaults();
2746927469
lua_settop(tolua_S, 1);
2747027470
return 1;
2747127471
}
27472-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Director:setGLDefaultValues",argc, 0);
27472+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Director:setRenderDefaults",argc, 0);
2747327473
return 0;
2747427474

2747527475
#if _AX_DEBUG >= 1
2747627476
tolua_lerror:
27477-
tolua_error(tolua_S,"#ferror in function 'lua_ax_base_Director_setGLDefaultValues'.",&tolua_err);
27477+
tolua_error(tolua_S,"#ferror in function 'lua_ax_base_Director_setRenderDefaults'.",&tolua_err);
2747827478
#endif
2747927479

2748027480
return 0;
@@ -28781,7 +28781,7 @@ int lua_register_ax_base_Director(lua_State* tolua_S)
2878128781
tolua_function(tolua_S,"drawScene",lua_ax_base_Director_drawScene);
2878228782
tolua_function(tolua_S,"purgeCachedData",lua_ax_base_Director_purgeCachedData);
2878328783
tolua_function(tolua_S,"setDefaultValues",lua_ax_base_Director_setDefaultValues);
28784-
tolua_function(tolua_S,"setGLDefaultValues",lua_ax_base_Director_setGLDefaultValues);
28784+
tolua_function(tolua_S,"setRenderDefaults",lua_ax_base_Director_setRenderDefaults);
2878528785
tolua_function(tolua_S,"setClearColor",lua_ax_base_Director_setClearColor);
2878628786
tolua_function(tolua_S,"mainLoop",lua_ax_base_Director_mainLoop);
2878728787
tolua_function(tolua_S,"setContentScaleFactor",lua_ax_base_Director_setContentScaleFactor);

extensions/scripting/lua-bindings/manual/base/axlua_base_manual.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2940,24 +2940,24 @@ int axlua_Scene_getPhysicsWorld(lua_State* tolua_S)
29402940
ax::Scene* cobj = nullptr;
29412941
bool ok = true;
29422942

2943-
#if _AX_DEBUG >= 1
2943+
# if _AX_DEBUG >= 1
29442944
tolua_Error tolua_err;
2945-
#endif
2945+
# endif
29462946

2947-
#if _AX_DEBUG >= 1
2947+
# if _AX_DEBUG >= 1
29482948
if (!tolua_isusertype(tolua_S, 1, "ax.Scene", 0, &tolua_err))
29492949
goto tolua_lerror;
2950-
#endif
2950+
# endif
29512951

29522952
cobj = (ax::Scene*)tolua_tousertype(tolua_S, 1, 0);
29532953

2954-
#if _AX_DEBUG >= 1
2954+
# if _AX_DEBUG >= 1
29552955
if (!cobj)
29562956
{
29572957
tolua_error(tolua_S, "invalid 'cobj' in function 'axlua_Scene_getPhysicsWorld'", nullptr);
29582958
return 0;
29592959
}
2960-
#endif
2960+
# endif
29612961

29622962
argc = lua_gettop(tolua_S) - 1;
29632963
if (argc == 0)
@@ -2975,10 +2975,10 @@ int axlua_Scene_getPhysicsWorld(lua_State* tolua_S)
29752975
0);
29762976
return 0;
29772977

2978-
#if _AX_DEBUG >= 1
2978+
# if _AX_DEBUG >= 1
29792979
tolua_lerror:
29802980
tolua_error(tolua_S, "#ferror in function 'axlua_Scene_getPhysicsWorld'.", &tolua_err);
2981-
#endif
2981+
# endif
29822982

29832983
return 0;
29842984
}

0 commit comments

Comments
 (0)