lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix windows path normalizing for referenced textures;

This commit is contained in:
bjorn 2017-11-25 13:42:55 -08:00
parent a9c53372ad
commit 7c64bac1c6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/loaders/model.c
View File

@ -50,7 +50,10 @@ static void assimpNodeTraversal(ModelData* modelData, struct aiNode* assimpNode,
}
}
static void normalizePath(const char* path, char* dst, size_t size) {
static void normalizePath(char* path, char* dst, size_t size) {
char* slash = path;
while ((slash = strchr(path, '\\')) != NULL) { *slash++ = '/'; }
if (path[0] == '/') {
strncpy(dst, path, size);
return;
@ -145,10 +148,12 @@ static struct aiFile* assimpFileOpen(struct aiFileIO* io, const char* path, cons
assimpFile->TellProc = assimpBlobTell;
assimpFile->UserData = (void*) blob;
} else {
char tempPath[LOVR_PATH_MAX];
char normalizedPath[LOVR_PATH_MAX];
normalizePath(path, normalizedPath, LOVR_PATH_MAX);
strncpy(tempPath, path, LOVR_PATH_MAX);
normalizePath(tempPath, normalizedPath, LOVR_PATH_MAX);
File* file = lovrFileCreate(path);
File* file = lovrFileCreate(normalizedPath);
if (lovrFileOpen(file, OPEN_READ)) {
return NULL;
}