Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed handling of negative indices in OBJ loader

Browse Source
This commit is contained in:
Max Limper
2016-10-01 20:31:16 +02:00
parent 8b7be54eb6
commit 782adb7b0a
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/OpenMesh/Core/IO/reader/OBJReader.cc
View File

@@ -443,6 +443,10 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
_in.clear(); _in.clear();
_in.seekg(0, std::ios::beg); _in.seekg(0, std::ios::beg);
int nCurrentPositions = 0,
nCurrentTexcoords = 0,
nCurrentNormals = 0;
// pass 2: read vertices // pass 2: read vertices
while( _in && !_in.eof() ) while( _in && !_in.eof() )
{ {
@@ -512,6 +516,21 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
matname=""; matname="";
} }
} }
// track current number of parsed vertex attributes,
// to allow for OBJs negative indices
else if (keyWrd == "v")
{
++nCurrentPositions;
}
else if (keyWrd == "vt")
{
++nCurrentTexcoords;
}
else if (keyWrd == "vn")
{
++nCurrentNormals;
}
// faces // faces
else if (keyWrd == "f") else if (keyWrd == "f")
@@ -592,7 +611,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// Calculation of index : // Calculation of index :
// -1 is the last vertex in the list // -1 is the last vertex in the list
// As obj counts from 1 and not zero add +1 // As obj counts from 1 and not zero add +1
value = int(_bi.n_vertices() + value + 1); value = nCurrentPositions + value + 1;
} }
// Obj counts from 1 and not zero .. array counts from zero therefore -1 // Obj counts from 1 and not zero .. array counts from zero therefore -1
vhandles.push_back(VertexHandle(value-1)); vhandles.push_back(VertexHandle(value-1));
@@ -606,7 +625,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// Calculation of index : // Calculation of index :
// -1 is the last vertex in the list // -1 is the last vertex in the list
// As obj counts from 1 and not zero add +1 // As obj counts from 1 and not zero add +1
value = int(texcoords.size()) + value + 1; value = nCurrentTexcoords + value + 1;
} }
assert(!vhandles.empty()); assert(!vhandles.empty());
@@ -643,7 +662,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// Calculation of index : // Calculation of index :
// -1 is the last vertex in the list // -1 is the last vertex in the list
// As obj counts from 1 and not zero add +1 // As obj counts from 1 and not zero add +1
value = int(normals.size()) + value + 1; value = nCurrentNormals + value + 1;
} }
// Obj counts from 1 and not zero .. array counts from zero therefore -1 // Obj counts from 1 and not zero .. array counts from zero therefore -1