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

tools/rlparser/output/raylib_api.json

@@ -4191,6 +4191,17 @@
         }
       ]
     },
+    {
+      "name": "SetTraceLogLevel",
+      "description": "Set the current threshold (minimum) log level",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "int",
+          "name": "logLevel"
+        }
+      ]
+    },
     {
       "name": "TraceLog",
       "description": "Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR...)",
@@ -4211,13 +4222,13 @@
       ]
     },
     {
-      "name": "SetTraceLogLevel",
-      "description": "Set the current threshold (minimum) log level",
+      "name": "SetTraceLogCallback",
+      "description": "Set custom trace log",
       "returnType": "void",
       "params": [
         {
-          "type": "int",
-          "name": "logLevel"
+          "type": "TraceLogCallback",
+          "name": "callback"
         }
       ]
     },
@@ -4258,61 +4269,6 @@
         }
       ]
     },
-    {
-      "name": "SetTraceLogCallback",
-      "description": "Set custom trace log",
-      "returnType": "void",
-      "params": [
-        {
-          "type": "TraceLogCallback",
-          "name": "callback"
-        }
-      ]
-    },
-    {
-      "name": "SetLoadFileDataCallback",
-      "description": "Set custom file binary data loader",
-      "returnType": "void",
-      "params": [
-        {
-          "type": "LoadFileDataCallback",
-          "name": "callback"
-        }
-      ]
-    },
-    {
-      "name": "SetSaveFileDataCallback",
-      "description": "Set custom file binary data saver",
-      "returnType": "void",
-      "params": [
-        {
-          "type": "SaveFileDataCallback",
-          "name": "callback"
-        }
-      ]
-    },
-    {
-      "name": "SetLoadFileTextCallback",
-      "description": "Set custom file text data loader",
-      "returnType": "void",
-      "params": [
-        {
-          "type": "LoadFileTextCallback",
-          "name": "callback"
-        }
-      ]
-    },
-    {
-      "name": "SetSaveFileTextCallback",
-      "description": "Set custom file text data saver",
-      "returnType": "void",
-      "params": [
-        {
-          "type": "SaveFileTextCallback",
-          "name": "callback"
-        }
-      ]
-    },
     {
       "name": "LoadFileData",
       "description": "Load file data as byte array (read)",
@@ -4414,6 +4370,50 @@
         }
       ]
     },
+    {
+      "name": "SetLoadFileDataCallback",
+      "description": "Set custom file binary data loader",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "LoadFileDataCallback",
+          "name": "callback"
+        }
+      ]
+    },
+    {
+      "name": "SetSaveFileDataCallback",
+      "description": "Set custom file binary data saver",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "SaveFileDataCallback",
+          "name": "callback"
+        }
+      ]
+    },
+    {
+      "name": "SetLoadFileTextCallback",
+      "description": "Set custom file text data loader",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "LoadFileTextCallback",
+          "name": "callback"
+        }
+      ]
+    },
+    {
+      "name": "SetSaveFileTextCallback",
+      "description": "Set custom file text data saver",
+      "returnType": "void",
+      "params": [
+        {
+          "type": "SaveFileTextCallback",
+          "name": "callback"
+        }
+      ]
+    },
     {
       "name": "FileRename",
       "description": "Rename file (if exists)",

tools/rlparser/output/raylib_api.lua

@@ -3864,6 +3864,14 @@ return {
         {type = "const char *", name = "url"}
       }
     },
+    {
+      name = "SetTraceLogLevel",
+      description = "Set the current threshold (minimum) log level",
+      returnType = "void",
+      params = {
+        {type = "int", name = "logLevel"}
+      }
+    },
     {
       name = "TraceLog",
       description = "Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR...)",
@@ -3875,11 +3883,11 @@ return {
       }
     },
     {
-      name = "SetTraceLogLevel",
-      description = "Set the current threshold (minimum) log level",
+      name = "SetTraceLogCallback",
+      description = "Set custom trace log",
       returnType = "void",
       params = {
-        {type = "int", name = "logLevel"}
+        {type = "TraceLogCallback", name = "callback"}
       }
     },
     {
@@ -3907,46 +3915,6 @@ return {
         {type = "void *", name = "ptr"}
       }
     },
-    {
-      name = "SetTraceLogCallback",
-      description = "Set custom trace log",
-      returnType = "void",
-      params = {
-        {type = "TraceLogCallback", name = "callback"}
-      }
-    },
-    {
-      name = "SetLoadFileDataCallback",
-      description = "Set custom file binary data loader",
-      returnType = "void",
-      params = {
-        {type = "LoadFileDataCallback", name = "callback"}
-      }
-    },
-    {
-      name = "SetSaveFileDataCallback",
-      description = "Set custom file binary data saver",
-      returnType = "void",
-      params = {
-        {type = "SaveFileDataCallback", name = "callback"}
-      }
-    },
-    {
-      name = "SetLoadFileTextCallback",
-      description = "Set custom file text data loader",
-      returnType = "void",
-      params = {
-        {type = "LoadFileTextCallback", name = "callback"}
-      }
-    },
-    {
-      name = "SetSaveFileTextCallback",
-      description = "Set custom file text data saver",
-      returnType = "void",
-      params = {
-        {type = "SaveFileTextCallback", name = "callback"}
-      }
-    },
     {
       name = "LoadFileData",
       description = "Load file data as byte array (read)",
@@ -4009,6 +3977,38 @@ return {
         {type = "const char *", name = "text"}
       }
     },
+    {
+      name = "SetLoadFileDataCallback",
+      description = "Set custom file binary data loader",
+      returnType = "void",
+      params = {
+        {type = "LoadFileDataCallback", name = "callback"}
+      }
+    },
+    {
+      name = "SetSaveFileDataCallback",
+      description = "Set custom file binary data saver",
+      returnType = "void",
+      params = {
+        {type = "SaveFileDataCallback", name = "callback"}
+      }
+    },
+    {
+      name = "SetLoadFileTextCallback",
+      description = "Set custom file text data loader",
+      returnType = "void",
+      params = {
+        {type = "LoadFileTextCallback", name = "callback"}
+      }
+    },
+    {
+      name = "SetSaveFileTextCallback",
+      description = "Set custom file text data saver",
+      returnType = "void",
+      params = {
+        {type = "SaveFileTextCallback", name = "callback"}
+      }
+    },
     {
       name = "FileRename",
       description = "Rename file (if exists)",

tools/rlparser/output/raylib_api.txt

@@ -1563,100 +1563,100 @@ Function 106: OpenURL() (1 input parameters)
   Return type: void
   Description: Open URL with default system browser (if available)
   Param[1]: url (type: const char *)
-Function 107: TraceLog() (3 input parameters)
+Function 107: SetTraceLogLevel() (1 input parameters)
+  Name: SetTraceLogLevel
+  Return type: void
+  Description: Set the current threshold (minimum) log level
+  Param[1]: logLevel (type: int)
+Function 108: TraceLog() (3 input parameters)
   Name: TraceLog
   Return type: void
   Description: Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR...)
   Param[1]: logLevel (type: int)
   Param[2]: text (type: const char *)
   Param[3]: args (type: ...)
-Function 108: SetTraceLogLevel() (1 input parameters)
-  Name: SetTraceLogLevel
+Function 109: SetTraceLogCallback() (1 input parameters)
+  Name: SetTraceLogCallback
   Return type: void
-  Description: Set the current threshold (minimum) log level
-  Param[1]: logLevel (type: int)
-Function 109: MemAlloc() (1 input parameters)
+  Description: Set custom trace log
+  Param[1]: callback (type: TraceLogCallback)
+Function 110: MemAlloc() (1 input parameters)
   Name: MemAlloc
   Return type: void *
   Description: Internal memory allocator
   Param[1]: size (type: unsigned int)
-Function 110: MemRealloc() (2 input parameters)
+Function 111: MemRealloc() (2 input parameters)
   Name: MemRealloc
   Return type: void *
   Description: Internal memory reallocator
   Param[1]: ptr (type: void *)
   Param[2]: size (type: unsigned int)
-Function 111: MemFree() (1 input parameters)
+Function 112: MemFree() (1 input parameters)
   Name: MemFree
   Return type: void
   Description: Internal memory free
   Param[1]: ptr (type: void *)
-Function 112: SetTraceLogCallback() (1 input parameters)
-  Name: SetTraceLogCallback
-  Return type: void
-  Description: Set custom trace log
-  Param[1]: callback (type: TraceLogCallback)
-Function 113: SetLoadFileDataCallback() (1 input parameters)
-  Name: SetLoadFileDataCallback
-  Return type: void
-  Description: Set custom file binary data loader
-  Param[1]: callback (type: LoadFileDataCallback)
-Function 114: SetSaveFileDataCallback() (1 input parameters)
-  Name: SetSaveFileDataCallback
-  Return type: void
-  Description: Set custom file binary data saver
-  Param[1]: callback (type: SaveFileDataCallback)
-Function 115: SetLoadFileTextCallback() (1 input parameters)
-  Name: SetLoadFileTextCallback
-  Return type: void
-  Description: Set custom file text data loader
-  Param[1]: callback (type: LoadFileTextCallback)
-Function 116: SetSaveFileTextCallback() (1 input parameters)
-  Name: SetSaveFileTextCallback
-  Return type: void
-  Description: Set custom file text data saver
-  Param[1]: callback (type: SaveFileTextCallback)
-Function 117: LoadFileData() (2 input parameters)
+Function 113: LoadFileData() (2 input parameters)
   Name: LoadFileData
   Return type: unsigned char *
   Description: Load file data as byte array (read)
   Param[1]: fileName (type: const char *)
   Param[2]: dataSize (type: int *)
-Function 118: UnloadFileData() (1 input parameters)
+Function 114: UnloadFileData() (1 input parameters)
   Name: UnloadFileData
   Return type: void
   Description: Unload file data allocated by LoadFileData()
   Param[1]: data (type: unsigned char *)
-Function 119: SaveFileData() (3 input parameters)
+Function 115: SaveFileData() (3 input parameters)
   Name: SaveFileData
   Return type: bool
   Description: Save data to file from byte array (write), returns true on success
   Param[1]: fileName (type: const char *)
   Param[2]: data (type: void *)
   Param[3]: dataSize (type: int)
-Function 120: ExportDataAsCode() (3 input parameters)
+Function 116: ExportDataAsCode() (3 input parameters)
   Name: ExportDataAsCode
   Return type: bool
   Description: Export data to code (.h), returns true on success
   Param[1]: data (type: const unsigned char *)
   Param[2]: dataSize (type: int)
   Param[3]: fileName (type: const char *)
-Function 121: LoadFileText() (1 input parameters)
+Function 117: LoadFileText() (1 input parameters)
   Name: LoadFileText
   Return type: char *
   Description: Load text data from file (read), returns a '\0' terminated string
   Param[1]: fileName (type: const char *)
-Function 122: UnloadFileText() (1 input parameters)
+Function 118: UnloadFileText() (1 input parameters)
   Name: UnloadFileText
   Return type: void
   Description: Unload file text data allocated by LoadFileText()
   Param[1]: text (type: char *)
-Function 123: SaveFileText() (2 input parameters)
+Function 119: SaveFileText() (2 input parameters)
   Name: SaveFileText
   Return type: bool
   Description: Save text data to file (write), string must be '\0' terminated, returns true on success
   Param[1]: fileName (type: const char *)
   Param[2]: text (type: const char *)
+Function 120: SetLoadFileDataCallback() (1 input parameters)
+  Name: SetLoadFileDataCallback
+  Return type: void
+  Description: Set custom file binary data loader
+  Param[1]: callback (type: LoadFileDataCallback)
+Function 121: SetSaveFileDataCallback() (1 input parameters)
+  Name: SetSaveFileDataCallback
+  Return type: void
+  Description: Set custom file binary data saver
+  Param[1]: callback (type: SaveFileDataCallback)
+Function 122: SetLoadFileTextCallback() (1 input parameters)
+  Name: SetLoadFileTextCallback
+  Return type: void
+  Description: Set custom file text data loader
+  Param[1]: callback (type: LoadFileTextCallback)
+Function 123: SetSaveFileTextCallback() (1 input parameters)
+  Name: SetSaveFileTextCallback
+  Return type: void
+  Description: Set custom file text data saver
+  Param[1]: callback (type: SaveFileTextCallback)
 Function 124: FileRename() (2 input parameters)
   Name: FileRename
   Return type: int

tools/rlparser/output/raylib_api.xml

@@ -988,13 +988,16 @@
         <Function name="OpenURL" retType="void" paramCount="1" desc="Open URL with default system browser (if available)">
             <Param type="const char *" name="url" desc="" />
         </Function>
+        <Function name="SetTraceLogLevel" retType="void" paramCount="1" desc="Set the current threshold (minimum) log level">
+            <Param type="int" name="logLevel" desc="" />
+        </Function>
         <Function name="TraceLog" retType="void" paramCount="3" desc="Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR...)">
             <Param type="int" name="logLevel" desc="" />
             <Param type="const char *" name="text" desc="" />
             <Param type="..." name="args" desc="" />
         </Function>
-        <Function name="SetTraceLogLevel" retType="void" paramCount="1" desc="Set the current threshold (minimum) log level">
-            <Param type="int" name="logLevel" desc="" />
+        <Function name="SetTraceLogCallback" retType="void" paramCount="1" desc="Set custom trace log">
+            <Param type="TraceLogCallback" name="callback" desc="" />
         </Function>
         <Function name="MemAlloc" retType="void *" paramCount="1" desc="Internal memory allocator">
             <Param type="unsigned int" name="size" desc="" />
@@ -1006,21 +1009,6 @@
         <Function name="MemFree" retType="void" paramCount="1" desc="Internal memory free">
             <Param type="void *" name="ptr" desc="" />
         </Function>
-        <Function name="SetTraceLogCallback" retType="void" paramCount="1" desc="Set custom trace log">
-            <Param type="TraceLogCallback" name="callback" desc="" />
-        </Function>
-        <Function name="SetLoadFileDataCallback" retType="void" paramCount="1" desc="Set custom file binary data loader">
-            <Param type="LoadFileDataCallback" name="callback" desc="" />
-        </Function>
-        <Function name="SetSaveFileDataCallback" retType="void" paramCount="1" desc="Set custom file binary data saver">
-            <Param type="SaveFileDataCallback" name="callback" desc="" />
-        </Function>
-        <Function name="SetLoadFileTextCallback" retType="void" paramCount="1" desc="Set custom file text data loader">
-            <Param type="LoadFileTextCallback" name="callback" desc="" />
-        </Function>
-        <Function name="SetSaveFileTextCallback" retType="void" paramCount="1" desc="Set custom file text data saver">
-            <Param type="SaveFileTextCallback" name="callback" desc="" />
-        </Function>
         <Function name="LoadFileData" retType="unsigned char *" paramCount="2" desc="Load file data as byte array (read)">
             <Param type="const char *" name="fileName" desc="" />
             <Param type="int *" name="dataSize" desc="" />
@@ -1048,6 +1036,18 @@
             <Param type="const char *" name="fileName" desc="" />
             <Param type="const char *" name="text" desc="" />
         </Function>
+        <Function name="SetLoadFileDataCallback" retType="void" paramCount="1" desc="Set custom file binary data loader">
+            <Param type="LoadFileDataCallback" name="callback" desc="" />
+        </Function>
+        <Function name="SetSaveFileDataCallback" retType="void" paramCount="1" desc="Set custom file binary data saver">
+            <Param type="SaveFileDataCallback" name="callback" desc="" />
+        </Function>
+        <Function name="SetLoadFileTextCallback" retType="void" paramCount="1" desc="Set custom file text data loader">
+            <Param type="LoadFileTextCallback" name="callback" desc="" />
+        </Function>
+        <Function name="SetSaveFileTextCallback" retType="void" paramCount="1" desc="Set custom file text data saver">
+            <Param type="SaveFileTextCallback" name="callback" desc="" />
+        </Function>
         <Function name="FileRename" retType="int" paramCount="2" desc="Rename file (if exists)">
             <Param type="const char *" name="fileName" desc="" />
             <Param type="const char *" name="fileRename" desc="" />