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

Fix progress reporting in ObjFileParser. Remove old unused code which is claiming to still take up "1/3" of the total progress.

Browse Source
This commit is contained in:
Marc Kurtz
2019-01-08 15:56:20 -05:00
parent 455c4ceea4
commit e37a4de2c2
2 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/ObjFileParser.cpp
View File

@@ -113,8 +113,7 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
//const unsigned int updateProgressEveryBytes = 100 * 1024;
unsigned int progressCounter = 0;
const unsigned int bytesToProcess = static_cast<unsigned int>(streamBuffer.size());
const unsigned int progressTotal = 3 * bytesToProcess;
const unsigned int progressOffset = bytesToProcess;
const unsigned int progressTotal = bytesToProcess;
unsigned int processed = 0;
size_t lastFilePos( 0 );
@@ -126,10 +125,10 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
// Handle progress reporting
const size_t filePos( streamBuffer.getFilePos() );
if ( lastFilePos < filePos ) {
processed += static_cast<unsigned int>(filePos);
processed = static_cast<unsigned int>(filePos);
lastFilePos = filePos;
progressCounter++;
m_progress->UpdateFileRead( progressOffset + processed * 2, progressTotal );
m_progress->UpdateFileRead( processed, progressTotal );
}
// parse line