Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix texture map name & path #48

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix texture map name & path #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83f6ea0
add fix
sneakyevil Sep 29, 2024
52e8b82
Small if check change.
sneakyevil Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion fast_obj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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);
}
Expand Down