v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use 0..fileSize as progress metric (easier for loaders)

pull/326/head
Gargaj 2014-08-07 08:22:47 +02:00
parent 8f960f0ed2
commit 523d87bbe7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/Importer.cpp
View File

@ -640,16 +640,21 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags)
} }
} }
// Get file size for progress handler
IOStream * fileIO = pimpl->mIOHandler->Open( pFile );
uint32_t fileSize = fileIO->FileSize();
pimpl->mIOHandler->Close( fileIO );
// Dispatch the reading to the worker class for this format // Dispatch the reading to the worker class for this format
DefaultLogger::get()->info("Found a matching importer for this file format"); DefaultLogger::get()->info("Found a matching importer for this file format");
pimpl->mProgressHandler->UpdateFileRead( 0, 1 ); pimpl->mProgressHandler->UpdateFileRead( 0, fileSize );
if (profiler) { if (profiler) {
profiler->BeginRegion("import"); profiler->BeginRegion("import");
} }
pimpl->mScene = imp->ReadFile( this, pFile, pimpl->mIOHandler); pimpl->mScene = imp->ReadFile( this, pFile, pimpl->mIOHandler);
pimpl->mProgressHandler->UpdateFileRead( 1, 1 ); pimpl->mProgressHandler->UpdateFileRead( fileSize, fileSize );
if (profiler) { if (profiler) {
profiler->EndRegion("import"); profiler->EndRegion("import");