From 605a0300a1fa0322dabcc2d912946f905a0a05f4 Mon Sep 17 00:00:00 2001 From: Marco Maia Date: Thu, 28 Mar 2024 07:30:14 -0300 Subject: [PATCH] Restore some changes --- parser/output/raylib_api.json | 98 +++++----- parser/output/raylib_api.lua | 98 +++++----- parser/output/raylib_api.txt | 339 +++++++++++++++++----------------- parser/output/raylib_api.xml | 25 ++- 4 files changed, 271 insertions(+), 289 deletions(-) diff --git a/parser/output/raylib_api.json b/parser/output/raylib_api.json index b3b50f6d0..ec8d57a8c 100644 --- a/parser/output/raylib_api.json +++ b/parser/output/raylib_api.json @@ -90,6 +90,48 @@ "value": "type", "description": "" }, + { + "name": "RL_COLOR_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, + { + "name": "RL_RECTANGLE_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, + { + "name": "RL_VECTOR2_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, + { + "name": "RL_VECTOR3_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, + { + "name": "RL_VECTOR4_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, + { + "name": "RL_QUATERNION_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, + { + "name": "RL_MATRIX_TYPE", + "type": "GUARD", + "value": "", + "description": "" + }, { "name": "LIGHTGRAY", "type": "COLOR", @@ -252,48 +294,6 @@ "value": "", "description": "" }, - { - "name": "RL_VECTOR2_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, - { - "name": "RL_VECTOR3_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, - { - "name": "RL_VECTOR4_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, - { - "name": "RL_QUATERNION_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, - { - "name": "RL_MATRIX_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, - { - "name": "RL_COLOR_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, - { - "name": "RL_RECTANGLE_TYPE", - "type": "GUARD", - "value": "", - "description": "" - }, { "name": "MOUSE_LEFT_BUTTON", "type": "UNKNOWN", @@ -335,12 +335,6 @@ "type": "UNKNOWN", "value": "SHADER_LOC_MAP_METALNESS", "description": "" - }, - { - "name": "GetMouseRay", - "type": "UNKNOWN", - "value": "GetScreenToWorldRay", - "description": "Compatibility hack for previous raylib versions" } ], "structs": [ @@ -3879,12 +3873,12 @@ }, { "name": "GetScreenToWorldRay", - "description": "Get a ray trace from screen position (i.e mouse)", + "description": "Get a ray trace from mouse position", "returnType": "Ray", "params": [ { "type": "Vector2", - "name": "position" + "name": "mousePosition" }, { "type": "Camera", @@ -3894,12 +3888,12 @@ }, { "name": "GetScreenToWorldRayEx", - "description": "Get a ray trace from screen position (i.e mouse) in a viewport", + "description": "Get a ray trace from mouse position in a viewport", "returnType": "Ray", "params": [ { "type": "Vector2", - "name": "position" + "name": "mousePosition" }, { "type": "Camera", diff --git a/parser/output/raylib_api.lua b/parser/output/raylib_api.lua index 5d9e9a3b0..01c1abf30 100644 --- a/parser/output/raylib_api.lua +++ b/parser/output/raylib_api.lua @@ -90,6 +90,48 @@ return { value = "type", description = "" }, + { + name = "RL_COLOR_TYPE", + type = "GUARD", + value = "", + description = "" + }, + { + name = "RL_RECTANGLE_TYPE", + type = "GUARD", + value = "", + description = "" + }, + { + name = "RL_VECTOR2_TYPE", + type = "GUARD", + value = "", + description = "" + }, + { + name = "RL_VECTOR3_TYPE", + type = "GUARD", + value = "", + description = "" + }, + { + name = "RL_VECTOR4_TYPE", + type = "GUARD", + value = "", + description = "" + }, + { + name = "RL_QUATERNION_TYPE", + type = "GUARD", + value = "", + description = "" + }, + { + name = "RL_MATRIX_TYPE", + type = "GUARD", + value = "", + description = "" + }, { name = "LIGHTGRAY", type = "COLOR", @@ -252,48 +294,6 @@ return { value = "", description = "" }, - { - name = "RL_VECTOR2_TYPE", - type = "GUARD", - value = "", - description = "" - }, - { - name = "RL_VECTOR3_TYPE", - type = "GUARD", - value = "", - description = "" - }, - { - name = "RL_VECTOR4_TYPE", - type = "GUARD", - value = "", - description = "" - }, - { - name = "RL_QUATERNION_TYPE", - type = "GUARD", - value = "", - description = "" - }, - { - name = "RL_MATRIX_TYPE", - type = "GUARD", - value = "", - description = "" - }, - { - name = "RL_COLOR_TYPE", - type = "GUARD", - value = "", - description = "" - }, - { - name = "RL_RECTANGLE_TYPE", - type = "GUARD", - value = "", - description = "" - }, { name = "MOUSE_LEFT_BUTTON", type = "UNKNOWN", @@ -335,12 +335,6 @@ return { type = "UNKNOWN", value = "SHADER_LOC_MAP_METALNESS", description = "" - }, - { - name = "GetMouseRay", - type = "UNKNOWN", - value = "GetScreenToWorldRay", - description = "Compatibility hack for previous raylib versions" } }, structs = { @@ -3642,19 +3636,19 @@ return { }, { name = "GetScreenToWorldRay", - description = "Get a ray trace from screen position (i.e mouse)", + description = "Get a ray trace from mouse position", returnType = "Ray", params = { - {type = "Vector2", name = "position"}, + {type = "Vector2", name = "mousePosition"}, {type = "Camera", name = "camera"} } }, { name = "GetScreenToWorldRayEx", - description = "Get a ray trace from screen position (i.e mouse) in a viewport", + description = "Get a ray trace from mouse position in a viewport", returnType = "Ray", params = { - {type = "Vector2", name = "position"}, + {type = "Vector2", name = "mousePosition"}, {type = "Camera", name = "camera"}, {type = "float", name = "width"}, {type = "float", name = "height"} diff --git a/parser/output/raylib_api.txt b/parser/output/raylib_api.txt index 3c52ec4b3..d49ac33e4 100644 --- a/parser/output/raylib_api.txt +++ b/parser/output/raylib_api.txt @@ -1,5 +1,5 @@ -Defines found: 57 +Defines found: 56 Define 001: RAYLIB_H Name: RAYLIB_H @@ -76,176 +76,176 @@ Define 015: CLITERAL(type) Type: MACRO Value: type Description: -Define 016: LIGHTGRAY - Name: LIGHTGRAY - Type: COLOR - Value: CLITERAL(Color){ 200, 200, 200, 255 } - Description: Light Gray -Define 017: GRAY - Name: GRAY - Type: COLOR - Value: CLITERAL(Color){ 130, 130, 130, 255 } - Description: Gray -Define 018: DARKGRAY - Name: DARKGRAY - Type: COLOR - Value: CLITERAL(Color){ 80, 80, 80, 255 } - Description: Dark Gray -Define 019: YELLOW - Name: YELLOW - Type: COLOR - Value: CLITERAL(Color){ 253, 249, 0, 255 } - Description: Yellow -Define 020: GOLD - Name: GOLD - Type: COLOR - Value: CLITERAL(Color){ 255, 203, 0, 255 } - Description: Gold -Define 021: ORANGE - Name: ORANGE - Type: COLOR - Value: CLITERAL(Color){ 255, 161, 0, 255 } - Description: Orange -Define 022: PINK - Name: PINK - Type: COLOR - Value: CLITERAL(Color){ 255, 109, 194, 255 } - Description: Pink -Define 023: RED - Name: RED - Type: COLOR - Value: CLITERAL(Color){ 230, 41, 55, 255 } - Description: Red -Define 024: MAROON - Name: MAROON - Type: COLOR - Value: CLITERAL(Color){ 190, 33, 55, 255 } - Description: Maroon -Define 025: GREEN - Name: GREEN - Type: COLOR - Value: CLITERAL(Color){ 0, 228, 48, 255 } - Description: Green -Define 026: LIME - Name: LIME - Type: COLOR - Value: CLITERAL(Color){ 0, 158, 47, 255 } - Description: Lime -Define 027: DARKGREEN - Name: DARKGREEN - Type: COLOR - Value: CLITERAL(Color){ 0, 117, 44, 255 } - Description: Dark Green -Define 028: SKYBLUE - Name: SKYBLUE - Type: COLOR - Value: CLITERAL(Color){ 102, 191, 255, 255 } - Description: Sky Blue -Define 029: BLUE - Name: BLUE - Type: COLOR - Value: CLITERAL(Color){ 0, 121, 241, 255 } - Description: Blue -Define 030: DARKBLUE - Name: DARKBLUE - Type: COLOR - Value: CLITERAL(Color){ 0, 82, 172, 255 } - Description: Dark Blue -Define 031: PURPLE - Name: PURPLE - Type: COLOR - Value: CLITERAL(Color){ 200, 122, 255, 255 } - Description: Purple -Define 032: VIOLET - Name: VIOLET - Type: COLOR - Value: CLITERAL(Color){ 135, 60, 190, 255 } - Description: Violet -Define 033: DARKPURPLE - Name: DARKPURPLE - Type: COLOR - Value: CLITERAL(Color){ 112, 31, 126, 255 } - Description: Dark Purple -Define 034: BEIGE - Name: BEIGE - Type: COLOR - Value: CLITERAL(Color){ 211, 176, 131, 255 } - Description: Beige -Define 035: BROWN - Name: BROWN - Type: COLOR - Value: CLITERAL(Color){ 127, 106, 79, 255 } - Description: Brown -Define 036: DARKBROWN - Name: DARKBROWN - Type: COLOR - Value: CLITERAL(Color){ 76, 63, 47, 255 } - Description: Dark Brown -Define 037: WHITE - Name: WHITE - Type: COLOR - Value: CLITERAL(Color){ 255, 255, 255, 255 } - Description: White -Define 038: BLACK - Name: BLACK - Type: COLOR - Value: CLITERAL(Color){ 0, 0, 0, 255 } - Description: Black -Define 039: BLANK - Name: BLANK - Type: COLOR - Value: CLITERAL(Color){ 0, 0, 0, 0 } - Description: Blank (Transparent) -Define 040: MAGENTA - Name: MAGENTA - Type: COLOR - Value: CLITERAL(Color){ 255, 0, 255, 255 } - Description: Magenta -Define 041: RAYWHITE - Name: RAYWHITE - Type: COLOR - Value: CLITERAL(Color){ 245, 245, 245, 255 } - Description: My own White (raylib logo) -Define 042: RL_BOOL_TYPE - Name: RL_BOOL_TYPE - Type: GUARD - Value: - Description: -Define 043: RL_VECTOR2_TYPE - Name: RL_VECTOR2_TYPE - Type: GUARD - Value: - Description: -Define 044: RL_VECTOR3_TYPE - Name: RL_VECTOR3_TYPE - Type: GUARD - Value: - Description: -Define 045: RL_VECTOR4_TYPE - Name: RL_VECTOR4_TYPE - Type: GUARD - Value: - Description: -Define 046: RL_QUATERNION_TYPE - Name: RL_QUATERNION_TYPE - Type: GUARD - Value: - Description: -Define 047: RL_MATRIX_TYPE - Name: RL_MATRIX_TYPE - Type: GUARD - Value: - Description: -Define 048: RL_COLOR_TYPE +Define 016: RL_COLOR_TYPE Name: RL_COLOR_TYPE Type: GUARD Value: Description: -Define 049: RL_RECTANGLE_TYPE +Define 017: RL_RECTANGLE_TYPE Name: RL_RECTANGLE_TYPE Type: GUARD Value: Description: +Define 018: RL_VECTOR2_TYPE + Name: RL_VECTOR2_TYPE + Type: GUARD + Value: + Description: +Define 019: RL_VECTOR3_TYPE + Name: RL_VECTOR3_TYPE + Type: GUARD + Value: + Description: +Define 020: RL_VECTOR4_TYPE + Name: RL_VECTOR4_TYPE + Type: GUARD + Value: + Description: +Define 021: RL_QUATERNION_TYPE + Name: RL_QUATERNION_TYPE + Type: GUARD + Value: + Description: +Define 022: RL_MATRIX_TYPE + Name: RL_MATRIX_TYPE + Type: GUARD + Value: + Description: +Define 023: LIGHTGRAY + Name: LIGHTGRAY + Type: COLOR + Value: CLITERAL(Color){ 200, 200, 200, 255 } + Description: Light Gray +Define 024: GRAY + Name: GRAY + Type: COLOR + Value: CLITERAL(Color){ 130, 130, 130, 255 } + Description: Gray +Define 025: DARKGRAY + Name: DARKGRAY + Type: COLOR + Value: CLITERAL(Color){ 80, 80, 80, 255 } + Description: Dark Gray +Define 026: YELLOW + Name: YELLOW + Type: COLOR + Value: CLITERAL(Color){ 253, 249, 0, 255 } + Description: Yellow +Define 027: GOLD + Name: GOLD + Type: COLOR + Value: CLITERAL(Color){ 255, 203, 0, 255 } + Description: Gold +Define 028: ORANGE + Name: ORANGE + Type: COLOR + Value: CLITERAL(Color){ 255, 161, 0, 255 } + Description: Orange +Define 029: PINK + Name: PINK + Type: COLOR + Value: CLITERAL(Color){ 255, 109, 194, 255 } + Description: Pink +Define 030: RED + Name: RED + Type: COLOR + Value: CLITERAL(Color){ 230, 41, 55, 255 } + Description: Red +Define 031: MAROON + Name: MAROON + Type: COLOR + Value: CLITERAL(Color){ 190, 33, 55, 255 } + Description: Maroon +Define 032: GREEN + Name: GREEN + Type: COLOR + Value: CLITERAL(Color){ 0, 228, 48, 255 } + Description: Green +Define 033: LIME + Name: LIME + Type: COLOR + Value: CLITERAL(Color){ 0, 158, 47, 255 } + Description: Lime +Define 034: DARKGREEN + Name: DARKGREEN + Type: COLOR + Value: CLITERAL(Color){ 0, 117, 44, 255 } + Description: Dark Green +Define 035: SKYBLUE + Name: SKYBLUE + Type: COLOR + Value: CLITERAL(Color){ 102, 191, 255, 255 } + Description: Sky Blue +Define 036: BLUE + Name: BLUE + Type: COLOR + Value: CLITERAL(Color){ 0, 121, 241, 255 } + Description: Blue +Define 037: DARKBLUE + Name: DARKBLUE + Type: COLOR + Value: CLITERAL(Color){ 0, 82, 172, 255 } + Description: Dark Blue +Define 038: PURPLE + Name: PURPLE + Type: COLOR + Value: CLITERAL(Color){ 200, 122, 255, 255 } + Description: Purple +Define 039: VIOLET + Name: VIOLET + Type: COLOR + Value: CLITERAL(Color){ 135, 60, 190, 255 } + Description: Violet +Define 040: DARKPURPLE + Name: DARKPURPLE + Type: COLOR + Value: CLITERAL(Color){ 112, 31, 126, 255 } + Description: Dark Purple +Define 041: BEIGE + Name: BEIGE + Type: COLOR + Value: CLITERAL(Color){ 211, 176, 131, 255 } + Description: Beige +Define 042: BROWN + Name: BROWN + Type: COLOR + Value: CLITERAL(Color){ 127, 106, 79, 255 } + Description: Brown +Define 043: DARKBROWN + Name: DARKBROWN + Type: COLOR + Value: CLITERAL(Color){ 76, 63, 47, 255 } + Description: Dark Brown +Define 044: WHITE + Name: WHITE + Type: COLOR + Value: CLITERAL(Color){ 255, 255, 255, 255 } + Description: White +Define 045: BLACK + Name: BLACK + Type: COLOR + Value: CLITERAL(Color){ 0, 0, 0, 255 } + Description: Black +Define 046: BLANK + Name: BLANK + Type: COLOR + Value: CLITERAL(Color){ 0, 0, 0, 0 } + Description: Blank (Transparent) +Define 047: MAGENTA + Name: MAGENTA + Type: COLOR + Value: CLITERAL(Color){ 255, 0, 255, 255 } + Description: Magenta +Define 048: RAYWHITE + Name: RAYWHITE + Type: COLOR + Value: CLITERAL(Color){ 245, 245, 245, 255 } + Description: My own White (raylib logo) +Define 049: RL_BOOL_TYPE + Name: RL_BOOL_TYPE + Type: GUARD + Value: + Description: Define 050: MOUSE_LEFT_BUTTON Name: MOUSE_LEFT_BUTTON Type: UNKNOWN @@ -281,11 +281,6 @@ Define 056: SHADER_LOC_MAP_SPECULAR Type: UNKNOWN Value: SHADER_LOC_MAP_METALNESS Description: -Define 057: GetMouseRay - Name: GetMouseRay - Type: UNKNOWN - Value: GetScreenToWorldRay - Description: Compatibility hack for previous raylib versions Structures found: 34 @@ -1429,14 +1424,14 @@ Function 083: UnloadShader() (1 input parameters) Function 084: GetScreenToWorldRay() (2 input parameters) Name: GetScreenToWorldRay Return type: Ray - Description: Get a ray trace from screen position (i.e mouse) - Param[1]: position (type: Vector2) + Description: Get a ray trace from mouse position + Param[1]: mousePosition (type: Vector2) Param[2]: camera (type: Camera) Function 085: GetScreenToWorldRayEx() (4 input parameters) Name: GetScreenToWorldRayEx Return type: Ray - Description: Get a ray trace from screen position (i.e mouse) in a viewport - Param[1]: position (type: Vector2) + Description: Get a ray trace from mouse position in a viewport + Param[1]: mousePosition (type: Vector2) Param[2]: camera (type: Camera) Param[3]: width (type: float) Param[4]: height (type: float) diff --git a/parser/output/raylib_api.xml b/parser/output/raylib_api.xml index a3dac03e0..45697f24d 100644 --- a/parser/output/raylib_api.xml +++ b/parser/output/raylib_api.xml @@ -1,6 +1,6 @@ - + @@ -16,6 +16,13 @@ + + + + + + + @@ -43,13 +50,6 @@ - - - - - - - @@ -57,7 +57,6 @@ - @@ -903,12 +902,12 @@ - - + + - - + +