Merge branch 'master' of https://github.com/raysan5/raylib
This commit is contained in:
commit
449f7d3fa6
@ -8368,6 +8368,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",
|
||||
|
@ -6154,6 +6154,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",
|
||||
|
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="560">
|
||||
<Functions count="561">
|
||||
<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="" />
|
||||
@ -2111,6 +2111,10 @@
|
||||
<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="" />
|
||||
|
Loading…
Reference in New Issue
Block a user