mirror of
https://github.com/raysan5/raylib.git
synced 2025-12-25 10:22:33 -05:00
Merge branch 'raysan5:master' into safety-comments
This commit is contained in:
Amy Wilder
GitHub
@ -2300,7 +2300,7 @@
|
||||
},
|
||||
{
|
||||
"name": "GamepadAxis",
|
||||
"description": "Gamepad axis",
|
||||
"description": "Gamepad axes",
|
||||
"values": [
|
||||
{
|
||||
"name": "GAMEPAD_AXIS_LEFT_X",
|
||||
@ -3139,7 +3139,7 @@
|
||||
"name": "fileName"
|
||||
},
|
||||
{
|
||||
"type": "char *",
|
||||
"type": "const char *",
|
||||
"name": "text"
|
||||
}
|
||||
]
|
||||
@ -3280,7 +3280,7 @@
|
||||
},
|
||||
{
|
||||
"name": "RestoreWindow",
|
||||
"description": "Set window state: not minimized/maximized",
|
||||
"description": "Restore window from being minimized/maximized",
|
||||
"returnType": "void"
|
||||
},
|
||||
{
|
||||
@ -4409,7 +4409,7 @@
|
||||
"name": "fileName"
|
||||
},
|
||||
{
|
||||
"type": "char *",
|
||||
"type": "const char *",
|
||||
"name": "text"
|
||||
}
|
||||
]
|
||||
@ -4684,7 +4684,7 @@
|
||||
},
|
||||
{
|
||||
"name": "EncodeDataBase64",
|
||||
"description": "Encode data to Base64 string, memory must be MemFree()",
|
||||
"description": "Encode data to Base64 string (includes NULL terminator), memory must be MemFree()",
|
||||
"returnType": "char *",
|
||||
"params": [
|
||||
{
|
||||
@ -4703,12 +4703,12 @@
|
||||
},
|
||||
{
|
||||
"name": "DecodeDataBase64",
|
||||
"description": "Decode Base64 string data, memory must be MemFree()",
|
||||
"description": "Decode Base64 string (expected NULL terminated), memory must be MemFree()",
|
||||
"returnType": "unsigned char *",
|
||||
"params": [
|
||||
{
|
||||
"type": "const unsigned char *",
|
||||
"name": "data"
|
||||
"type": "const char *",
|
||||
"name": "text"
|
||||
},
|
||||
{
|
||||
"type": "int *",
|
||||
@ -5017,7 +5017,7 @@
|
||||
},
|
||||
{
|
||||
"name": "GetGamepadAxisCount",
|
||||
"description": "Get gamepad axis count for a gamepad",
|
||||
"description": "Get axis count for a gamepad",
|
||||
"returnType": "int",
|
||||
"params": [
|
||||
{
|
||||
@ -5028,7 +5028,7 @@
|
||||
},
|
||||
{
|
||||
"name": "GetGamepadAxisMovement",
|
||||
"description": "Get axis movement value for a gamepad axis",
|
||||
"description": "Get movement value for a gamepad axis",
|
||||
"returnType": "float",
|
||||
"params": [
|
||||
{
|
||||
@ -5702,6 +5702,29 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "DrawEllipseV",
|
||||
"description": "Draw ellipse (Vector version)",
|
||||
"returnType": "void",
|
||||
"params": [
|
||||
{
|
||||
"type": "Vector2",
|
||||
"name": "center"
|
||||
},
|
||||
{
|
||||
"type": "float",
|
||||
"name": "radiusH"
|
||||
},
|
||||
{
|
||||
"type": "float",
|
||||
"name": "radiusV"
|
||||
},
|
||||
{
|
||||
"type": "Color",
|
||||
"name": "color"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "DrawEllipseLines",
|
||||
"description": "Draw ellipse outline",
|
||||
@ -5729,6 +5752,29 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "DrawEllipseLinesV",
|
||||
"description": "Draw ellipse outline (Vector version)",
|
||||
"returnType": "void",
|
||||
"params": [
|
||||
{
|
||||
"type": "Vector2",
|
||||
"name": "center"
|
||||
},
|
||||
{
|
||||
"type": "float",
|
||||
"name": "radiusH"
|
||||
},
|
||||
{
|
||||
"type": "float",
|
||||
"name": "radiusV"
|
||||
},
|
||||
{
|
||||
"type": "Color",
|
||||
"name": "color"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "DrawRing",
|
||||
"description": "Draw ring",
|
||||
@ -5964,11 +6010,11 @@
|
||||
},
|
||||
{
|
||||
"type": "Color",
|
||||
"name": "topRight"
|
||||
"name": "bottomRight"
|
||||
},
|
||||
{
|
||||
"type": "Color",
|
||||
"name": "bottomRight"
|
||||
"name": "topRight"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -8256,7 +8302,7 @@
|
||||
"name": "dst"
|
||||
},
|
||||
{
|
||||
"type": "Vector2 *",
|
||||
"type": "const Vector2 *",
|
||||
"name": "points"
|
||||
},
|
||||
{
|
||||
@ -8279,7 +8325,7 @@
|
||||
"name": "dst"
|
||||
},
|
||||
{
|
||||
"type": "Vector2 *",
|
||||
"type": "const Vector2 *",
|
||||
"name": "points"
|
||||
},
|
||||
{
|
||||
|
||||
@ -2300,7 +2300,7 @@ return {
|
||||
},
|
||||
{
|
||||
name = "GamepadAxis",
|
||||
description = "Gamepad axis",
|
||||
description = "Gamepad axes",
|
||||
values = {
|
||||
{
|
||||
name = "GAMEPAD_AXIS_LEFT_X",
|
||||
@ -3108,7 +3108,7 @@ return {
|
||||
returnType = "bool",
|
||||
params = {
|
||||
{type = "const char *", name = "fileName"},
|
||||
{type = "char *", name = "text"}
|
||||
{type = "const char *", name = "text"}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -3223,7 +3223,7 @@ return {
|
||||
},
|
||||
{
|
||||
name = "RestoreWindow",
|
||||
description = "Set window state: not minimized/maximized",
|
||||
description = "Restore window from being minimized/maximized",
|
||||
returnType = "void"
|
||||
},
|
||||
{
|
||||
@ -4006,7 +4006,7 @@ return {
|
||||
returnType = "bool",
|
||||
params = {
|
||||
{type = "const char *", name = "fileName"},
|
||||
{type = "char *", name = "text"}
|
||||
{type = "const char *", name = "text"}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -4198,7 +4198,7 @@ return {
|
||||
},
|
||||
{
|
||||
name = "EncodeDataBase64",
|
||||
description = "Encode data to Base64 string, memory must be MemFree()",
|
||||
description = "Encode data to Base64 string (includes NULL terminator), memory must be MemFree()",
|
||||
returnType = "char *",
|
||||
params = {
|
||||
{type = "const unsigned char *", name = "data"},
|
||||
@ -4208,10 +4208,10 @@ return {
|
||||
},
|
||||
{
|
||||
name = "DecodeDataBase64",
|
||||
description = "Decode Base64 string data, memory must be MemFree()",
|
||||
description = "Decode Base64 string (expected NULL terminated), memory must be MemFree()",
|
||||
returnType = "unsigned char *",
|
||||
params = {
|
||||
{type = "const unsigned char *", name = "data"},
|
||||
{type = "const char *", name = "text"},
|
||||
{type = "int *", name = "outputSize"}
|
||||
}
|
||||
},
|
||||
@ -4426,7 +4426,7 @@ return {
|
||||
},
|
||||
{
|
||||
name = "GetGamepadAxisCount",
|
||||
description = "Get gamepad axis count for a gamepad",
|
||||
description = "Get axis count for a gamepad",
|
||||
returnType = "int",
|
||||
params = {
|
||||
{type = "int", name = "gamepad"}
|
||||
@ -4434,7 +4434,7 @@ return {
|
||||
},
|
||||
{
|
||||
name = "GetGamepadAxisMovement",
|
||||
description = "Get axis movement value for a gamepad axis",
|
||||
description = "Get movement value for a gamepad axis",
|
||||
returnType = "float",
|
||||
params = {
|
||||
{type = "int", name = "gamepad"},
|
||||
@ -4838,6 +4838,17 @@ return {
|
||||
{type = "Color", name = "color"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "DrawEllipseV",
|
||||
description = "Draw ellipse (Vector version)",
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Vector2", name = "center"},
|
||||
{type = "float", name = "radiusH"},
|
||||
{type = "float", name = "radiusV"},
|
||||
{type = "Color", name = "color"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "DrawEllipseLines",
|
||||
description = "Draw ellipse outline",
|
||||
@ -4850,6 +4861,17 @@ return {
|
||||
{type = "Color", name = "color"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "DrawEllipseLinesV",
|
||||
description = "Draw ellipse outline (Vector version)",
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Vector2", name = "center"},
|
||||
{type = "float", name = "radiusH"},
|
||||
{type = "float", name = "radiusV"},
|
||||
{type = "Color", name = "color"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "DrawRing",
|
||||
description = "Draw ring",
|
||||
@ -4954,8 +4976,8 @@ return {
|
||||
{type = "Rectangle", name = "rec"},
|
||||
{type = "Color", name = "topLeft"},
|
||||
{type = "Color", name = "bottomLeft"},
|
||||
{type = "Color", name = "topRight"},
|
||||
{type = "Color", name = "bottomRight"}
|
||||
{type = "Color", name = "bottomRight"},
|
||||
{type = "Color", name = "topRight"}
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -6119,7 +6141,7 @@ return {
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Image *", name = "dst"},
|
||||
{type = "Vector2 *", name = "points"},
|
||||
{type = "const Vector2 *", name = "points"},
|
||||
{type = "int", name = "pointCount"},
|
||||
{type = "Color", name = "color"}
|
||||
}
|
||||
@ -6130,7 +6152,7 @@ return {
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Image *", name = "dst"},
|
||||
{type = "Vector2 *", name = "points"},
|
||||
{type = "const Vector2 *", name = "points"},
|
||||
{type = "int", name = "pointCount"},
|
||||
{type = "Color", name = "color"}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -486,7 +486,7 @@
|
||||
<Value name="GAMEPAD_BUTTON_LEFT_THUMB" integer="16" desc="Gamepad joystick pressed button left" />
|
||||
<Value name="GAMEPAD_BUTTON_RIGHT_THUMB" integer="17" desc="Gamepad joystick pressed button right" />
|
||||
</Enum>
|
||||
<Enum name="GamepadAxis" valueCount="6" desc="Gamepad axis">
|
||||
<Enum name="GamepadAxis" valueCount="6" desc="Gamepad axes">
|
||||
<Value name="GAMEPAD_AXIS_LEFT_X" integer="0" desc="Gamepad left stick X axis" />
|
||||
<Value name="GAMEPAD_AXIS_LEFT_Y" integer="1" desc="Gamepad left stick Y axis" />
|
||||
<Value name="GAMEPAD_AXIS_RIGHT_X" integer="2" desc="Gamepad right stick X axis" />
|
||||
@ -672,14 +672,14 @@
|
||||
</Callback>
|
||||
<Callback name="SaveFileTextCallback" retType="bool" paramCount="2" desc="FileIO: Save text data">
|
||||
<Param type="const char *" name="fileName" desc="" />
|
||||
<Param type="char *" name="text" desc="" />
|
||||
<Param type="const char *" name="text" desc="" />
|
||||
</Callback>
|
||||
<Callback name="AudioCallback" retType="void" paramCount="2" desc="">
|
||||
<Param type="void *" name="bufferData" desc="" />
|
||||
<Param type="unsigned int" name="frames" desc="" />
|
||||
</Callback>
|
||||
</Callbacks>
|
||||
<Functions count="582">
|
||||
<Functions count="584">
|
||||
<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="" />
|
||||
@ -720,7 +720,7 @@
|
||||
</Function>
|
||||
<Function name="MinimizeWindow" retType="void" paramCount="0" desc="Set window state: minimized, if resizable">
|
||||
</Function>
|
||||
<Function name="RestoreWindow" retType="void" paramCount="0" desc="Set window state: not minimized/maximized">
|
||||
<Function name="RestoreWindow" retType="void" paramCount="0" desc="Restore window from being minimized/maximized">
|
||||
</Function>
|
||||
<Function name="SetWindowIcon" retType="void" paramCount="1" desc="Set icon for window (single image, RGBA 32bit)">
|
||||
<Param type="Image" name="image" desc="" />
|
||||
@ -1046,7 +1046,7 @@
|
||||
</Function>
|
||||
<Function name="SaveFileText" retType="bool" paramCount="2" desc="Save text data to file (write), string must be '\0' terminated, returns true on success">
|
||||
<Param type="const char *" name="fileName" desc="" />
|
||||
<Param type="char *" name="text" desc="" />
|
||||
<Param type="const char *" name="text" desc="" />
|
||||
</Function>
|
||||
<Function name="FileExists" retType="bool" paramCount="1" desc="Check if file exists">
|
||||
<Param type="const char *" name="fileName" desc="" />
|
||||
@ -1123,13 +1123,13 @@
|
||||
<Param type="int" name="compDataSize" desc="" />
|
||||
<Param type="int *" name="dataSize" desc="" />
|
||||
</Function>
|
||||
<Function name="EncodeDataBase64" retType="char *" paramCount="3" desc="Encode data to Base64 string, memory must be MemFree()">
|
||||
<Function name="EncodeDataBase64" retType="char *" paramCount="3" desc="Encode data to Base64 string (includes NULL terminator), memory must be MemFree()">
|
||||
<Param type="const unsigned char *" name="data" desc="" />
|
||||
<Param type="int" name="dataSize" desc="" />
|
||||
<Param type="int *" name="outputSize" desc="" />
|
||||
</Function>
|
||||
<Function name="DecodeDataBase64" retType="unsigned char *" paramCount="2" desc="Decode Base64 string data, memory must be MemFree()">
|
||||
<Param type="const unsigned char *" name="data" desc="" />
|
||||
<Function name="DecodeDataBase64" retType="unsigned char *" paramCount="2" desc="Decode Base64 string (expected NULL terminated), memory must be MemFree()">
|
||||
<Param type="const char *" name="text" desc="" />
|
||||
<Param type="int *" name="outputSize" desc="" />
|
||||
</Function>
|
||||
<Function name="ComputeCRC32" retType="unsigned int" paramCount="2" desc="Compute CRC32 hash code">
|
||||
@ -1216,10 +1216,10 @@
|
||||
</Function>
|
||||
<Function name="GetGamepadButtonPressed" retType="int" paramCount="0" desc="Get the last gamepad button pressed">
|
||||
</Function>
|
||||
<Function name="GetGamepadAxisCount" retType="int" paramCount="1" desc="Get gamepad axis count for a gamepad">
|
||||
<Function name="GetGamepadAxisCount" retType="int" paramCount="1" desc="Get axis count for a gamepad">
|
||||
<Param type="int" name="gamepad" desc="" />
|
||||
</Function>
|
||||
<Function name="GetGamepadAxisMovement" retType="float" paramCount="2" desc="Get axis movement value for a gamepad axis">
|
||||
<Function name="GetGamepadAxisMovement" retType="float" paramCount="2" desc="Get movement value for a gamepad axis">
|
||||
<Param type="int" name="gamepad" desc="" />
|
||||
<Param type="int" name="axis" desc="" />
|
||||
</Function>
|
||||
@ -1409,6 +1409,12 @@
|
||||
<Param type="float" name="radiusV" desc="" />
|
||||
<Param type="Color" name="color" desc="" />
|
||||
</Function>
|
||||
<Function name="DrawEllipseV" retType="void" paramCount="4" desc="Draw ellipse (Vector version)">
|
||||
<Param type="Vector2" name="center" desc="" />
|
||||
<Param type="float" name="radiusH" desc="" />
|
||||
<Param type="float" name="radiusV" desc="" />
|
||||
<Param type="Color" name="color" desc="" />
|
||||
</Function>
|
||||
<Function name="DrawEllipseLines" retType="void" paramCount="5" desc="Draw ellipse outline">
|
||||
<Param type="int" name="centerX" desc="" />
|
||||
<Param type="int" name="centerY" desc="" />
|
||||
@ -1416,6 +1422,12 @@
|
||||
<Param type="float" name="radiusV" desc="" />
|
||||
<Param type="Color" name="color" desc="" />
|
||||
</Function>
|
||||
<Function name="DrawEllipseLinesV" retType="void" paramCount="4" desc="Draw ellipse outline (Vector version)">
|
||||
<Param type="Vector2" name="center" desc="" />
|
||||
<Param type="float" name="radiusH" desc="" />
|
||||
<Param type="float" name="radiusV" desc="" />
|
||||
<Param type="Color" name="color" desc="" />
|
||||
</Function>
|
||||
<Function name="DrawRing" retType="void" paramCount="7" desc="Draw ring">
|
||||
<Param type="Vector2" name="center" desc="" />
|
||||
<Param type="float" name="innerRadius" desc="" />
|
||||
@ -1476,8 +1488,8 @@
|
||||
<Param type="Rectangle" name="rec" desc="" />
|
||||
<Param type="Color" name="topLeft" desc="" />
|
||||
<Param type="Color" name="bottomLeft" desc="" />
|
||||
<Param type="Color" name="topRight" desc="" />
|
||||
<Param type="Color" name="bottomRight" desc="" />
|
||||
<Param type="Color" name="topRight" desc="" />
|
||||
</Function>
|
||||
<Function name="DrawRectangleLines" retType="void" paramCount="5" desc="Draw rectangle outline">
|
||||
<Param type="int" name="posX" desc="" />
|
||||
@ -2078,13 +2090,13 @@
|
||||
</Function>
|
||||
<Function name="ImageDrawTriangleFan" retType="void" paramCount="4" desc="Draw a triangle fan defined by points within an image (first vertex is the center)">
|
||||
<Param type="Image *" name="dst" desc="" />
|
||||
<Param type="Vector2 *" name="points" desc="" />
|
||||
<Param type="const Vector2 *" name="points" desc="" />
|
||||
<Param type="int" name="pointCount" desc="" />
|
||||
<Param type="Color" name="color" desc="" />
|
||||
</Function>
|
||||
<Function name="ImageDrawTriangleStrip" retType="void" paramCount="4" desc="Draw a triangle strip defined by points within an image">
|
||||
<Param type="Image *" name="dst" desc="" />
|
||||
<Param type="Vector2 *" name="points" desc="" />
|
||||
<Param type="const Vector2 *" name="points" desc="" />
|
||||
<Param type="int" name="pointCount" desc="" />
|
||||
<Param type="Color" name="color" desc="" />
|
||||
</Function>
|
||||
|
||||
Reference in New Issue
Block a user