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

2024-02-04 12:14:15 +01:00 · 2024-02-04 12:14:15 +01:00 · c0c2e28c1b
parent 615ee9d177 cd8da72fea
commit c0c2e28c1b
4 changed files with 91 additions and 91 deletions
--- a/parser/output/raylib_api.json
+++ b/parser/output/raylib_api.json
@ -3909,28 +3909,6 @@
        }
      ]
    },
-    {
-      "name": "GetCameraMatrix",
-      "description": "Get camera transform matrix (view matrix)",
-      "returnType": "Matrix",
-      "params": [
-        {
-          "type": "Camera",
-          "name": "camera"
-        }
-      ]
-    },
-    {
-      "name": "GetCameraMatrix2D",
-      "description": "Get camera 2d transform matrix",
-      "returnType": "Matrix",
-      "params": [
-        {
-          "type": "Camera2D",
-          "name": "camera"
-        }
-      ]
-    },
    {
      "name": "GetWorldToScreen",
      "description": "Get the screen space position for a 3d world space position",
@ -3946,21 +3924,6 @@
        }
      ]
    },
-    {
-      "name": "GetScreenToWorld2D",
-      "description": "Get the world space position for a 2d camera screen space position",
-      "returnType": "Vector2",
-      "params": [
-        {
-          "type": "Vector2",
-          "name": "position"
-        },
-        {
-          "type": "Camera2D",
-          "name": "camera"
-        }
-      ]
-    },
    {
      "name": "GetWorldToScreenEx",
      "description": "Get size position for a 3d world space position",
@ -3999,6 +3962,43 @@
        }
      ]
    },
+    {
+      "name": "GetScreenToWorld2D",
+      "description": "Get the world space position for a 2d camera screen space position",
+      "returnType": "Vector2",
+      "params": [
+        {
+          "type": "Vector2",
+          "name": "position"
+        },
+        {
+          "type": "Camera2D",
+          "name": "camera"
+        }
+      ]
+    },
+    {
+      "name": "GetCameraMatrix",
+      "description": "Get camera transform matrix (view matrix)",
+      "returnType": "Matrix",
+      "params": [
+        {
+          "type": "Camera",
+          "name": "camera"
+        }
+      ]
+    },
+    {
+      "name": "GetCameraMatrix2D",
+      "description": "Get camera 2d transform matrix",
+      "returnType": "Matrix",
+      "params": [
+        {
+          "type": "Camera2D",
+          "name": "camera"
+        }
+      ]
+    },
    {
      "name": "SetTargetFPS",
      "description": "Set target FPS (maximum)",
--- a/parser/output/raylib_api.lua
+++ b/parser/output/raylib_api.lua
@ -3654,22 +3654,6 @@ return {
        {type = "float", name = "height"}
      }
    },
-    {
-      name = "GetCameraMatrix",
-      description = "Get camera transform matrix (view matrix)",
-      returnType = "Matrix",
-      params = {
-        {type = "Camera", name = "camera"}
-      }
-    },
-    {
-      name = "GetCameraMatrix2D",
-      description = "Get camera 2d transform matrix",
-      returnType = "Matrix",
-      params = {
-        {type = "Camera2D", name = "camera"}
-      }
-    },
    {
      name = "GetWorldToScreen",
      description = "Get the screen space position for a 3d world space position",
@ -3679,15 +3663,6 @@ return {
        {type = "Camera", name = "camera"}
      }
    },
-    {
-      name = "GetScreenToWorld2D",
-      description = "Get the world space position for a 2d camera screen space position",
-      returnType = "Vector2",
-      params = {
-        {type = "Vector2", name = "position"},
-        {type = "Camera2D", name = "camera"}
-      }
-    },
    {
      name = "GetWorldToScreenEx",
      description = "Get size position for a 3d world space position",
@ -3708,6 +3683,31 @@ return {
        {type = "Camera2D", name = "camera"}
      }
    },
+    {
+      name = "GetScreenToWorld2D",
+      description = "Get the world space position for a 2d camera screen space position",
+      returnType = "Vector2",
+      params = {
+        {type = "Vector2", name = "position"},
+        {type = "Camera2D", name = "camera"}
+      }
+    },
+    {
+      name = "GetCameraMatrix",
+      description = "Get camera transform matrix (view matrix)",
+      returnType = "Matrix",
+      params = {
+        {type = "Camera", name = "camera"}
+      }
+    },
+    {
+      name = "GetCameraMatrix2D",
+      description = "Get camera 2d transform matrix",
+      returnType = "Matrix",
+      params = {
+        {type = "Camera2D", name = "camera"}
+      }
+    },
    {
      name = "SetTargetFPS",
      description = "Set target FPS (maximum)",
--- a/parser/output/raylib_api.txt
+++ b/parser/output/raylib_api.txt
@ -1435,29 +1435,13 @@ Function 085: GetViewRay() (4 input parameters)
  Param[2]: camera (type: Camera)
  Param[3]: width (type: float)
  Param[4]: height (type: float)
-Function 086: GetCameraMatrix() (1 input parameters)
-  Name: GetCameraMatrix
-  Return type: Matrix
-  Description: Get camera transform matrix (view matrix)
-  Param[1]: camera (type: Camera)
-Function 087: GetCameraMatrix2D() (1 input parameters)
-  Name: GetCameraMatrix2D
-  Return type: Matrix
-  Description: Get camera 2d transform matrix
-  Param[1]: camera (type: Camera2D)
-Function 088: GetWorldToScreen() (2 input parameters)
+Function 086: GetWorldToScreen() (2 input parameters)
  Name: GetWorldToScreen
  Return type: Vector2
  Description: Get the screen space position for a 3d world space position
  Param[1]: position (type: Vector3)
  Param[2]: camera (type: Camera)
-Function 089: GetScreenToWorld2D() (2 input parameters)
-  Name: GetScreenToWorld2D
-  Return type: Vector2
-  Description: Get the world space position for a 2d camera screen space position
-  Param[1]: position (type: Vector2)
-  Param[2]: camera (type: Camera2D)
-Function 090: GetWorldToScreenEx() (4 input parameters)
+Function 087: GetWorldToScreenEx() (4 input parameters)
  Name: GetWorldToScreenEx
  Return type: Vector2
  Description: Get size position for a 3d world space position
@ -1465,12 +1449,28 @@ Function 090: GetWorldToScreenEx() (4 input parameters)
  Param[2]: camera (type: Camera)
  Param[3]: width (type: int)
  Param[4]: height (type: int)
-Function 091: GetWorldToScreen2D() (2 input parameters)
+Function 088: GetWorldToScreen2D() (2 input parameters)
  Name: GetWorldToScreen2D
  Return type: Vector2
  Description: Get the screen space position for a 2d camera world space position
  Param[1]: position (type: Vector2)
  Param[2]: camera (type: Camera2D)
+Function 089: GetScreenToWorld2D() (2 input parameters)
+  Name: GetScreenToWorld2D
+  Return type: Vector2
+  Description: Get the world space position for a 2d camera screen space position
+  Param[1]: position (type: Vector2)
+  Param[2]: camera (type: Camera2D)
+Function 090: GetCameraMatrix() (1 input parameters)
+  Name: GetCameraMatrix
+  Return type: Matrix
+  Description: Get camera transform matrix (view matrix)
+  Param[1]: camera (type: Camera)
+Function 091: GetCameraMatrix2D() (1 input parameters)
+  Name: GetCameraMatrix2D
+  Return type: Matrix
+  Description: Get camera 2d transform matrix
+  Param[1]: camera (type: Camera2D)
 Function 092: SetTargetFPS() (1 input parameters)
  Name: SetTargetFPS
  Return type: void
--- a/parser/output/raylib_api.xml
+++ b/parser/output/raylib_api.xml
@ -912,20 +912,10 @@
            <Param type="float" name="width" desc="" />
            <Param type="float" name="height" desc="" />
        </Function>
-        <Function name="GetCameraMatrix" retType="Matrix" paramCount="1" desc="Get camera transform matrix (view matrix)">
-            <Param type="Camera" name="camera" desc="" />
-        </Function>
-        <Function name="GetCameraMatrix2D" retType="Matrix" paramCount="1" desc="Get camera 2d transform matrix">
-            <Param type="Camera2D" name="camera" desc="" />
-        </Function>
        <Function name="GetWorldToScreen" retType="Vector2" paramCount="2" desc="Get the screen space position for a 3d world space position">
            <Param type="Vector3" name="position" desc="" />
            <Param type="Camera" name="camera" desc="" />
        </Function>
-        <Function name="GetScreenToWorld2D" retType="Vector2" paramCount="2" desc="Get the world space position for a 2d camera screen space position">
-            <Param type="Vector2" name="position" desc="" />
-            <Param type="Camera2D" name="camera" desc="" />
-        </Function>
        <Function name="GetWorldToScreenEx" retType="Vector2" paramCount="4" desc="Get size position for a 3d world space position">
            <Param type="Vector3" name="position" desc="" />
            <Param type="Camera" name="camera" desc="" />
@ -936,6 +926,16 @@
            <Param type="Vector2" name="position" desc="" />
            <Param type="Camera2D" name="camera" desc="" />
        </Function>
+        <Function name="GetScreenToWorld2D" retType="Vector2" paramCount="2" desc="Get the world space position for a 2d camera screen space position">
+            <Param type="Vector2" name="position" desc="" />
+            <Param type="Camera2D" name="camera" desc="" />
+        </Function>
+        <Function name="GetCameraMatrix" retType="Matrix" paramCount="1" desc="Get camera transform matrix (view matrix)">
+            <Param type="Camera" name="camera" desc="" />
+        </Function>
+        <Function name="GetCameraMatrix2D" retType="Matrix" paramCount="1" desc="Get camera 2d transform matrix">
+            <Param type="Camera2D" name="camera" desc="" />
+        </Function>
        <Function name="SetTargetFPS" retType="void" paramCount="1" desc="Set target FPS (maximum)">
            <Param type="int" name="fps" desc="" />
        </Function>