Merge branch 'master' into master

This commit is contained in:
Sergei Baigerov 2024-05-08 21:19:31 +08:00 • committed by GitHub
commit 8d6254b352
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22175 additions and 5774 deletions

View file

@ -335,6 +335,12 @@
"type": "UNKNOWN",
"value": "SHADER_LOC_MAP_METALNESS",
"description": ""
},
{
"name": "GetMouseRay",
"type": "UNKNOWN",
"value": "GetScreenToWorldRay",
"description": "Compatibility hack for previous raylib versions"
}
],
"structs": [
@ -2223,7 +2229,7 @@
{
"name": "GAMEPAD_BUTTON_RIGHT_FACE_RIGHT",
"value": 6,
"description": "Gamepad right button right (i.e. PS3: Square, Xbox: X)"
"description": "Gamepad right button right (i.e. PS3: Circle, Xbox: B)"
},
{
"name": "GAMEPAD_BUTTON_RIGHT_FACE_DOWN",
@ -2233,7 +2239,7 @@
{
"name": "GAMEPAD_BUTTON_RIGHT_FACE_LEFT",
"value": 8,
"description": "Gamepad right button left (i.e. PS3: Circle, Xbox: B)"
"description": "Gamepad right button left (i.e. PS3: Square, Xbox: X)"
},
{
"name": "GAMEPAD_BUTTON_LEFT_TRIGGER_1",
@ -2248,7 +2254,7 @@
{
"name": "GAMEPAD_BUTTON_RIGHT_TRIGGER_1",
"value": 11,
"description": "Gamepad top/back trigger right (one), it could be a trailing button"
"description": "Gamepad top/back trigger right (first), it could be a trailing button"
},
{
"name": "GAMEPAD_BUTTON_RIGHT_TRIGGER_2",
@ -2951,27 +2957,27 @@
{
"name": "CAMERA_CUSTOM",
"value": 0,
"description": "Custom camera"
"description": "Camera custom, controlled by user (UpdateCamera() does nothing)"
},
{
"name": "CAMERA_FREE",
"value": 1,
"description": "Free camera"
"description": "Camera free mode"
},
{
"name": "CAMERA_ORBITAL",
"value": 2,
"description": "Orbital camera"
"description": "Camera orbital, around target, zoom supported"
},
{
"name": "CAMERA_FIRST_PERSON",
"value": 3,
"description": "First person camera"
"description": "Camera first person"
},
{
"name": "CAMERA_THIRD_PERSON",
"value": 4,
"description": "Third person camera"
"description": "Camera third person"
}
]
},
@ -3872,13 +3878,13 @@
]
},
{
"name": "GetMouseRay",
"description": "Get a ray trace from mouse position",
"name": "GetScreenToWorldRay",
"description": "Get a ray trace from screen position (i.e mouse)",
"returnType": "Ray",
"params": [
{
"type": "Vector2",
"name": "mousePosition"
"name": "position"
},
{
"type": "Camera",
@ -3887,24 +3893,24 @@
]
},
{
"name": "GetViewRay",
"description": "Get a ray trace from mouse position in a viewport",
"name": "GetScreenToWorldRayEx",
"description": "Get a ray trace from screen position (i.e mouse) in a viewport",
"returnType": "Ray",
"params": [
{
"type": "Vector2",
"name": "mousePosition"
"name": "position"
},
{
"type": "Camera",
"name": "camera"
},
{
"type": "float",
"type": "int",
"name": "width"
},
{
"type": "float",
"type": "int",
"name": "height"
}
]
@ -4918,6 +4924,25 @@
}
]
},
{
"name": "SetGamepadVibration",
"description": "Set gamepad vibration for both motors",
"returnType": "void",
"params": [
{
"type": "int",
"name": "gamepad"
},
{
"type": "float",
"name": "leftMotor"
},
{
"type": "float",
"name": "rightMotor"
}
]
},
{
"name": "IsMouseButtonPressed",
"description": "Check if a mouse button has been pressed once",
@ -5886,6 +5911,29 @@
},
{
"name": "DrawRectangleRoundedLines",
"description": "Draw rectangle lines with rounded edges",
"returnType": "void",
"params": [
{
"type": "Rectangle",
"name": "rec"
},
{
"type": "float",
"name": "roundness"
},
{
"type": "int",
"name": "segments"
},
{
"type": "Color",
"name": "color"
}
]
},
{
"name": "DrawRectangleRoundedLinesEx",
"description": "Draw rectangle with rounded edges outline",
"returnType": "void",
"params": [
@ -8349,6 +8397,21 @@
}
]
},
{
"name": "ColorIsEqual",
"description": "Check if two colors are equal",
"returnType": "bool",
"params": [
{
"type": "Color",
"name": "col1"
},
{
"type": "Color",
"name": "col2"
}
]
},
{
"name": "Fade",
"description": "Get color with alpha applied, alpha goes from 0.0f to 1.0f",
@ -8366,7 +8429,7 @@
},
{
"name": "ColorToInt",
"description": "Get hexadecimal value for a Color",
"description": "Get hexadecimal value for a Color (0xRRGGBBAA)",
"returnType": "int",
"params": [
{
@ -11629,7 +11692,7 @@
},
{
"name": "AttachAudioStreamProcessor",
"description": "Attach audio stream processor to stream, receives the samples as <float>s",
"description": "Attach audio stream processor to stream, receives the samples as 'float'",
"returnType": "void",
"params": [
{
@ -11659,7 +11722,7 @@
},
{
"name": "AttachAudioMixedProcessor",
"description": "Attach audio stream processor to the entire audio pipeline, receives the samples as <float>s",
"description": "Attach audio stream processor to the entire audio pipeline, receives the samples as 'float'",
"returnType": "void",
"params": [
{

View file

@ -335,6 +335,12 @@ return {
type = "UNKNOWN",
value = "SHADER_LOC_MAP_METALNESS",
description = ""
},
{
name = "GetMouseRay",
type = "UNKNOWN",
value = "GetScreenToWorldRay",
description = "Compatibility hack for previous raylib versions"
}
},
structs = {
@ -2223,7 +2229,7 @@ return {
{
name = "GAMEPAD_BUTTON_RIGHT_FACE_RIGHT",
value = 6,
description = "Gamepad right button right (i.e. PS3: Square, Xbox: X)"
description = "Gamepad right button right (i.e. PS3: Circle, Xbox: B)"
},
{
name = "GAMEPAD_BUTTON_RIGHT_FACE_DOWN",
@ -2233,7 +2239,7 @@ return {
{
name = "GAMEPAD_BUTTON_RIGHT_FACE_LEFT",
value = 8,
description = "Gamepad right button left (i.e. PS3: Circle, Xbox: B)"
description = "Gamepad right button left (i.e. PS3: Square, Xbox: X)"
},
{
name = "GAMEPAD_BUTTON_LEFT_TRIGGER_1",
@ -2248,7 +2254,7 @@ return {
{
name = "GAMEPAD_BUTTON_RIGHT_TRIGGER_1",
value = 11,
description = "Gamepad top/back trigger right (one), it could be a trailing button"
description = "Gamepad top/back trigger right (first), it could be a trailing button"
},
{
name = "GAMEPAD_BUTTON_RIGHT_TRIGGER_2",
@ -2951,27 +2957,27 @@ return {
{
name = "CAMERA_CUSTOM",
value = 0,
description = "Custom camera"
description = "Camera custom, controlled by user (UpdateCamera() does nothing)"
},
{
name = "CAMERA_FREE",
value = 1,
description = "Free camera"
description = "Camera free mode"
},
{
name = "CAMERA_ORBITAL",
value = 2,
description = "Orbital camera"
description = "Camera orbital, around target, zoom supported"
},
{
name = "CAMERA_FIRST_PERSON",
value = 3,
description = "First person camera"
description = "Camera first person"
},
{
name = "CAMERA_THIRD_PERSON",
value = 4,
description = "Third person camera"
description = "Camera third person"
}
}
},
@ -3635,23 +3641,23 @@ return {
}
},
{
name = "GetMouseRay",
description = "Get a ray trace from mouse position",
name = "GetScreenToWorldRay",
description = "Get a ray trace from screen position (i.e mouse)",
returnType = "Ray",
params = {
{type = "Vector2", name = "mousePosition"},
{type = "Vector2", name = "position"},
{type = "Camera", name = "camera"}
}
},
{
name = "GetViewRay",
description = "Get a ray trace from mouse position in a viewport",
name = "GetScreenToWorldRayEx",
description = "Get a ray trace from screen position (i.e mouse) in a viewport",
returnType = "Ray",
params = {
{type = "Vector2", name = "mousePosition"},
{type = "Vector2", name = "position"},
{type = "Camera", name = "camera"},
{type = "float", name = "width"},
{type = "float", name = "height"}
{type = "int", name = "width"},
{type = "int", name = "height"}
}
},
{
@ -4342,6 +4348,16 @@ return {
{type = "const char *", name = "mappings"}
}
},
{
name = "SetGamepadVibration",
description = "Set gamepad vibration for both motors",
returnType = "void",
params = {
{type = "int", name = "gamepad"},
{type = "float", name = "leftMotor"},
{type = "float", name = "rightMotor"}
}
},
{
name = "IsMouseButtonPressed",
description = "Check if a mouse button has been pressed once",
@ -4875,6 +4891,17 @@ return {
},
{
name = "DrawRectangleRoundedLines",
description = "Draw rectangle lines with rounded edges",
returnType = "void",
params = {
{type = "Rectangle", name = "rec"},
{type = "float", name = "roundness"},
{type = "int", name = "segments"},
{type = "Color", name = "color"}
}
},
{
name = "DrawRectangleRoundedLinesEx",
description = "Draw rectangle with rounded edges outline",
returnType = "void",
params = {
@ -6144,6 +6171,15 @@ return {
{type = "Color", name = "tint"}
}
},
{
name = "ColorIsEqual",
description = "Check if two colors are equal",
returnType = "bool",
params = {
{type = "Color", name = "col1"},
{type = "Color", name = "col2"}
}
},
{
name = "Fade",
description = "Get color with alpha applied, alpha goes from 0.0f to 1.0f",
@ -6155,7 +6191,7 @@ return {
},
{
name = "ColorToInt",
description = "Get hexadecimal value for a Color",
description = "Get hexadecimal value for a Color (0xRRGGBBAA)",
returnType = "int",
params = {
{type = "Color", name = "color"}
@ -7996,7 +8032,7 @@ return {
},
{
name = "AttachAudioStreamProcessor",
description = "Attach audio stream processor to stream, receives the samples as <float>s",
description = "Attach audio stream processor to stream, receives the samples as 'float'",
returnType = "void",
params = {
{type = "AudioStream", name = "stream"},
@ -8014,7 +8050,7 @@ return {
},
{
name = "AttachAudioMixedProcessor",
description = "Attach audio stream processor to the entire audio pipeline, receives the samples as <float>s",
description = "Attach audio stream processor to the entire audio pipeline, receives the samples as 'float'",
returnType = "void",
params = {
{type = "AudioCallback", name = "processor"}

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<raylibAPI>
<Defines count="56">
<Defines count="57">
<Define name="RAYLIB_H" type="GUARD" value="" desc="" />
<Define name="RAYLIB_VERSION_MAJOR" type="INT" value="5" desc="" />
<Define name="RAYLIB_VERSION_MINOR" type="INT" value="1" desc="" />
@ -57,6 +57,7 @@
<Define name="MATERIAL_MAP_SPECULAR" type="UNKNOWN" value="MATERIAL_MAP_METALNESS" desc="" />
<Define name="SHADER_LOC_MAP_DIFFUSE" type="UNKNOWN" value="SHADER_LOC_MAP_ALBEDO" desc="" />
<Define name="SHADER_LOC_MAP_SPECULAR" type="UNKNOWN" value="SHADER_LOC_MAP_METALNESS" desc="" />
<Define name="GetMouseRay" type="UNKNOWN" value="GetScreenToWorldRay" desc="Compatibility hack for previous raylib versions" />
</Defines>
<Structs count="34">
<Struct name="Vector2" fieldCount="2" desc="Vector2, 2 components">
@ -470,12 +471,12 @@
<Value name="GAMEPAD_BUTTON_LEFT_FACE_DOWN" integer="3" desc="Gamepad left DPAD down button" />
<Value name="GAMEPAD_BUTTON_LEFT_FACE_LEFT" integer="4" desc="Gamepad left DPAD left button" />
<Value name="GAMEPAD_BUTTON_RIGHT_FACE_UP" integer="5" desc="Gamepad right button up (i.e. PS3: Triangle, Xbox: Y)" />
<Value name="GAMEPAD_BUTTON_RIGHT_FACE_RIGHT" integer="6" desc="Gamepad right button right (i.e. PS3: Square, Xbox: X)" />
<Value name="GAMEPAD_BUTTON_RIGHT_FACE_RIGHT" integer="6" desc="Gamepad right button right (i.e. PS3: Circle, Xbox: B)" />
<Value name="GAMEPAD_BUTTON_RIGHT_FACE_DOWN" integer="7" desc="Gamepad right button down (i.e. PS3: Cross, Xbox: A)" />
<Value name="GAMEPAD_BUTTON_RIGHT_FACE_LEFT" integer="8" desc="Gamepad right button left (i.e. PS3: Circle, Xbox: B)" />
<Value name="GAMEPAD_BUTTON_RIGHT_FACE_LEFT" integer="8" desc="Gamepad right button left (i.e. PS3: Square, Xbox: X)" />
<Value name="GAMEPAD_BUTTON_LEFT_TRIGGER_1" integer="9" desc="Gamepad top/back trigger left (first), it could be a trailing button" />
<Value name="GAMEPAD_BUTTON_LEFT_TRIGGER_2" integer="10" desc="Gamepad top/back trigger left (second), it could be a trailing button" />
<Value name="GAMEPAD_BUTTON_RIGHT_TRIGGER_1" integer="11" desc="Gamepad top/back trigger right (one), it could be a trailing button" />
<Value name="GAMEPAD_BUTTON_RIGHT_TRIGGER_1" integer="11" desc="Gamepad top/back trigger right (first), it could be a trailing button" />
<Value name="GAMEPAD_BUTTON_RIGHT_TRIGGER_2" integer="12" desc="Gamepad top/back trigger right (second), it could be a trailing button" />
<Value name="GAMEPAD_BUTTON_MIDDLE_LEFT" integer="13" desc="Gamepad center buttons, left one (i.e. PS3: Select)" />
<Value name="GAMEPAD_BUTTON_MIDDLE" integer="14" desc="Gamepad center buttons, middle one (i.e. PS3: PS, Xbox: XBOX)" />
@ -626,11 +627,11 @@
<Value name="GESTURE_PINCH_OUT" integer="512" desc="Pinch out gesture" />
</Enum>
<Enum name="CameraMode" valueCount="5" desc="Camera system modes">
<Value name="CAMERA_CUSTOM" integer="0" desc="Custom camera" />
<Value name="CAMERA_FREE" integer="1" desc="Free camera" />
<Value name="CAMERA_ORBITAL" integer="2" desc="Orbital camera" />
<Value name="CAMERA_FIRST_PERSON" integer="3" desc="First person camera" />
<Value name="CAMERA_THIRD_PERSON" integer="4" desc="Third person camera" />
<Value name="CAMERA_CUSTOM" integer="0" desc="Camera custom, controlled by user (UpdateCamera() does nothing)" />
<Value name="CAMERA_FREE" integer="1" desc="Camera free mode" />
<Value name="CAMERA_ORBITAL" integer="2" desc="Camera orbital, around target, zoom supported" />
<Value name="CAMERA_FIRST_PERSON" integer="3" desc="Camera first person" />
<Value name="CAMERA_THIRD_PERSON" integer="4" desc="Camera third person" />
</Enum>
<Enum name="CameraProjection" valueCount="2" desc="Camera projection">
<Value name="CAMERA_PERSPECTIVE" integer="0" desc="Perspective projection" />
@ -669,7 +670,7 @@
<Param type="unsigned int" name="frames" desc="" />
</Callback>
</Callbacks>
<Functions count="559">
<Functions count="562">
<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="" />
@ -902,15 +903,15 @@
<Function name="UnloadShader" retType="void" paramCount="1" desc="Unload shader from GPU memory (VRAM)">
<Param type="Shader" name="shader" desc="" />
</Function>
<Function name="GetMouseRay" retType="Ray" paramCount="2" desc="Get a ray trace from mouse position">
<Param type="Vector2" name="mousePosition" desc="" />
<Function name="GetScreenToWorldRay" retType="Ray" paramCount="2" desc="Get a ray trace from screen position (i.e mouse)">
<Param type="Vector2" name="position" desc="" />
<Param type="Camera" name="camera" desc="" />
</Function>
<Function name="GetViewRay" retType="Ray" paramCount="4" desc="Get a ray trace from mouse position in a viewport">
<Param type="Vector2" name="mousePosition" desc="" />
<Function name="GetScreenToWorldRayEx" retType="Ray" paramCount="4" desc="Get a ray trace from screen position (i.e mouse) in a viewport">
<Param type="Vector2" name="position" desc="" />
<Param type="Camera" name="camera" desc="" />
<Param type="float" name="width" desc="" />
<Param type="float" name="height" desc="" />
<Param type="int" name="width" desc="" />
<Param type="int" name="height" 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="" />
@ -1193,6 +1194,11 @@
<Function name="SetGamepadMappings" retType="int" paramCount="1" desc="Set internal gamepad mappings (SDL_GameControllerDB)">
<Param type="const char *" name="mappings" desc="" />
</Function>
<Function name="SetGamepadVibration" retType="void" paramCount="3" desc="Set gamepad vibration for both motors">
<Param type="int" name="gamepad" desc="" />
<Param type="float" name="leftMotor" desc="" />
<Param type="float" name="rightMotor" desc="" />
</Function>
<Function name="IsMouseButtonPressed" retType="bool" paramCount="1" desc="Check if a mouse button has been pressed once">
<Param type="int" name="button" desc="" />
</Function>
@ -1458,7 +1464,13 @@
<Param type="int" name="segments" desc="" />
<Param type="Color" name="color" desc="" />
</Function>
<Function name="DrawRectangleRoundedLines" retType="void" paramCount="5" desc="Draw rectangle with rounded edges outline">
<Function name="DrawRectangleRoundedLines" retType="void" paramCount="4" desc="Draw rectangle lines with rounded edges">
<Param type="Rectangle" name="rec" desc="" />
<Param type="float" name="roundness" desc="" />
<Param type="int" name="segments" desc="" />
<Param type="Color" name="color" desc="" />
</Function>
<Function name="DrawRectangleRoundedLinesEx" retType="void" paramCount="5" desc="Draw rectangle with rounded edges outline">
<Param type="Rectangle" name="rec" desc="" />
<Param type="float" name="roundness" desc="" />
<Param type="int" name="segments" desc="" />
@ -2106,11 +2118,15 @@
<Param type="float" name="rotation" desc="" />
<Param type="Color" name="tint" desc="" />
</Function>
<Function name="ColorIsEqual" retType="bool" paramCount="2" desc="Check if two colors are equal">
<Param type="Color" name="col1" desc="" />
<Param type="Color" name="col2" desc="" />
</Function>
<Function name="Fade" retType="Color" paramCount="2" desc="Get color with alpha applied, alpha goes from 0.0f to 1.0f">
<Param type="Color" name="color" desc="" />
<Param type="float" name="alpha" desc="" />
</Function>
<Function name="ColorToInt" retType="int" paramCount="1" desc="Get hexadecimal value for a Color">
<Function name="ColorToInt" retType="int" paramCount="1" desc="Get hexadecimal value for a Color (0xRRGGBBAA)">
<Param type="Color" name="color" desc="" />
</Function>
<Function name="ColorNormalize" retType="Vector4" paramCount="1" desc="Get Color normalized as float [0..1]">
@ -2978,7 +2994,7 @@
<Param type="AudioStream" name="stream" desc="" />
<Param type="AudioCallback" name="callback" desc="" />
</Function>
<Function name="AttachAudioStreamProcessor" retType="void" paramCount="2" desc="Attach audio stream processor to stream, receives the samples as <float>s">
<Function name="AttachAudioStreamProcessor" retType="void" paramCount="2" desc="Attach audio stream processor to stream, receives the samples as 'float'">
<Param type="AudioStream" name="stream" desc="" />
<Param type="AudioCallback" name="processor" desc="" />
</Function>
@ -2986,7 +3002,7 @@
<Param type="AudioStream" name="stream" desc="" />
<Param type="AudioCallback" name="processor" desc="" />
</Function>
<Function name="AttachAudioMixedProcessor" retType="void" paramCount="1" desc="Attach audio stream processor to the entire audio pipeline, receives the samples as <float>s">
<Function name="AttachAudioMixedProcessor" retType="void" paramCount="1" desc="Attach audio stream processor to the entire audio pipeline, receives the samples as 'float'">
<Param type="AudioCallback" name="processor" desc="" />
</Function>
<Function name="DetachAudioMixedProcessor" retType="void" paramCount="1" desc="Detach audio stream processor from the entire audio pipeline">