Merge: f40c44755f 7a7c8fe2ae

Merge branch 'dev' of https://github.com/axis-project/axis into dev

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

@@ -2284,7 +2284,6 @@ int lua_axis_3d_Mesh_draw(lua_State* tolua_S)
         ok &= luaval_to_boolean(tolua_S, 8,&arg6, "ax.Mesh:draw");
 
         ok &= luaval_to_boolean(tolua_S, 9,&arg7, "ax.Mesh:draw");
-		
         if(!ok)
         {
             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)
         lua_settop(tolua_S, 1);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Mesh:draw",argc, 7);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Mesh:draw",argc, 8);
     return 0;
 
 #if AXIS_DEBUG >= 1
@@ -2595,56 +2594,6 @@ int lua_axis_3d_Mesh_setBlendFunc(lua_State* tolua_S)
 
     return 0;
 }
-int lua_axis_3d_Mesh_setForce2DQueue(lua_State* tolua_S)
-{
-    int argc = 0;
-    axis::Mesh* cobj = nullptr;
-    bool ok  = true;
-
-#if AXIS_DEBUG >= 1
-    tolua_Error tolua_err;
-#endif
-
-
-#if AXIS_DEBUG >= 1
-    if (!tolua_isusertype(tolua_S,1,"ax.Mesh",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    cobj = (axis::Mesh*)tolua_tousertype(tolua_S,1,0);
-
-#if AXIS_DEBUG >= 1
-    if (!cobj) 
-    {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_Mesh_setForce2DQueue'", nullptr);
-        return 0;
-    }
-#endif
-
-    argc = lua_gettop(tolua_S)-1;
-    if (argc == 1) 
-    {
-        bool arg0;
-
-        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.Mesh:setForce2DQueue");
-        if(!ok)
-        {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_Mesh_setForce2DQueue'", nullptr);
-            return 0;
-        }
-        cobj->getMaterial()->setForce2DQueue(arg0);
-        lua_settop(tolua_S, 1);
-        return 1;
-    }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Mesh:setForce2DQueue",argc, 1);
-    return 0;
-
-#if AXIS_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_Mesh_setForce2DQueue'.",&tolua_err);
-#endif
-
-    return 0;
-}
 int lua_axis_3d_Mesh_setSkin(lua_State* tolua_S)
 {
     int argc = 0;
@@ -2857,7 +2806,6 @@ int lua_register_axis_3d_Mesh(lua_State* tolua_S)
         tolua_function(tolua_S,"getProgramState",lua_axis_3d_Mesh_getProgramState);
         tolua_function(tolua_S,"getMeshVertexAttribCount",lua_axis_3d_Mesh_getMeshVertexAttribCount);
         tolua_function(tolua_S,"setBlendFunc",lua_axis_3d_Mesh_setBlendFunc);
-        tolua_function(tolua_S,"setForce2DQueue",lua_axis_3d_Mesh_setForce2DQueue);
         tolua_function(tolua_S,"setSkin",lua_axis_3d_Mesh_setSkin);
         tolua_function(tolua_S,"isVisible",lua_axis_3d_Mesh_isVisible);
         tolua_function(tolua_S,"setVisible",lua_axis_3d_Mesh_setVisible);
@@ -3833,6 +3781,17 @@ int lua_axis_3d_MeshRenderer_getMaterial(lua_State* tolua_S)
 #endif
 
     argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_getMaterial'", nullptr);
+            return 0;
+        }
+        axis::Material* ret = cobj->getMaterial();
+        object_to_luaval<axis::Material>(tolua_S, "ax.Material",(axis::Material*)ret);
+        return 1;
+    }
     if (argc == 1) 
     {
         int arg0;
@@ -3847,7 +3806,7 @@ int lua_axis_3d_MeshRenderer_getMaterial(lua_State* tolua_S)
         object_to_luaval<axis::Material>(tolua_S, "ax.Material",(axis::Material*)ret);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:getMaterial",argc, 1);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:getMaterial",argc, 0);
     return 0;
 
 #if AXIS_DEBUG >= 1
@@ -3857,6 +3816,103 @@ int lua_axis_3d_MeshRenderer_getMaterial(lua_State* tolua_S)
 
     return 0;
 }
+int lua_axis_3d_MeshRenderer_setWireframe(lua_State* tolua_S)
+{
+    int argc = 0;
+    axis::MeshRenderer* cobj = nullptr;
+    bool ok  = true;
+
+#if AXIS_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if AXIS_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ax.MeshRenderer",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (axis::MeshRenderer*)tolua_tousertype(tolua_S,1,0);
+
+#if AXIS_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_MeshRenderer_setWireframe'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        bool arg0;
+
+        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.MeshRenderer:setWireframe");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_setWireframe'", nullptr);
+            return 0;
+        }
+        cobj->setWireframe(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:setWireframe",argc, 1);
+    return 0;
+
+#if AXIS_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_MeshRenderer_setWireframe'.",&tolua_err);
+#endif
+
+    return 0;
+}
+int lua_axis_3d_MeshRenderer_isWireframe(lua_State* tolua_S)
+{
+    int argc = 0;
+    axis::MeshRenderer* cobj = nullptr;
+    bool ok  = true;
+
+#if AXIS_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if AXIS_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ax.MeshRenderer",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (axis::MeshRenderer*)tolua_tousertype(tolua_S,1,0);
+
+#if AXIS_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_MeshRenderer_isWireframe'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_isWireframe'", nullptr);
+            return 0;
+        }
+        bool ret = cobj->isWireframe();
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:isWireframe",argc, 0);
+    return 0;
+
+#if AXIS_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_MeshRenderer_isWireframe'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_axis_3d_MeshRenderer_setCullFace(lua_State* tolua_S)
 {
     int argc = 0;
@@ -4448,56 +4504,6 @@ int lua_axis_3d_MeshRenderer_setBlendFunc(lua_State* tolua_S)
 
     return 0;
 }
-int lua_axis_3d_MeshRenderer_setForce2DQueue(lua_State* tolua_S)
-{
-    int argc = 0;
-    axis::MeshRenderer* cobj = nullptr;
-    bool ok  = true;
-
-#if AXIS_DEBUG >= 1
-    tolua_Error tolua_err;
-#endif
-
-
-#if AXIS_DEBUG >= 1
-    if (!tolua_isusertype(tolua_S,1,"ax.MeshRenderer",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    cobj = (axis::MeshRenderer*)tolua_tousertype(tolua_S,1,0);
-
-#if AXIS_DEBUG >= 1
-    if (!cobj) 
-    {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_3d_MeshRenderer_setForce2DQueue'", nullptr);
-        return 0;
-    }
-#endif
-
-    argc = lua_gettop(tolua_S)-1;
-    if (argc == 1) 
-    {
-        bool arg0;
-
-        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.MeshRenderer:setForce2DQueue");
-        if(!ok)
-        {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_3d_MeshRenderer_setForce2DQueue'", nullptr);
-            return 0;
-        }
-        cobj->getMaterial()->setForce2DQueue(arg0);
-        lua_settop(tolua_S, 1);
-        return 1;
-    }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.MeshRenderer:setForce2DQueue",argc, 1);
-    return 0;
-
-#if AXIS_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_axis_3d_MeshRenderer_setForce2DQueue'.",&tolua_err);
-#endif
-
-    return 0;
-}
 int lua_axis_3d_MeshRenderer_genMaterial(lua_State* tolua_S)
 {
     int argc = 0;
@@ -4833,6 +4839,8 @@ int lua_register_axis_3d_MeshRenderer(lua_State* tolua_S)
         tolua_function(tolua_S,"setTexture",lua_axis_3d_MeshRenderer_setTexture);
         tolua_function(tolua_S,"getLightMask",lua_axis_3d_MeshRenderer_getLightMask);
         tolua_function(tolua_S,"getMaterial",lua_axis_3d_MeshRenderer_getMaterial);
+        tolua_function(tolua_S,"setWireframe",lua_axis_3d_MeshRenderer_setWireframe);
+        tolua_function(tolua_S,"isWireframe",lua_axis_3d_MeshRenderer_isWireframe);
         tolua_function(tolua_S,"setCullFace",lua_axis_3d_MeshRenderer_setCullFace);
         tolua_function(tolua_S,"getMeshes",lua_axis_3d_MeshRenderer_getMeshes);
         tolua_function(tolua_S,"removeAllAttachNode",lua_axis_3d_MeshRenderer_removeAllAttachNode);
@@ -4845,7 +4853,6 @@ int lua_register_axis_3d_MeshRenderer(lua_State* tolua_S)
         tolua_function(tolua_S,"setLightMask",lua_axis_3d_MeshRenderer_setLightMask);
         tolua_function(tolua_S,"getAttachNode",lua_axis_3d_MeshRenderer_getAttachNode);
         tolua_function(tolua_S,"setBlendFunc",lua_axis_3d_MeshRenderer_setBlendFunc);
-        tolua_function(tolua_S,"setForce2DQueue",lua_axis_3d_MeshRenderer_setForce2DQueue);
         tolua_function(tolua_S,"genMaterial",lua_axis_3d_MeshRenderer_genMaterial);
         tolua_function(tolua_S,"removeAttachNode",lua_axis_3d_MeshRenderer_removeAttachNode);
         tolua_function(tolua_S,"getSkeleton",lua_axis_3d_MeshRenderer_getSkeleton);

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

@@ -95431,6 +95431,100 @@ int lua_axis_base_Material_draw(lua_State* tolua_S)
 
     return 0;
 }
+int lua_axis_base_Material_isTransparent(lua_State* tolua_S)
+{
+    int argc = 0;
+    axis::Material* cobj = nullptr;
+    bool ok  = true;
+
+#if AXIS_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if AXIS_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ax.Material",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (axis::Material*)tolua_tousertype(tolua_S,1,0);
+
+#if AXIS_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_base_Material_isTransparent'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_base_Material_isTransparent'", nullptr);
+            return 0;
+        }
+        bool ret = cobj->isTransparent();
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Material:isTransparent",argc, 0);
+    return 0;
+
+#if AXIS_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_axis_base_Material_isTransparent'.",&tolua_err);
+#endif
+
+    return 0;
+}
+int lua_axis_base_Material_isForce2DQueue(lua_State* tolua_S)
+{
+    int argc = 0;
+    axis::Material* cobj = nullptr;
+    bool ok  = true;
+
+#if AXIS_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if AXIS_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ax.Material",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (axis::Material*)tolua_tousertype(tolua_S,1,0);
+
+#if AXIS_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_base_Material_isForce2DQueue'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_base_Material_isForce2DQueue'", nullptr);
+            return 0;
+        }
+        bool ret = cobj->isForce2DQueue();
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Material:isForce2DQueue",argc, 0);
+    return 0;
+
+#if AXIS_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_axis_base_Material_isForce2DQueue'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_axis_base_Material_getRenderState(lua_State* tolua_S)
 {
     int argc = 0;
@@ -95528,6 +95622,56 @@ int lua_axis_base_Material_setName(lua_State* tolua_S)
 
     return 0;
 }
+int lua_axis_base_Material_setForce2DQueue(lua_State* tolua_S)
+{
+    int argc = 0;
+    axis::Material* cobj = nullptr;
+    bool ok  = true;
+
+#if AXIS_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if AXIS_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ax.Material",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (axis::Material*)tolua_tousertype(tolua_S,1,0);
+
+#if AXIS_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_base_Material_setForce2DQueue'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        bool arg0;
+
+        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.Material:setForce2DQueue");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_base_Material_setForce2DQueue'", nullptr);
+            return 0;
+        }
+        cobj->setForce2DQueue(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Material:setForce2DQueue",argc, 1);
+    return 0;
+
+#if AXIS_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_axis_base_Material_setForce2DQueue'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_axis_base_Material_getTechniqueByIndex(lua_State* tolua_S)
 {
     int argc = 0;
@@ -95919,6 +96063,56 @@ int lua_axis_base_Material_addTechnique(lua_State* tolua_S)
 
     return 0;
 }
+int lua_axis_base_Material_setTransparent(lua_State* tolua_S)
+{
+    int argc = 0;
+    axis::Material* cobj = nullptr;
+    bool ok  = true;
+
+#if AXIS_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if AXIS_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ax.Material",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (axis::Material*)tolua_tousertype(tolua_S,1,0);
+
+#if AXIS_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_axis_base_Material_setTransparent'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        bool arg0;
+
+        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.Material:setTransparent");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_axis_base_Material_setTransparent'", nullptr);
+            return 0;
+        }
+        cobj->setTransparent(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.Material:setTransparent",argc, 1);
+    return 0;
+
+#if AXIS_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_axis_base_Material_setTransparent'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_axis_base_Material_getPrimitiveType(lua_State* tolua_S)
 {
     int argc = 0;
@@ -96135,8 +96329,11 @@ int lua_register_axis_base_Material(lua_State* tolua_S)
     tolua_beginmodule(tolua_S,"Material");
         tolua_function(tolua_S,"clone",lua_axis_base_Material_clone);
         tolua_function(tolua_S,"draw",lua_axis_base_Material_draw);
+        tolua_function(tolua_S,"isTransparent",lua_axis_base_Material_isTransparent);
+        tolua_function(tolua_S,"isForce2DQueue",lua_axis_base_Material_isForce2DQueue);
         tolua_function(tolua_S,"getRenderState",lua_axis_base_Material_getRenderState);
         tolua_function(tolua_S,"setName",lua_axis_base_Material_setName);
+        tolua_function(tolua_S,"setForce2DQueue",lua_axis_base_Material_setForce2DQueue);
         tolua_function(tolua_S,"getTechniqueByIndex",lua_axis_base_Material_getTechniqueByIndex);
         tolua_function(tolua_S,"getName",lua_axis_base_Material_getName);
         tolua_function(tolua_S,"getTechniques",lua_axis_base_Material_getTechniques);
@@ -96145,6 +96342,7 @@ int lua_register_axis_base_Material(lua_State* tolua_S)
         tolua_function(tolua_S,"getTechniqueByName",lua_axis_base_Material_getTechniqueByName);
         tolua_function(tolua_S,"setPrimitiveType",lua_axis_base_Material_setPrimitiveType);
         tolua_function(tolua_S,"addTechnique",lua_axis_base_Material_addTechnique);
+        tolua_function(tolua_S,"setTransparent",lua_axis_base_Material_setTransparent);
         tolua_function(tolua_S,"getPrimitiveType",lua_axis_base_Material_getPrimitiveType);
         tolua_function(tolua_S,"getTechnique",lua_axis_base_Material_getTechnique);
         tolua_function(tolua_S,"createWithFilename", lua_axis_base_Material_createWithFilename);

extensions/scripting/lua-bindings/auto/lua_axis_base_auto.hpp

@@ -2406,6 +2406,10 @@ int register_all_axis_base(lua_State* tolua_S);
 
 
 
+
+
+
+