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

BaseImporter: fix typo and rename attributes for better readability.

pull/666/head
Kim Kulling 2015-09-24 00:57:47 +02:00
parent ef6baa0acf
commit 3fc251b326
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/BaseImporter.cpp
View File

@ -63,7 +63,7 @@ using namespace Assimp;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
BaseImporter::BaseImporter()
: progress()
: m_progress()
{
// nothing to do here
}
@ -79,8 +79,8 @@ BaseImporter::~BaseImporter()
// Imports the given file and returns the imported data.
aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile, IOSystem* pIOHandler)
{
progress = pImp->GetProgressHandler();
ai_assert(progress);
m_progress = pImp->GetProgressHandler();
ai_assert(m_progress);
// Gather configuration properties for this run
SetupProperties( pImp );
@ -98,8 +98,8 @@ aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile,
} catch( const std::exception& err ) {
// extract error description
mErrorText = err.what();
DefaultLogger::get()->error(mErrorText);
m_ErrorText = err.what();
DefaultLogger::get()->error(m_ErrorText);
return NULL;
}

6
code/BaseImporter.h
View File

@ -181,7 +181,7 @@ public:
* string if there was no error.
*/
const std::string& GetErrorText() const {
return mErrorText;
return m_ErrorText;
}
// -------------------------------------------------------------------
@ -362,10 +362,10 @@ public: // static utilities
protected:
/** Error description in case there was one. */
std::string mErrorText;
std::string m_ErrorText;
/** Currently set progress handler */
ProgressHandler* progress;
ProgressHandler* m_progress;
};