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

resolved conflict

Browse Source
This commit is contained in:
Max Limper
2016-10-02 11:55:23 +02:00
parent 782adb7b0a 29ba85a7f0
commit a6da330b41
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,7 +447,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
nCurrentTexcoords = 0, nCurrentTexcoords = 0,
nCurrentNormals = 0; nCurrentNormals = 0;
// pass 2: read vertices // pass 2: read faces
while( _in && !_in.eof() ) while( _in && !_in.eof() )
{ {
std::getline(_in,line); std::getline(_in,line);
@@ -616,8 +616,14 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// 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));
faceVertices.push_back(VertexHandle(value-1)); faceVertices.push_back(VertexHandle(value-1));
if (fileOptions.vertex_has_color() ) if (fileOptions.vertex_has_color()) {
if ((unsigned int)(value - 1) < colors.size()) {
_bi.set_color(vhandles.back(), colors[value - 1]); _bi.set_color(vhandles.back(), colors[value - 1]);
}
else {
omerr() << "Error setting vertex color" << std::endl;
}
}
break; break;
case 1: // texture coord case 1: // texture coord
@@ -668,9 +674,13 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// 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
if (fileOptions.vertex_has_normal() ) { if (fileOptions.vertex_has_normal() ) {
assert(!vhandles.empty()); assert(!vhandles.empty());
assert((unsigned int)(value-1) < normals.size()); if ((unsigned int)(value - 1) < normals.size()) {
_bi.set_normal(vhandles.back(), normals[value - 1]); _bi.set_normal(vhandles.back(), normals[value - 1]);
} }
else {
omerr() << "Error setting vertex normal" << std::endl;
}
}
break; break;
} }