summaryrefslogtreecommitdiffhomepage
path: root/src/models.c
diff options
context:
space:
mode:
authorRay <[email protected]>2020-02-03 19:13:24 +0100
committerRay <[email protected]>2020-02-03 19:13:24 +0100
commitcde26c743c382abea56ea5cd9c88d36970a61eea (patch)
tree0b54c78c5fa8f5f4b2c99778cd6dc228b512e0ca /src/models.c
parent40b73a8a91afb26becfcb39560dae73447ce15af (diff)
downloadraylib-cde26c743c382abea56ea5cd9c88d36970a61eea.tar.gz
raylib-cde26c743c382abea56ea5cd9c88d36970a61eea.zip
Replace TraceLog() function by TRACELOG macro
Added SUPPORT_TRACELOG_DEBUG config
Diffstat (limited to 'src/models.c')
-rw-r--r--src/models.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/models.c b/src/models.c
index 93fc2330..953e1f62 100644
--- a/src/models.c
+++ b/src/models.c
@@ -667,10 +667,10 @@ Model LoadModel(const char *fileName)
model.meshCount = 1;
model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh));
#if defined(SUPPORT_MESH_GENERATION)
- TraceLog(LOG_WARNING, "[%s] No meshes can be loaded, default to cube mesh", fileName);
+ TRACELOG(LOG_WARNING, "[%s] No meshes can be loaded, default to cube mesh", fileName);
model.meshes[0] = GenMeshCube(1.0f, 1.0f, 1.0f);
#else
- TraceLog(LOG_WARNING, "[%s] No meshes can be loaded, and can't create a default mesh. The raylib mesh generation is not supported (SUPPORT_MESH_GENERATION).", fileName);
+ TRACELOG(LOG_WARNING, "[%s] No meshes can be loaded, and can't create a default mesh. The raylib mesh generation is not supported (SUPPORT_MESH_GENERATION).", fileName);
#endif
}
else
@@ -681,7 +681,7 @@ Model LoadModel(const char *fileName)
if (model.materialCount == 0)
{
- TraceLog(LOG_WARNING, "[%s] No materials can be loaded, default to white material", fileName);
+ TRACELOG(LOG_WARNING, "[%s] No materials can be loaded, default to white material", fileName);
model.materialCount = 1;
model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material));
@@ -735,7 +735,7 @@ void UnloadModel(Model model)
RL_FREE(model.bones);
RL_FREE(model.bindPose);
- TraceLog(LOG_INFO, "Unloaded model data from RAM and VRAM");
+ TRACELOG(LOG_INFO, "Unloaded model data from RAM and VRAM");
}
// Load meshes from model file
@@ -809,8 +809,8 @@ void ExportMesh(Mesh mesh, const char *fileName)
}
else if (IsFileExtension(fileName, ".raw")) { } // TODO: Support additional file formats to export mesh vertex data
- if (success) TraceLog(LOG_INFO, "Mesh exported successfully: %s", fileName);
- else TraceLog(LOG_WARNING, "Mesh could not be exported.");
+ if (success) TRACELOG(LOG_INFO, "Mesh exported successfully: %s", fileName);
+ else TRACELOG(LOG_WARNING, "Mesh could not be exported.");
}
// Load materials from model file
@@ -828,7 +828,7 @@ Material *LoadMaterials(const char *fileName, int *materialCount)
int result = tinyobj_parse_mtl_file(&mats, &count, fileName);
if (result != TINYOBJ_SUCCESS) {
- TraceLog(LOG_WARNING, "[%s] Could not parse Materials file", fileName);
+ TRACELOG(LOG_WARNING, "[%s] Could not parse Materials file", fileName);
}
// TODO: Process materials to return
@@ -836,7 +836,7 @@ Material *LoadMaterials(const char *fileName, int *materialCount)
tinyobj_materials_free(mats, count);
}
#else
- TraceLog(LOG_WARNING, "[%s] Materials file not supported", fileName);
+ TRACELOG(LOG_WARNING, "[%s] Materials file not supported", fileName);
#endif
// Set materials shader to default (DIFFUSE, SPECULAR, NORMAL)
@@ -888,8 +888,8 @@ void SetMaterialTexture(Material *material, int mapType, Texture2D texture)
// Set the material for a mesh
void SetModelMeshMaterial(Model *model, int meshId, int materialId)
{
- if (meshId >= model->meshCount) TraceLog(LOG_WARNING, "Mesh id greater than mesh count");
- else if (materialId >= model->materialCount) TraceLog(LOG_WARNING,"Material id greater than material count");
+ if (meshId >= model->meshCount) TRACELOG(LOG_WARNING, "Mesh id greater than mesh count");
+ else if (materialId >= model->materialCount) TRACELOG(LOG_WARNING,"Material id greater than material count");
else model->meshMaterial[meshId] = materialId;
}
@@ -937,7 +937,7 @@ ModelAnimation *LoadModelAnimations(const char *filename, int *animCount)
if (!iqmFile)
{
- TraceLog(LOG_ERROR, "[%s] Unable to open file", filename);
+ TRACELOG(LOG_ERROR, "[%s] Unable to open file", filename);
}
// Read IQM header
@@ -945,7 +945,7 @@ ModelAnimation *LoadModelAnimations(const char *filename, int *animCount)
if (strncmp(iqm.magic, IQM_MAGIC, sizeof(IQM_MAGIC)))
{
- TraceLog(LOG_ERROR, "Magic Number \"%s\"does not match.", iqm.magic);
+ TRACELOG(LOG_ERROR, "Magic Number \"%s\"does not match.", iqm.magic);
fclose(iqmFile);
return NULL;
@@ -953,7 +953,7 @@ ModelAnimation *LoadModelAnimations(const char *filename, int *animCount)
if (iqm.version != IQM_VERSION)
{
- TraceLog(LOG_ERROR, "IQM version %i is incorrect.", iqm.version);
+ TRACELOG(LOG_ERROR, "IQM version %i is incorrect.", iqm.version);
fclose(iqmFile);
return NULL;
@@ -2292,7 +2292,7 @@ BoundingBox MeshBoundingBox(Mesh mesh)
void MeshTangents(Mesh *mesh)
{
if (mesh->tangents == NULL) mesh->tangents = (float *)RL_MALLOC(mesh->vertexCount*4*sizeof(float));
- else TraceLog(LOG_WARNING, "Mesh tangents already exist");
+ else TRACELOG(LOG_WARNING, "Mesh tangents already exist");
Vector3 *tan1 = (Vector3 *)RL_MALLOC(mesh->vertexCount*sizeof(Vector3));
Vector3 *tan2 = (Vector3 *)RL_MALLOC(mesh->vertexCount*sizeof(Vector3));
@@ -2365,7 +2365,7 @@ void MeshTangents(Mesh *mesh)
// Load a new tangent attributes buffer
mesh->vboId[LOC_VERTEX_TANGENT] = rlLoadAttribBuffer(mesh->vaoId, LOC_VERTEX_TANGENT, mesh->tangents, mesh->vertexCount*4*sizeof(float), false);
- TraceLog(LOG_INFO, "Tangents computed for mesh");
+ TRACELOG(LOG_INFO, "Tangents computed for mesh");
}
// Compute mesh binormals (aka bitangent)
@@ -2817,8 +2817,8 @@ static Model LoadOBJ(const char *fileName)
unsigned int flags = TINYOBJ_FLAG_TRIANGULATE;
int ret = tinyobj_parse_obj(&attrib, &meshes, &meshCount, &materials, &materialCount, data, dataLength, flags);
- if (ret != TINYOBJ_SUCCESS) TraceLog(LOG_WARNING, "[%s] Model data could not be loaded", fileName);
- else TraceLog(LOG_INFO, "[%s] Model data loaded successfully: %i meshes / %i materials", fileName, meshCount, materialCount);
+ if (ret != TINYOBJ_SUCCESS) TRACELOG(LOG_WARNING, "[%s] Model data could not be loaded", fileName);
+ else TRACELOG(LOG_INFO, "[%s] Model data loaded successfully: %i meshes / %i materials", fileName, meshCount, materialCount);
// Init model meshes array
// TODO: Support multiple meshes... in the meantime, only one mesh is returned
@@ -2868,7 +2868,7 @@ static Model LoadOBJ(const char *fileName)
tinyobj_vertex_index_t idx1 = attrib.faces[3*f + 1];
tinyobj_vertex_index_t idx2 = attrib.faces[3*f + 2];
- // TraceLog(LOG_DEBUG, "Face %i index: v %i/%i/%i . vt %i/%i/%i . vn %i/%i/%i\n", f, idx0.v_idx, idx1.v_idx, idx2.v_idx, idx0.vt_idx, idx1.vt_idx, idx2.vt_idx, idx0.vn_idx, idx1.vn_idx, idx2.vn_idx);
+ // TRACELOGD("Face %i index: v %i/%i/%i . vt %i/%i/%i . vn %i/%i/%i\n", f, idx0.v_idx, idx1.v_idx, idx2.v_idx, idx0.vt_idx, idx1.vt_idx, idx2.vt_idx, idx0.vn_idx, idx1.vn_idx, idx2.vn_idx);
// Fill vertices buffer (float) using vertex index of the face
for (int v = 0; v < 3; v++) { mesh.vertices[vCount + v] = attrib.vertices[idx0.v_idx*3 + v]; } vCount +=3;
@@ -2960,7 +2960,7 @@ static Model LoadOBJ(const char *fileName)
}
// NOTE: At this point we have all model data loaded
- TraceLog(LOG_INFO, "[%s] Model loaded successfully in RAM (CPU)", fileName);
+ TRACELOG(LOG_INFO, "[%s] Model loaded successfully in RAM (CPU)", fileName);
return model;
}
@@ -3079,7 +3079,7 @@ static Model LoadIQM(const char *fileName)
if (iqmFile == NULL)
{
- TraceLog(LOG_WARNING, "[%s] IQM file could not be opened", fileName);
+ TRACELOG(LOG_WARNING, "[%s] IQM file could not be opened", fileName);
return model;
}
@@ -3087,14 +3087,14 @@ static Model LoadIQM(const char *fileName)
if (strncmp(iqm.magic, IQM_MAGIC, sizeof(IQM_MAGIC)))
{
- TraceLog(LOG_WARNING, "[%s] IQM file does not seem to be valid", fileName);
+ TRACELOG(LOG_WARNING, "[%s] IQM file does not seem to be valid", fileName);
fclose(iqmFile);
return model;
}
if (iqm.version != IQM_VERSION)
{
- TraceLog(LOG_WARNING, "[%s] IQM file version is not supported (%i).", fileName, iqm.version);
+ TRACELOG(LOG_WARNING, "[%s] IQM file version is not supported (%i).", fileName, iqm.version);
fclose(iqmFile);
return model;
}
@@ -3396,7 +3396,7 @@ static Texture LoadTextureFromCgltfImage(cgltf_image *image, const char *texPath
int i = 0;
while ((image->uri[i] != ',') && (image->uri[i] != 0)) i++;
- if (image->uri[i] == 0) TraceLog(LOG_WARNING, "CGLTF Image: Invalid data URI");
+ if (image->uri[i] == 0) TRACELOG(LOG_WARNING, "CGLTF Image: Invalid data URI");
else
{
int size;
@@ -3498,7 +3498,7 @@ static Model LoadGLTF(const char *fileName)
if (gltfFile == NULL)
{
- TraceLog(LOG_WARNING, "[%s] glTF file could not be opened", fileName);
+ TRACELOG(LOG_WARNING, "[%s] glTF file could not be opened", fileName);
return model;
}
@@ -3518,11 +3518,11 @@ static Model LoadGLTF(const char *fileName)
if (result == cgltf_result_success)
{
- TraceLog(LOG_INFO, "[%s][%s] Model meshes/materials: %i/%i", fileName, (data->file_type == 2)? "glb" : "gltf", data->meshes_count, data->materials_count);
+ TRACELOG(LOG_INFO, "[%s][%s] Model meshes/materials: %i/%i", fileName, (data->file_type == 2)? "glb" : "gltf", data->meshes_count, data->materials_count);
// Read data buffers
result = cgltf_load_buffers(&options, data, fileName);
- if (result != cgltf_result_success) TraceLog(LOG_INFO, "[%s][%s] Error loading mesh/material buffers", fileName, (data->file_type == 2)? "glb" : "gltf");
+ if (result != cgltf_result_success) TRACELOG(LOG_INFO, "[%s][%s] Error loading mesh/material buffers", fileName, (data->file_type == 2)? "glb" : "gltf");
int primitivesCount = 0;
@@ -3625,7 +3625,7 @@ static Model LoadGLTF(const char *fileName)
else
{
// TODO: Support normalized unsigned byte/unsigned short texture coordinates
- TraceLog(LOG_WARNING, "[%s] Texture coordinates must be float", fileName);
+ TRACELOG(LOG_WARNING, "[%s] Texture coordinates must be float", fileName);
}
}
}
@@ -3643,7 +3643,7 @@ static Model LoadGLTF(const char *fileName)
else
{
// TODO: Support unsigned byte/unsigned int
- TraceLog(LOG_WARNING, "[%s] Indices must be unsigned short", fileName);
+ TRACELOG(LOG_WARNING, "[%s] Indices must be unsigned short", fileName);
}
}
else
@@ -3668,7 +3668,7 @@ static Model LoadGLTF(const char *fileName)
cgltf_free(data);
}
- else TraceLog(LOG_WARNING, "[%s] glTF data could not be loaded", fileName);
+ else TRACELOG(LOG_WARNING, "[%s] glTF data could not be loaded", fileName);
RL_FREE(buffer);