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

Simplify reader

Browse Source
This commit is contained in:
Jan Möbius
2016-01-06 14:26:06 +01:00
parent 781063a3c6
commit 13904a1516
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,24 +406,19 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
stream >> u; stream >> v; stream >> u; stream >> v;
if ( !stream.fail() ){ if ( !stream.fail() ){
if ( userOptions.vertex_has_texcoord() || userOptions.face_has_texcoord() ) { if ( userOptions.vertex_has_texcoord() || userOptions.face_has_texcoord() ) {
texcoords.push_back(OpenMesh::Vec2f(u, v)); texcoords.push_back(OpenMesh::Vec2f(u, v));
// Can be used for both! // Can be used for both!
fileOptions += Options::VertexTexCoord; fileOptions += Options::VertexTexCoord;
fileOptions += Options::FaceTexCoord; fileOptions += Options::FaceTexCoord;
}
//try to read the w component as it is optional // try to read the w component as it is optional
stream >> w; stream >> w;
if ( !stream.fail() ){ if ( !stream.fail() )
if ( userOptions.vertex_has_texcoord() || userOptions.face_has_texcoord() ) { texcoords3d.push_back(OpenMesh::Vec3f(u, v, w));
texcoords3d.push_back(OpenMesh::Vec3f(u, v, w));
// Can be used for both!
fileOptions += Options::VertexTexCoord;
fileOptions += Options::FaceTexCoord;
}
} }
}else{ }else{