Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks

Browse Source
This commit is contained in:
Kim Kulling
2017-05-31 20:18:39 +02:00
parent 813f3b8248 82380084c5
commit e501cc17c2
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/ObjFileParser.cpp
View File

@@ -123,7 +123,7 @@ ObjFile::Model *ObjFileParser::GetModel() const {
std::vector<char> tempBuf;
do
{
streamBuffer.getNextLine(tempBuf);
streamBuffer.getNextDataLine(tempBuf, '\\' );
} while (tempBuf[0]=='\n');
*curPosition = ' ';
std::copy(tempBuf.cbegin(), tempBuf.cend(), ++curPosition);
@@ -141,7 +141,11 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
unsigned int processed = 0;
size_t lastFilePos( 0 );
while ( streamBuffer.getNextLine( m_DataIt, m_DataItEnd ) ) {
std::vector<char> buffer;
while ( streamBuffer.getNextDataLine( buffer, '\\' ) ) {
m_DataIt = buffer.begin();
m_DataItEnd = buffer.end();
// Handle progress reporting
const size_t filePos( streamBuffer.getFilePos() );
if ( lastFilePos < filePos ) {