Add first version of the planned progress feedback API to the public Cpp API. Currently, progress reporting is done between each major import stage.

Fix various issues with the vc9 solution and assimp_cmd.
Declare some more Importer methods const. This marks them as safe to use from within a progress callback.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@806 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-08-26 18:16:12 +00:00
parent 2f71990dc2
commit c5c5338397
12 changed files with 312 additions and 43 deletions

View File

@@ -52,6 +52,7 @@ using namespace Assimp;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
BaseImporter::BaseImporter()
: progress()
{
// nothing to do here
}
@@ -65,9 +66,15 @@ BaseImporter::~BaseImporter()
// ------------------------------------------------------------------------------------------------
// Imports the given file and returns the imported data.
aiScene* BaseImporter::ReadFile( const std::string& pFile, IOSystem* pIOHandler)
aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile, IOSystem* pIOHandler)
{
// Construct a file system filter to improve our success ratio reading external files
progress = pImp->GetProgressHandler();
ai_assert(progress);
// Gather configuration properties for this run
SetupProperties( pImp );
// Construct a file system filter to improve our success ratio at reading external files
FileSystemFilter filter(pFile,pIOHandler);
// create a scene object to hold the data