Merge branch 'master' of https://github.com/raysan5/raylib
This commit is contained in:
commit
530bb3dc57
@ -11069,7 +11069,26 @@
|
||||
},
|
||||
{
|
||||
"name": "UpdateModelAnimation",
|
||||
"description": "Update model animation pose",
|
||||
"description": "Update model animation pose (CPU)",
|
||||
"returnType": "void",
|
||||
"params": [
|
||||
{
|
||||
"type": "Model",
|
||||
"name": "model"
|
||||
},
|
||||
{
|
||||
"type": "ModelAnimation",
|
||||
"name": "anim"
|
||||
},
|
||||
{
|
||||
"type": "int",
|
||||
"name": "frame"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "UpdateModelAnimationBoneMatrices",
|
||||
"description": "Update model animation mesh bone matrices (GPU skinning)",
|
||||
"returnType": "void",
|
||||
"params": [
|
||||
{
|
||||
@ -11127,25 +11146,6 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "UpdateModelAnimationBoneMatrices",
|
||||
"description": "Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)",
|
||||
"returnType": "void",
|
||||
"params": [
|
||||
{
|
||||
"type": "Model",
|
||||
"name": "model"
|
||||
},
|
||||
{
|
||||
"type": "ModelAnimation",
|
||||
"name": "anim"
|
||||
},
|
||||
{
|
||||
"type": "int",
|
||||
"name": "frame"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "CheckCollisionSpheres",
|
||||
"description": "Check collision between two spheres",
|
||||
|
@ -7598,7 +7598,17 @@ return {
|
||||
},
|
||||
{
|
||||
name = "UpdateModelAnimation",
|
||||
description = "Update model animation pose",
|
||||
description = "Update model animation pose (CPU)",
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Model", name = "model"},
|
||||
{type = "ModelAnimation", name = "anim"},
|
||||
{type = "int", name = "frame"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "UpdateModelAnimationBoneMatrices",
|
||||
description = "Update model animation mesh bone matrices (GPU skinning)",
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Model", name = "model"},
|
||||
@ -7632,16 +7642,6 @@ return {
|
||||
{type = "ModelAnimation", name = "anim"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "UpdateModelAnimationBoneMatrices",
|
||||
description = "Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)",
|
||||
returnType = "void",
|
||||
params = {
|
||||
{type = "Model", name = "model"},
|
||||
{type = "ModelAnimation", name = "anim"},
|
||||
{type = "int", name = "frame"}
|
||||
}
|
||||
},
|
||||
{
|
||||
name = "CheckCollisionSpheres",
|
||||
description = "Check collision between two spheres",
|
||||
|
@ -4217,34 +4217,34 @@ Function 501: LoadModelAnimations() (2 input parameters)
|
||||
Function 502: UpdateModelAnimation() (3 input parameters)
|
||||
Name: UpdateModelAnimation
|
||||
Return type: void
|
||||
Description: Update model animation pose
|
||||
Description: Update model animation pose (CPU)
|
||||
Param[1]: model (type: Model)
|
||||
Param[2]: anim (type: ModelAnimation)
|
||||
Param[3]: frame (type: int)
|
||||
Function 503: UnloadModelAnimation() (1 input parameters)
|
||||
Function 503: UpdateModelAnimationBoneMatrices() (3 input parameters)
|
||||
Name: UpdateModelAnimationBoneMatrices
|
||||
Return type: void
|
||||
Description: Update model animation mesh bone matrices (GPU skinning)
|
||||
Param[1]: model (type: Model)
|
||||
Param[2]: anim (type: ModelAnimation)
|
||||
Param[3]: frame (type: int)
|
||||
Function 504: UnloadModelAnimation() (1 input parameters)
|
||||
Name: UnloadModelAnimation
|
||||
Return type: void
|
||||
Description: Unload animation data
|
||||
Param[1]: anim (type: ModelAnimation)
|
||||
Function 504: UnloadModelAnimations() (2 input parameters)
|
||||
Function 505: UnloadModelAnimations() (2 input parameters)
|
||||
Name: UnloadModelAnimations
|
||||
Return type: void
|
||||
Description: Unload animation array data
|
||||
Param[1]: animations (type: ModelAnimation *)
|
||||
Param[2]: animCount (type: int)
|
||||
Function 505: IsModelAnimationValid() (2 input parameters)
|
||||
Function 506: IsModelAnimationValid() (2 input parameters)
|
||||
Name: IsModelAnimationValid
|
||||
Return type: bool
|
||||
Description: Check model animation skeleton match
|
||||
Param[1]: model (type: Model)
|
||||
Param[2]: anim (type: ModelAnimation)
|
||||
Function 506: UpdateModelAnimationBoneMatrices() (3 input parameters)
|
||||
Name: UpdateModelAnimationBoneMatrices
|
||||
Return type: void
|
||||
Description: Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)
|
||||
Param[1]: model (type: Model)
|
||||
Param[2]: anim (type: ModelAnimation)
|
||||
Param[3]: frame (type: int)
|
||||
Function 507: CheckCollisionSpheres() (4 input parameters)
|
||||
Name: CheckCollisionSpheres
|
||||
Return type: bool
|
||||
|
@ -2821,7 +2821,12 @@
|
||||
<Param type="const char *" name="fileName" desc="" />
|
||||
<Param type="int *" name="animCount" desc="" />
|
||||
</Function>
|
||||
<Function name="UpdateModelAnimation" retType="void" paramCount="3" desc="Update model animation pose">
|
||||
<Function name="UpdateModelAnimation" retType="void" paramCount="3" desc="Update model animation pose (CPU)">
|
||||
<Param type="Model" name="model" desc="" />
|
||||
<Param type="ModelAnimation" name="anim" desc="" />
|
||||
<Param type="int" name="frame" desc="" />
|
||||
</Function>
|
||||
<Function name="UpdateModelAnimationBoneMatrices" retType="void" paramCount="3" desc="Update model animation mesh bone matrices (GPU skinning)">
|
||||
<Param type="Model" name="model" desc="" />
|
||||
<Param type="ModelAnimation" name="anim" desc="" />
|
||||
<Param type="int" name="frame" desc="" />
|
||||
@ -2837,11 +2842,6 @@
|
||||
<Param type="Model" name="model" desc="" />
|
||||
<Param type="ModelAnimation" name="anim" desc="" />
|
||||
</Function>
|
||||
<Function name="UpdateModelAnimationBoneMatrices" retType="void" paramCount="3" desc="Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)">
|
||||
<Param type="Model" name="model" desc="" />
|
||||
<Param type="ModelAnimation" name="anim" desc="" />
|
||||
<Param type="int" name="frame" desc="" />
|
||||
</Function>
|
||||
<Function name="CheckCollisionSpheres" retType="bool" paramCount="4" desc="Check collision between two spheres">
|
||||
<Param type="Vector3" name="center1" desc="" />
|
||||
<Param type="float" name="radius1" desc="" />
|
||||
|
Loading…
Reference in New Issue
Block a user