Merge branch 'master' into master
This commit is contained in:
commit
8d6254b352
1 changed files with 22175 additions and 5774 deletions
|
|
@ -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": [
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue