diff options
| author | raysan5 <[email protected]> | 2020-05-09 12:05:08 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-05-09 12:05:08 +0200 |
| commit | cb3bdf09c64f7c6d77c5728814aa144b225b77ec (patch) | |
| tree | af78d9e9ddb62bb4d32ded3ff7f4fde19d1776c1 /src/models.c | |
| parent | 959447d8ed69e63b279bc5b72354c9d14a266e8f (diff) | |
| parent | 2d1cbe3cb392fe76948b7bbe61cee257a3fa2066 (diff) | |
| download | raylib-cb3bdf09c64f7c6d77c5728814aa144b225b77ec.tar.gz raylib-cb3bdf09c64f7c6d77c5728814aa144b225b77ec.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib
Diffstat (limited to 'src/models.c')
| -rw-r--r-- | src/models.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/models.c b/src/models.c index 00d3b516..482c647b 100644 --- a/src/models.c +++ b/src/models.c @@ -3050,6 +3050,7 @@ static Model LoadIQM(const char *fileName) #define BONE_NAME_LENGTH 32 // BoneInfo name string length #define MESH_NAME_LENGTH 32 // Mesh name string length + #define MATERIAL_NAME_LENGTH 32 // Material name string length // IQM file structs //----------------------------------------------------------------------------------- @@ -3182,12 +3183,25 @@ static Model LoadIQM(const char *fileName) model.meshCount = iqm.num_meshes; model.meshes = RL_CALLOC(model.meshCount, sizeof(Mesh)); + model.materialCount = model.meshCount; + model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material)); + model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); + char name[MESH_NAME_LENGTH] = { 0 }; + char material[MATERIAL_NAME_LENGTH] = { 0 }; for (int i = 0; i < model.meshCount; i++) { fseek(iqmFile, iqm.ofs_text + imesh[i].name, SEEK_SET); - fread(name, sizeof(char)*MESH_NAME_LENGTH, 1, iqmFile); // Mesh name not used... + fread(name, sizeof(char)*MESH_NAME_LENGTH, 1, iqmFile); + + fseek(iqmFile, iqm.ofs_text + imesh[i].material, SEEK_SET); + fread(material, sizeof(char)*MATERIAL_NAME_LENGTH, 1, iqmFile); + + model.materials[i] = LoadMaterialDefault(); + + TRACELOG(LOG_DEBUG, "MODEL: [%s] mesh name (%s), material (%s)", fileName, name, material); + model.meshes[i].vertexCount = imesh[i].num_vertexes; model.meshes[i].vertices = RL_CALLOC(model.meshes[i].vertexCount*3, sizeof(float)); // Default vertex positions |