mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-20 10:18:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

REVIEWED: Data types validation

Browse Source
This commit is contained in:
Ray
2023-03-07 20:33:45 +01:00
parent 15716e59dc
commit ab1e246367
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rmodels.c
View File

@@ -1112,7 +1112,13 @@ Model LoadModelFromMesh(Mesh mesh)
// Check if a model is ready
bool IsModelReady(Model model)
{
return model.meshes != NULL && model.materials != NULL && model.meshMaterial != NULL && model.meshCount > 0 && model.materialCount > 0;
return ((model.meshes != NULL) && // Validate model contains some mesh
(model.materials != NULL) && // Validate model contains some material (at least default one)
(model.meshMaterial != NULL) && // Validate mesh-material linkage
(model.meshCount > 0) && // Validate mesh count
(model.materialCount > 0)); // Validate material count
// NOTE: This is a very general model validation, many elements could be validated from a model...
}
// Unload model (meshes/materials) from memory (RAM and/or VRAM)
@@ -1959,7 +1965,8 @@ Material LoadMaterialDefault(void)
// Check if a material is ready
bool IsMaterialReady(Material material)
{
return material.maps != NULL;
return ((material.maps != NULL) && // Validate material contain some map
(material.shader.id > 0)); // Validate material shader is valid
}
// Unload material from memory