Skip to content

Commit e2b2281

Browse files
halx99halx99
committed
Merge branch 'dev' of https://github.com/axis-project/axis into dev
2 parents f40c447 + 7a7c8fe commit e2b2281

File tree

3 files changed

+321
-112
lines changed

3 files changed

+321
-112
lines changed

‎extensions/scripting/lua-bindings/auto/lua_axis_3d_auto.cpp

Lines changed: 119 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -2267,24 +2267,23 @@ int lua_axis_3d_Mesh_draw(lua_State* tolua_S)
22672267
unsigned int arg4;
22682268
axis::Vec4 arg5;
22692269
bool arg6;
2270-
bool arg7;
2270+
bool arg7;
22712271

22722272
ok &= luaval_to_object<axis::Renderer>(tolua_S, 2, "ax.Renderer",&arg0, "ax.Mesh:draw");
22732273

2274-
ok &= luaval_to_number(tolua_S, 3, &arg1, "ax.Mesh:draw");
2274+
ok &= luaval_to_number(tolua_S, 3,&arg1, "ax.Mesh:draw");
22752275

22762276
ok &= luaval_to_mat4(tolua_S, 4, &arg2, "ax.Mesh:draw");
22772277

2278-
ok &= luaval_to_uint32(tolua_S, 5, &arg3, "ax.Mesh:draw");
2278+
ok &= luaval_to_uint32(tolua_S, 5,&arg3, "ax.Mesh:draw");
22792279

2280-
ok &= luaval_to_uint32(tolua_S, 6, &arg4, "ax.Mesh:draw");
2280+
ok &= luaval_to_uint32(tolua_S, 6,&arg4, "ax.Mesh:draw");
22812281

22822282
ok &= luaval_to_vec4(tolua_S, 7, &arg5, "ax.Mesh:draw");
22832283

2284-
ok &= luaval_to_boolean(tolua_S, 8, &arg6, "ax.Mesh:draw");
2285-
2286-
ok &= luaval_to_boolean(tolua_S, 9, &arg7, "ax.Mesh:draw");
2287-
2284+
ok &= luaval_to_boolean(tolua_S, 8,&arg6, "ax.Mesh:draw");
2285+
2286+
ok &= luaval_to_boolean(tolua_S, 9,&arg7, "ax.Mesh:draw");
22882287
if(!ok)
22892288
{
22902289
tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_Mesh_draw'", nullptr);
@@ -2294,7 +2293,7 @@ int lua_axis_3d_Mesh_draw(lua_State* tolua_S)
22942293
lua_settop(tolua_S, 1);
22952294
return 1;
22962295
}
2297-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Mesh:draw",argc, 7);
2296+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Mesh:draw",argc, 8);
22982297
return 0;
22992298

23002299
#if AXIS_DEBUG >= 1
@@ -2595,56 +2594,6 @@ int lua_axis_3d_Mesh_setBlendFunc(lua_State* tolua_S)
25952594

25962595
return 0;
25972596
}
2598-
int lua_axis_3d_Mesh_setForce2DQueue(lua_State* tolua_S)
2599-
{
2600-
int argc = 0;
2601-
axis::Mesh* cobj = nullptr;
2602-
bool ok = true;
2603-
2604-
#if AXIS_DEBUG >= 1
2605-
tolua_Error tolua_err;
2606-
#endif
2607-
2608-
2609-
#if AXIS_DEBUG >= 1
2610-
if (!tolua_isusertype(tolua_S,1,"ax.Mesh",0,&tolua_err)) goto tolua_lerror;
2611-
#endif
2612-
2613-
cobj = (axis::Mesh*)tolua_tousertype(tolua_S,1,0);
2614-
2615-
#if AXIS_DEBUG >= 1
2616-
if (!cobj)
2617-
{
2618-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_Mesh_setForce2DQueue'", nullptr);
2619-
return 0;
2620-
}
2621-
#endif
2622-
2623-
argc = lua_gettop(tolua_S)-1;
2624-
if (argc == 1)
2625-
{
2626-
bool arg0;
2627-
2628-
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.Mesh:setForce2DQueue");
2629-
if(!ok)
2630-
{
2631-
tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_Mesh_setForce2DQueue'", nullptr);
2632-
return 0;
2633-
}
2634-
cobj->getMaterial()->setForce2DQueue(arg0);
2635-
lua_settop(tolua_S, 1);
2636-
return 1;
2637-
}
2638-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Mesh:setForce2DQueue",argc, 1);
2639-
return 0;
2640-
2641-
#if AXIS_DEBUG >= 1
2642-
tolua_lerror:
2643-
tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_Mesh_setForce2DQueue'.",&tolua_err);
2644-
#endif
2645-
2646-
return 0;
2647-
}
26482597
int lua_axis_3d_Mesh_setSkin(lua_State* tolua_S)
26492598
{
26502599
int argc = 0;
@@ -2857,7 +2806,6 @@ int lua_register_axis_3d_Mesh(lua_State* tolua_S)
28572806
tolua_function(tolua_S,"getProgramState",lua_axis_3d_Mesh_getProgramState);
28582807
tolua_function(tolua_S,"getMeshVertexAttribCount",lua_axis_3d_Mesh_getMeshVertexAttribCount);
28592808
tolua_function(tolua_S,"setBlendFunc",lua_axis_3d_Mesh_setBlendFunc);
2860-
tolua_function(tolua_S,"setForce2DQueue",lua_axis_3d_Mesh_setForce2DQueue);
28612809
tolua_function(tolua_S,"setSkin",lua_axis_3d_Mesh_setSkin);
28622810
tolua_function(tolua_S,"isVisible",lua_axis_3d_Mesh_isVisible);
28632811
tolua_function(tolua_S,"setVisible",lua_axis_3d_Mesh_setVisible);
@@ -3833,6 +3781,17 @@ int lua_axis_3d_MeshRenderer_getMaterial(lua_State* tolua_S)
38333781
#endif
38343782

38353783
argc = lua_gettop(tolua_S)-1;
3784+
if (argc == 0)
3785+
{
3786+
if(!ok)
3787+
{
3788+
tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_getMaterial'", nullptr);
3789+
return 0;
3790+
}
3791+
axis::Material* ret = cobj->getMaterial();
3792+
object_to_luaval<axis::Material>(tolua_S, "ax.Material",(axis::Material*)ret);
3793+
return 1;
3794+
}
38363795
if (argc == 1)
38373796
{
38383797
int arg0;
@@ -3847,7 +3806,7 @@ int lua_axis_3d_MeshRenderer_getMaterial(lua_State* tolua_S)
38473806
object_to_luaval<axis::Material>(tolua_S, "ax.Material",(axis::Material*)ret);
38483807
return 1;
38493808
}
3850-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:getMaterial",argc, 1);
3809+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:getMaterial",argc, 0);
38513810
return 0;
38523811

38533812
#if AXIS_DEBUG >= 1
@@ -3857,6 +3816,103 @@ int lua_axis_3d_MeshRenderer_getMaterial(lua_State* tolua_S)
38573816

38583817
return 0;
38593818
}
3819+
int lua_axis_3d_MeshRenderer_setWireframe(lua_State* tolua_S)
3820+
{
3821+
int argc = 0;
3822+
axis::MeshRenderer* cobj = nullptr;
3823+
bool ok = true;
3824+
3825+
#if AXIS_DEBUG >= 1
3826+
tolua_Error tolua_err;
3827+
#endif
3828+
3829+
3830+
#if AXIS_DEBUG >= 1
3831+
if (!tolua_isusertype(tolua_S,1,"ax.MeshRenderer",0,&tolua_err)) goto tolua_lerror;
3832+
#endif
3833+
3834+
cobj = (axis::MeshRenderer*)tolua_tousertype(tolua_S,1,0);
3835+
3836+
#if AXIS_DEBUG >= 1
3837+
if (!cobj)
3838+
{
3839+
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_MeshRenderer_setWireframe'", nullptr);
3840+
return 0;
3841+
}
3842+
#endif
3843+
3844+
argc = lua_gettop(tolua_S)-1;
3845+
if (argc == 1)
3846+
{
3847+
bool arg0;
3848+
3849+
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.MeshRenderer:setWireframe");
3850+
if(!ok)
3851+
{
3852+
tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_setWireframe'", nullptr);
3853+
return 0;
3854+
}
3855+
cobj->setWireframe(arg0);
3856+
lua_settop(tolua_S, 1);
3857+
return 1;
3858+
}
3859+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:setWireframe",argc, 1);
3860+
return 0;
3861+
3862+
#if AXIS_DEBUG >= 1
3863+
tolua_lerror:
3864+
tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_MeshRenderer_setWireframe'.",&tolua_err);
3865+
#endif
3866+
3867+
return 0;
3868+
}
3869+
int lua_axis_3d_MeshRenderer_isWireframe(lua_State* tolua_S)
3870+
{
3871+
int argc = 0;
3872+
axis::MeshRenderer* cobj = nullptr;
3873+
bool ok = true;
3874+
3875+
#if AXIS_DEBUG >= 1
3876+
tolua_Error tolua_err;
3877+
#endif
3878+
3879+
3880+
#if AXIS_DEBUG >= 1
3881+
if (!tolua_isusertype(tolua_S,1,"ax.MeshRenderer",0,&tolua_err)) goto tolua_lerror;
3882+
#endif
3883+
3884+
cobj = (axis::MeshRenderer*)tolua_tousertype(tolua_S,1,0);
3885+
3886+
#if AXIS_DEBUG >= 1
3887+
if (!cobj)
3888+
{
3889+
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_MeshRenderer_isWireframe'", nullptr);
3890+
return 0;
3891+
}
3892+
#endif
3893+
3894+
argc = lua_gettop(tolua_S)-1;
3895+
if (argc == 0)
3896+
{
3897+
if(!ok)
3898+
{
3899+
tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_isWireframe'", nullptr);
3900+
return 0;
3901+
}
3902+
bool ret = cobj->isWireframe();
3903+
tolua_pushboolean(tolua_S,(bool)ret);
3904+
return 1;
3905+
}
3906+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:isWireframe",argc, 0);
3907+
return 0;
3908+
3909+
#if AXIS_DEBUG >= 1
3910+
tolua_lerror:
3911+
tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_MeshRenderer_isWireframe'.",&tolua_err);
3912+
#endif
3913+
3914+
return 0;
3915+
}
38603916
int lua_axis_3d_MeshRenderer_setCullFace(lua_State* tolua_S)
38613917
{
38623918
int argc = 0;
@@ -4448,56 +4504,6 @@ int lua_axis_3d_MeshRenderer_setBlendFunc(lua_State* tolua_S)
44484504

44494505
return 0;
44504506
}
4451-
int lua_axis_3d_MeshRenderer_setForce2DQueue(lua_State* tolua_S)
4452-
{
4453-
int argc = 0;
4454-
axis::MeshRenderer* cobj = nullptr;
4455-
bool ok = true;
4456-
4457-
#if AXIS_DEBUG >= 1
4458-
tolua_Error tolua_err;
4459-
#endif
4460-
4461-
4462-
#if AXIS_DEBUG >= 1
4463-
if (!tolua_isusertype(tolua_S,1,"ax.MeshRenderer",0,&tolua_err)) goto tolua_lerror;
4464-
#endif
4465-
4466-
cobj = (axis::MeshRenderer*)tolua_tousertype(tolua_S,1,0);
4467-
4468-
#if AXIS_DEBUG >= 1
4469-
if (!cobj)
4470-
{
4471-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_MeshRenderer_setForce2DQueue'", nullptr);
4472-
return 0;
4473-
}
4474-
#endif
4475-
4476-
argc = lua_gettop(tolua_S)-1;
4477-
if (argc == 1)
4478-
{
4479-
bool arg0;
4480-
4481-
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.MeshRenderer:setForce2DQueue");
4482-
if(!ok)
4483-
{
4484-
tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_setForce2DQueue'", nullptr);
4485-
return 0;
4486-
}
4487-
cobj->getMaterial()->setForce2DQueue(arg0);
4488-
lua_settop(tolua_S, 1);
4489-
return 1;
4490-
}
4491-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:setForce2DQueue",argc, 1);
4492-
return 0;
4493-
4494-
#if AXIS_DEBUG >= 1
4495-
tolua_lerror:
4496-
tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_MeshRenderer_setForce2DQueue'.",&tolua_err);
4497-
#endif
4498-
4499-
return 0;
4500-
}
45014507
int lua_axis_3d_MeshRenderer_genMaterial(lua_State* tolua_S)
45024508
{
45034509
int argc = 0;
@@ -4833,6 +4839,8 @@ int lua_register_axis_3d_MeshRenderer(lua_State* tolua_S)
48334839
tolua_function(tolua_S,"setTexture",lua_axis_3d_MeshRenderer_setTexture);
48344840
tolua_function(tolua_S,"getLightMask",lua_axis_3d_MeshRenderer_getLightMask);
48354841
tolua_function(tolua_S,"getMaterial",lua_axis_3d_MeshRenderer_getMaterial);
4842+
tolua_function(tolua_S,"setWireframe",lua_axis_3d_MeshRenderer_setWireframe);
4843+
tolua_function(tolua_S,"isWireframe",lua_axis_3d_MeshRenderer_isWireframe);
48364844
tolua_function(tolua_S,"setCullFace",lua_axis_3d_MeshRenderer_setCullFace);
48374845
tolua_function(tolua_S,"getMeshes",lua_axis_3d_MeshRenderer_getMeshes);
48384846
tolua_function(tolua_S,"removeAllAttachNode",lua_axis_3d_MeshRenderer_removeAllAttachNode);
@@ -4845,7 +4853,6 @@ int lua_register_axis_3d_MeshRenderer(lua_State* tolua_S)
48454853
tolua_function(tolua_S,"setLightMask",lua_axis_3d_MeshRenderer_setLightMask);
48464854
tolua_function(tolua_S,"getAttachNode",lua_axis_3d_MeshRenderer_getAttachNode);
48474855
tolua_function(tolua_S,"setBlendFunc",lua_axis_3d_MeshRenderer_setBlendFunc);
4848-
tolua_function(tolua_S,"setForce2DQueue",lua_axis_3d_MeshRenderer_setForce2DQueue);
48494856
tolua_function(tolua_S,"genMaterial",lua_axis_3d_MeshRenderer_genMaterial);
48504857
tolua_function(tolua_S,"removeAttachNode",lua_axis_3d_MeshRenderer_removeAttachNode);
48514858
tolua_function(tolua_S,"getSkeleton",lua_axis_3d_MeshRenderer_getSkeleton);

0 commit comments

Comments
 (0)