Merge axmol dev into 3.x

Author: halx99

core/2d/DrawNode.cpp

@@ -1233,21 +1233,20 @@ void DrawNode::_drawCircle(const Vec2& center,
 }
 
 void DrawNode::_drawColoredTriangle(Vec2* vertices3,
-                             const Color4B* color3)
+                             const Color* color3)
 {
     unsigned int vertex_count = 3;
 
     applyTransform(vertices3, vertices3, vertex_count);
 
-    auto triangles  = reinterpret_cast<V2F_C4B_T2F_Triangle*>(expandBufferAndGetPointer(_triangles, vertex_count));
+    auto triangles  = reinterpret_cast<V2F_T2F_C4F_Triangle*>(expandBufferAndGetPointer(_triangles, vertex_count));
     _trianglesDirty = true;
 
-    triangles[0] = {{vertices3[0], color3[0], Vec2::ZERO},
-                    {vertices3[1], color3[1], Vec2::ZERO},
-                    {vertices3[2], color3[2], Vec2::ZERO}};
+    triangles[0] = {{vertices3[0], Vec2::ZERO, color3[0]},
+                    {vertices3[1], Vec2::ZERO, color3[1]},
+                    {vertices3[2], Vec2::ZERO, color3[2]}};
 }
 
-
 void DrawNode::_drawTriangle(Vec2* vertices3,
                              const Color& borderColor,
                              const Color& fillColor,

core/2d/DrawNode.h

@@ -445,11 +445,6 @@ class AX_DLL DrawNode : public Node
                  const Color& color,
                  DrawMode drawMode = DrawMode::Outline);
 
-    void setIsConvex(bool isConvex)
-    {
-        AXLOGW("'setIsConvex()' No longer supported. Use the new drawPolygon API.");
-    };
-
 
      /** draw a segment with a radius and color.
      *
@@ -609,7 +604,7 @@ class AX_DLL DrawNode : public Node
                        float thickness = 0.0f);
 
     void _drawColoredTriangle(Vec2* vertices3,
-                       const Color4B* color3);
+                       const Color* color3);
 
     // Internal function _drawAStar
     void _drawAStar(const Vec2& center,

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

@@ -52848,56 +52848,6 @@ int lua_ax_base_DrawNode_drawPie(lua_State* tolua_S)
 
     return 0;
 }
-int lua_ax_base_DrawNode_setIsConvex(lua_State* tolua_S)
-{
-    int argc = 0;
-    ax::DrawNode* 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.DrawNode",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    cobj = (ax::DrawNode*)tolua_tousertype(tolua_S,1,0);
-
-#if _AX_DEBUG >= 1
-    if (!cobj) 
-    {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_ax_base_DrawNode_setIsConvex'", nullptr);
-        return 0;
-    }
-#endif
-
-    argc = lua_gettop(tolua_S)-1;
-    if (argc == 1) 
-    {
-        bool arg0;
-
-        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ax.DrawNode:setIsConvex");
-        if(!ok)
-        {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_ax_base_DrawNode_setIsConvex'", nullptr);
-            return 0;
-        }
-        cobj->setIsConvex(arg0);
-        lua_settop(tolua_S, 1);
-        return 1;
-    }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ax.DrawNode:setIsConvex",argc, 1);
-    return 0;
-
-#if _AX_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_ax_base_DrawNode_setIsConvex'.",&tolua_err);
-#endif
-
-    return 0;
-}
 int lua_ax_base_DrawNode_drawSegment(lua_State* tolua_S)
 {
     int argc = 0;
@@ -53041,11 +52991,11 @@ int lua_ax_base_DrawNode_drawColoredTriangle(lua_State* tolua_S)
     if (argc == 2) 
     {
         const ax::Vec2* arg0;
-        const ax::Color4B* arg1;
+        const ax::Color* arg1;
 
         ok &= luaval_to_object<const ax::Vec2>(tolua_S, 2, "ax.Vec2",&arg0, "ax.DrawNode:drawColoredTriangle");
 
-        #pragma warning NO CONVERSION TO NATIVE FOR Color4B*
+        #pragma warning NO CONVERSION TO NATIVE FOR Color*
 		ok = false;
         if(!ok)
         {
@@ -53609,7 +53559,6 @@ int lua_register_ax_base_DrawNode(lua_State* tolua_S)
         tolua_function(tolua_S,"drawSolidRect",lua_ax_base_DrawNode_drawSolidRect);
         tolua_function(tolua_S,"drawSolidCircle",lua_ax_base_DrawNode_drawSolidCircle);
         tolua_function(tolua_S,"drawPie",lua_ax_base_DrawNode_drawPie);
-        tolua_function(tolua_S,"setIsConvex",lua_ax_base_DrawNode_setIsConvex);
         tolua_function(tolua_S,"drawSegment",lua_ax_base_DrawNode_drawSegment);
         tolua_function(tolua_S,"drawColoredTriangle",lua_ax_base_DrawNode_drawColoredTriangle);
         tolua_function(tolua_S,"drawTriangle",lua_ax_base_DrawNode_drawTriangle);