Update to master (#3780)
* Update rtext.c * Add gamepad support to PLATFORM_DESKTOP_SDL (#3776) Co-authored-by: Arthur <hi@thenightwat.ch> * [rcore] Fix `GetFileNameWithoutExt()` (#3771) * Update rcore.c fix [rcore] GetFileNameWithoutExt * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Update rcore.c * Review formating and some defines naming consistency * Added viewport independent raycast (#3709) * added viewport independent raycast * Renamed GetMouseRayEx to GetViewRay * Update raylib_api.* by CI * REVIEWED: `rlLoadFramebuffer()`, parameters not required * Reorder functions * Update raylib_api.* by CI * Update rtext.c (#3777) (#3779) * REVIEWED: `rlLoadFramebuffer()` --------- Co-authored-by: A <kirk25000@gmail.com> Co-authored-by: Arthur <hi@thenightwat.ch> Co-authored-by: oblerion <82583559+oblerion@users.noreply.github.com> Co-authored-by: Luís Almeida <60551627+luis605@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
parent
00d1eb2bd0
commit
dad4a31475
4 changed files with 790 additions and 599 deletions
|
|
@ -3887,24 +3887,25 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"name": "GetCameraMatrix",
|
||||
"description": "Get camera transform matrix (view matrix)",
|
||||
"returnType": "Matrix",
|
||||
"name": "GetViewRay",
|
||||
"description": "Get a ray trace from mouse position in a viewport",
|
||||
"returnType": "Ray",
|
||||
"params": [
|
||||
{
|
||||
"type": "Vector2",
|
||||
"name": "mousePosition"
|
||||
},
|
||||
{
|
||||
"type": "Camera",
|
||||
"name": "camera"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "GetCameraMatrix2D",
|
||||
"description": "Get camera 2d transform matrix",
|
||||
"returnType": "Matrix",
|
||||
"params": [
|
||||
},
|
||||
{
|
||||
"type": "Camera2D",
|
||||
"name": "camera"
|
||||
"type": "float",
|
||||
"name": "width"
|
||||
},
|
||||
{
|
||||
"type": "float",
|
||||
"name": "height"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -3923,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",
|
||||
|
|
@ -3976,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)",
|
||||
|
|
|
|||
|
|
@ -3644,19 +3644,14 @@ return {
|
|||
}
|
||||
},
|
||||
{
|
||||
name = "GetCameraMatrix",
|
||||
description = "Get camera transform matrix (view matrix)",
|
||||
returnType = "Matrix",
|
||||
name = "GetViewRay",
|
||||
description = "Get a ray trace from mouse position in a viewport",
|
||||
returnType = "Ray",
|
||||
params = {
|
||||
{type = "Camera", name = "camera"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "GetCameraMatrix2D",
|
||||
description = "Get camera 2d transform matrix",
|
||||
returnType = "Matrix",
|
||||
params = {
|
||||
{type = "Camera2D", name = "camera"}
|
||||
{type = "Vector2", name = "mousePosition"},
|
||||
{type = "Camera", name = "camera"},
|
||||
{type = "float", name = "width"},
|
||||
{type = "float", name = "height"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -3668,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",
|
||||
|
|
@ -3697,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)",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -669,7 +669,7 @@
|
|||
<Param type="unsigned int" name="frames" desc="" />
|
||||
</Callback>
|
||||
</Callbacks>
|
||||
<Functions count="558">
|
||||
<Functions count="559">
|
||||
<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="" />
|
||||
|
|
@ -906,20 +906,16 @@
|
|||
<Param type="Vector2" name="mousePosition" desc="" />
|
||||
<Param type="Camera" name="camera" desc="" />
|
||||
</Function>
|
||||
<Function name="GetCameraMatrix" retType="Matrix" paramCount="1" desc="Get camera transform matrix (view matrix)">
|
||||
<Function name="GetViewRay" retType="Ray" paramCount="4" desc="Get a ray trace from mouse position in a viewport">
|
||||
<Param type="Vector2" name="mousePosition" desc="" />
|
||||
<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="" />
|
||||
<Param type="float" name="width" desc="" />
|
||||
<Param type="float" 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="" />
|
||||
<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="" />
|
||||
|
|
@ -930,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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue