Commit 00d533c2 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'ply_reader_omerr_fix' into 'master'

don't emit an error message for every face that could not be added (due to complex elements)



See merge request !55
parents 17217c40 1c85080a
Pipeline #1292 passed with stage
......@@ -17,6 +17,7 @@
<b>IO</b>
<ul>
<li>Obj reader: added texCoord3d functions to objloader</li>
<li>PLY Reader: Don't emit warning for every complex face but warn only once in the end.</li>
<li>Importer: Integrate non-manifold faces while importing and not at the end. Fixes missing properties on non-manifolds. (Thanks to Max Limper for the patch, Merge Request 51)<li>
</ul>
......
......@@ -304,6 +304,11 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
return false;
}
const bool err_enabled = omerr().is_enabled();
size_t complex_faces = 0;
if (err_enabled)
omerr().disable();
// read vertices:
for (i = 0; i < vertexCount_ && !_in.eof(); ++i) {
vh = _bi.add_vertex();
......@@ -432,6 +437,8 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
}
fh = _bi.add_face(vhandles);
if (!fh.is_valid())
++complex_faces;
break;
case CUSTOM_PROP:
......@@ -449,6 +456,12 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
}
if (err_enabled)
omerr().enable();
if (complex_faces)
omerr() << complex_faces << "The reader encountered invalid faces, that could not be added.\n";
// File was successfully parsed.
return true;
}
......@@ -472,6 +485,11 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
_bi.reserve(vertexCount_, 3* vertexCount_ , faceCount_);
const bool err_enabled = omerr().is_enabled();
size_t complex_faces = 0;
if (err_enabled)
omerr().disable();
// read vertices:
for (unsigned int i = 0; i < vertexCount_ && !_in.eof(); ++i) {
vh = _bi.add_vertex();
......@@ -610,6 +628,8 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
}
fh = _bi.add_face(vhandles);
if (!fh.is_valid())
++complex_faces;
break;
case CUSTOM_PROP:
......@@ -626,6 +646,13 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
}
}
if (err_enabled)
omerr().enable();
if (complex_faces)
omerr() << complex_faces << "The reader encountered invalid faces, that could not be added.\n";
return true;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment