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

Merge pull request #4 from zeux/master

Browse source 
Preserve texture name from .mtl as is
This commit is contained in:
Richard Knight 2019-06-02 09:06:12 +01:00 • committed by GitHub
commit c4c468f9db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fast_obj.h
View file

@ -30,9 +30,12 @@
typedef struct
{
/* Path to texture */
/* Texture name from .mtl file */
char* name;
/* Resolved path to texture */
char* path;
} fastObjTexture;
@ -725,6 +728,7 @@ fastObjTexture map_default(void)
fastObjTexture map;
map.name = 0;
map.path = 0;
return map;
}
@ -822,6 +826,7 @@ static
void map_clean(fastObjTexture* map)
{
memory_dealloc(map->name);
memory_dealloc(map->path);
}
@ -873,6 +878,7 @@ const char* read_map(fastObjData* data, const char* ptr, fastObjTexture* map)
const char* s;
const char* e;
char* name;
char* path;
ptr = skip_whitespace(ptr);
@ -888,10 +894,13 @@ const char* read_map(fastObjData* data, const char* ptr, fastObjTexture* map)
e = ptr;
name = string_concat(data->base, s, e);
string_fix_separators(name);
name = string_copy(s, e);
path = string_concat(data->base, s, e);
string_fix_separators(path);
map->name = name;
map->path = path;
return e;
}