Merge branch 'master' of https://github.com/raysan5/raylib
This commit is contained in:
commit
6760d1bff8
@ -3414,7 +3414,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "GetCurrentMonitor",
|
"name": "GetCurrentMonitor",
|
||||||
"description": "Get primary system monitor",
|
"description": "Get current monitor where window is placed",
|
||||||
"returnType": "int"
|
"returnType": "int"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -3315,7 +3315,7 @@ return {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
name = "GetCurrentMonitor",
|
name = "GetCurrentMonitor",
|
||||||
description = "Get primary system monitor",
|
description = "Get current monitor where window is placed",
|
||||||
returnType = "int"
|
returnType = "int"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1170,7 +1170,7 @@ Function 034: GetMonitorCount() (0 input parameters)
|
|||||||
Function 035: GetCurrentMonitor() (0 input parameters)
|
Function 035: GetCurrentMonitor() (0 input parameters)
|
||||||
Name: GetCurrentMonitor
|
Name: GetCurrentMonitor
|
||||||
Return type: int
|
Return type: int
|
||||||
Description: Get primary system monitor
|
Description: Get current monitor where window is placed
|
||||||
No input parameters
|
No input parameters
|
||||||
Function 036: GetMonitorPosition() (1 input parameters)
|
Function 036: GetMonitorPosition() (1 input parameters)
|
||||||
Name: GetMonitorPosition
|
Name: GetMonitorPosition
|
||||||
|
@ -763,7 +763,7 @@
|
|||||||
</Function>
|
</Function>
|
||||||
<Function name="GetMonitorCount" retType="int" paramCount="0" desc="Get number of connected monitors">
|
<Function name="GetMonitorCount" retType="int" paramCount="0" desc="Get number of connected monitors">
|
||||||
</Function>
|
</Function>
|
||||||
<Function name="GetCurrentMonitor" retType="int" paramCount="0" desc="Get primary system monitor">
|
<Function name="GetCurrentMonitor" retType="int" paramCount="0" desc="Get current monitor where window is placed">
|
||||||
</Function>
|
</Function>
|
||||||
<Function name="GetMonitorPosition" retType="Vector2" paramCount="1" desc="Get specified monitor position">
|
<Function name="GetMonitorPosition" retType="Vector2" paramCount="1" desc="Get specified monitor position">
|
||||||
<Param type="int" name="monitor" desc="" />
|
<Param type="int" name="monitor" desc="" />
|
||||||
|
Loading…
Reference in New Issue
Block a user