sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility/OBJParser: Abort parsing when there's more than one error per two line

Browse Source 
Former-commit-id: 5b4cad994aa57293e8099c006619d3fb0c7429b1 [formerly 79c2ce8fe15176f91d2078866798ddd6f78ce044]
Former-commit-id: 12e75819f8d65b980199a803f0f8138061ea644d
This commit is contained in:
Lynix
2016-07-29 13:37:44 +02:00
parent 44bec7f44b
commit df828cd0df
3 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Utility/Formats/OBJParser.hpp
View File

@@ -86,7 +86,7 @@ namespace Nz
inline void Error(const String& message);
inline void Flush() const;
inline void Warning(const String& message);
inline void UnrecognizedLine(bool error = false);
inline bool UnrecognizedLine(bool error = false);
std::vector<Mesh> m_meshes;
std::vector<String> m_materials;
@@ -99,6 +99,7 @@ namespace Nz
mutable StringStream m_outputStream;
bool m_keepLastLine;
unsigned int m_lineCount;
unsigned int m_errorCount;
};
}

12
include/Nazara/Utility/Formats/OBJParser.inl
View File

@@ -168,7 +168,7 @@ namespace Nz
NazaraWarning(message + " at line #" + String::Number(m_lineCount));
}
inline void OBJParser::UnrecognizedLine(bool error)
inline bool OBJParser::UnrecognizedLine(bool error)
{
String message = "Unrecognized \"" + m_currentLine + '"';
@@ -176,6 +176,16 @@ namespace Nz
Error(message);
else
Warning(message);
m_errorCount++;
if (m_lineCount > 20 && (m_errorCount * 100 / m_lineCount) > 50)
{
NazaraError("Aborting parsing because of error percentage");
return false; //< Abort parsing if error percentage is too high
}
return true;
}
}