organicmaps/fast_obj
13
Fork 0
mirror of https://github.com/thisistherk/fast_obj.git synced 2025-04-05 05:25:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge 52e8b8226c into 9884aa86b0

Browse source
This commit is contained in:
sneakyevil 2025-01-01 22:40:02 -05:00 • committed by GitHub
commit e120d61a97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fast_obj.h
View file

@ -1004,6 +1004,23 @@ const char* read_map(fastObjData* data, const char* ptr, unsigned int* idx)
ptr = skip_name(ptr);
e = ptr;
/* Find any separator in the name */
const char* sep = 0;
for (const char* p = s; p != e; ++p)
{
if (*p == FAST_OBJ_SEPARATOR || *p == FAST_OBJ_OTHER_SEP) {
sep = p;
}
}
/* Set path if separator found in the name */
const char* path = 0;
if (sep)
{
path = s;
s = &sep[1];
}
/* Try to find an existing texture map with the same name */
*idx = 1; /* skip dummy at index 0 */
while (*idx < array_size(data->mesh->textures))
@ -1020,7 +1037,13 @@ const char* read_map(fastObjData* data, const char* ptr, unsigned int* idx)
{
fastObjTexture new_map = map_default();
new_map.name = string_copy(s, e);
new_map.path = string_concat(data->base, s, e);
if (path) {
new_map.path = string_copy(path, e);
}
else {
new_map.path = string_concat(data->base, s, e);
}
string_fix_separators(new_map.path);
array_push(data->mesh->textures, new_map);
}