RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91 from Foxar/develop

Browse Source 
Fixed loading erros in .obj loader when loading models without UVMap or Normals.
This commit is contained in:
Sandro Sobczyński
2021-04-19 11:35:06 +02:00
committed by GitHub
parent 589b3b03a4 b0ae873a88
commit 7b43c0c90f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/loaders/obj_loader.cpp
+6 -4
View File
@@ -76,7 +76,6 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", x, x, x, x, x, x, x, x, x); int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", x, x, x, x, x, x, x, x, x);
fsetpos(file, &start); fsetpos(file, &start);
int newerMatches = 0; int newerMatches = 0;
switch (matches) switch (matches)
{ {
/** Vs, VTs and VNs all set */ /** Vs, VTs and VNs all set */
@@ -89,7 +88,7 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
} }
break; break;
/** Loaded only two digits (V, VT) succesfuly. Not setting VN. */ /** Loaded only two digits (V, VT) succesfuly. Not setting VN. */
case 2: case 3:
{ {
fscanf(file, "%d/%d/ %d/%d/ %d/%d/\n", fscanf(file, "%d/%d/ %d/%d/ %d/%d/\n",
&vertexIndex[0], &coordIndex[0], &vertexIndex[0], &coordIndex[0],
@@ -101,12 +100,12 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
case 1: case 1:
{ {
/** Check for existance of V/// configuration.. */ /** Check for existance of V/// configuration.. */
newerMatches = fscanf(file, "%d/// %d/// %d///\n", x, x, x); newerMatches = fscanf(file, "%d// %d// %d//\n", x, x, x);
fsetpos(file, &start); fsetpos(file, &start);
if (newerMatches == 3) if (newerMatches == 3)
{ {
/** Configuration confirmed. */ /** Configuration confirmed. */
fscanf(file, "%d/// %d/// %d///\n", &vertexIndex[0], &vertexIndex[1], &vertexIndex[2]); fscanf(file, "%d// %d// %d//\n", &vertexIndex[0], &vertexIndex[1], &vertexIndex[2]);
} }
else else
{ {
@@ -129,10 +128,13 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
} }
break; break;
} }
break;
default: default:
{
PRINT_ERR("Unknown faces format in .obj file!"); PRINT_ERR("Unknown faces format in .obj file!");
break; break;
} }
}
if (matches == 9 || matches == 2 || matches == 1) if (matches == 9 || matches == 2 || matches == 1)
{ {