Merge branch 'master' of https://github.com/raysan5/raylib

tools/rlparser/output/raylib_api.json

@@ -8609,33 +8609,6 @@
         }
       ]
     },
-    {
-      "name": "ImageDraw",
-      "description": "Draw a source image into a destination image (tint applied to source)",
-      "returnType": "void",
-      "params": [
-        {
-          "type": "Image *",
-          "name": "dst"
-        },
-        {
-          "type": "Image",
-          "name": "src"
-        },
-        {
-          "type": "Rectangle",
-          "name": "srcRec"
-        },
-        {
-          "type": "Rectangle",
-          "name": "dstRec"
-        },
-        {
-          "type": "Color",
-          "name": "tint"
-        }
-      ]
-    },
     {
       "name": "ImageDrawCircleGradient",
       "description": "Draw a gradient-filled circle within an image",
@@ -8663,6 +8636,95 @@
         }
       ]
     },
+    {
+      "name": "ImageDrawImage",
+      "description": "Draw an image within an image",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "Image *",
+          "name": "dst"
+        },
+        {
+          "type": "Image",
+          "name": "src"
+        },
+        {
+          "type": "int",
+          "name": "posX"
+        },
+        {
+          "type": "int",
+          "name": "posY"
+        },
+        {
+          "type": "Color",
+          "name": "tint"
+        }
+      ]
+    },
+    {
+      "name": "ImageDrawImageRec",
+      "description": "Draw a part of an image defined by a rectangle within an image",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "Image *",
+          "name": "dst"
+        },
+        {
+          "type": "Image",
+          "name": "src"
+        },
+        {
+          "type": "Rectangle",
+          "name": "srcRec"
+        },
+        {
+          "type": "Vector2",
+          "name": "position"
+        },
+        {
+          "type": "Color",
+          "name": "tint"
+        }
+      ]
+    },
+    {
+      "name": "ImageDrawImagePro",
+      "description": "Draw a part of an image defined by a rectangle into destination rectangle, with scaling and rotation, within an image",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "Image *",
+          "name": "dst"
+        },
+        {
+          "type": "Image",
+          "name": "src"
+        },
+        {
+          "type": "Rectangle",
+          "name": "srcRec"
+        },
+        {
+          "type": "Rectangle",
+          "name": "dstRec"
+        },
+        {
+          "type": "Vector2",
+          "name": "origin"
+        },
+        {
+          "type": "float",
+          "name": "rotation"
+        },
+        {
+          "type": "Color",
+          "name": "tint"
+        }
+      ]
+    },
     {
       "name": "ImageDrawText",
       "description": "Draw text (using default font) within an image (destination)",

tools/rlparser/output/raylib_api.lua

@@ -6302,18 +6302,6 @@ return {
         {type = "Color", name = "color"}
       }
     },
-    {
-      name = "ImageDraw",
-      description = "Draw a source image into a destination image (tint applied to source)",
-      returnType = "void",
-      params = {
-        {type = "Image *", name = "dst"},
-        {type = "Image", name = "src"},
-        {type = "Rectangle", name = "srcRec"},
-        {type = "Rectangle", name = "dstRec"},
-        {type = "Color", name = "tint"}
-      }
-    },
     {
       name = "ImageDrawCircleGradient",
       description = "Draw a gradient-filled circle within an image",
@@ -6326,6 +6314,44 @@ return {
         {type = "Color", name = "outer"}
       }
     },
+    {
+      name = "ImageDrawImage",
+      description = "Draw an image within an image",
+      returnType = "void",
+      params = {
+        {type = "Image *", name = "dst"},
+        {type = "Image", name = "src"},
+        {type = "int", name = "posX"},
+        {type = "int", name = "posY"},
+        {type = "Color", name = "tint"}
+      }
+    },
+    {
+      name = "ImageDrawImageRec",
+      description = "Draw a part of an image defined by a rectangle within an image",
+      returnType = "void",
+      params = {
+        {type = "Image *", name = "dst"},
+        {type = "Image", name = "src"},
+        {type = "Rectangle", name = "srcRec"},
+        {type = "Vector2", name = "position"},
+        {type = "Color", name = "tint"}
+      }
+    },
+    {
+      name = "ImageDrawImagePro",
+      description = "Draw a part of an image defined by a rectangle into destination rectangle, with scaling and rotation, within an image",
+      returnType = "void",
+      params = {
+        {type = "Image *", name = "dst"},
+        {type = "Image", name = "src"},
+        {type = "Rectangle", name = "srcRec"},
+        {type = "Rectangle", name = "dstRec"},
+        {type = "Vector2", name = "origin"},
+        {type = "float", name = "rotation"},
+        {type = "Color", name = "tint"}
+      }
+    },
     {
       name = "ImageDrawText",
       description = "Draw text (using default font) within an image (destination)",

tools/rlparser/output/raylib_api.xml

@@ -681,7 +681,7 @@
             <Param type="unsigned int" name="frames" desc="" />
         </Callback>
     </Callbacks>
-    <Functions count="605">
+    <Functions count="607">
         <Function name="InitWindow" retType="void" paramCount="3" desc="Initialize window and OpenGL context">
             <Param type="int" name="width" desc="" />
             <Param type="int" name="height" desc="" />
@@ -2172,13 +2172,6 @@
             <Param type="int" name="radius" desc="" />
             <Param type="Color" name="color" desc="" />
         </Function>
-        <Function name="ImageDraw" retType="void" paramCount="5" desc="Draw a source image into a destination image (tint applied to source)">
-            <Param type="Image *" name="dst" desc="" />
-            <Param type="Image" name="src" desc="" />
-            <Param type="Rectangle" name="srcRec" desc="" />
-            <Param type="Rectangle" name="dstRec" desc="" />
-            <Param type="Color" name="tint" desc="" />
-        </Function>
         <Function name="ImageDrawCircleGradient" retType="void" paramCount="5" desc="Draw a gradient-filled circle within an image">
             <Param type="Image *" name="dst" desc="" />
             <Param type="Vector2" name="center" desc="" />
@@ -2186,6 +2179,29 @@
             <Param type="Color" name="inner" desc="" />
             <Param type="Color" name="outer" desc="" />
         </Function>
+        <Function name="ImageDrawImage" retType="void" paramCount="5" desc="Draw an image within an image">
+            <Param type="Image *" name="dst" desc="" />
+            <Param type="Image" name="src" desc="" />
+            <Param type="int" name="posX" desc="" />
+            <Param type="int" name="posY" desc="" />
+            <Param type="Color" name="tint" desc="" />
+        </Function>
+        <Function name="ImageDrawImageRec" retType="void" paramCount="5" desc="Draw a part of an image defined by a rectangle within an image">
+            <Param type="Image *" name="dst" desc="" />
+            <Param type="Image" name="src" desc="" />
+            <Param type="Rectangle" name="srcRec" desc="" />
+            <Param type="Vector2" name="position" desc="" />
+            <Param type="Color" name="tint" desc="" />
+        </Function>
+        <Function name="ImageDrawImagePro" retType="void" paramCount="7" desc="Draw a part of an image defined by a rectangle into destination rectangle, with scaling and rotation, within an image">
+            <Param type="Image *" name="dst" desc="" />
+            <Param type="Image" name="src" desc="" />
+            <Param type="Rectangle" name="srcRec" desc="" />
+            <Param type="Rectangle" name="dstRec" desc="" />
+            <Param type="Vector2" name="origin" desc="" />
+            <Param type="float" name="rotation" desc="" />
+            <Param type="Color" name="tint" desc="" />
+        </Function>
         <Function name="ImageDrawText" retType="void" paramCount="6" desc="Draw text (using default font) within an image (destination)">
             <Param type="Image *" name="dst" desc="" />
             <Param type="const char *" name="text" desc="" />