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

Merge branch 'master' into kimkulling_dev

Browse Source
This commit is contained in:
Kim Kulling
2020-03-23 09:00:41 +01:00
committed by GitHub
parent 221e56769f 7e5a0acc48
commit 6f8d96b57e
275 changed files with 24219 additions and 23083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/SMD/SMDLoader.cpp
View File

@@ -89,7 +89,7 @@ SMDImporter::SMDImporter()
, iSmallestFrame( INT_MAX )
, dLengthOfAnim( 0.0 )
, bHasUVs(false )
, iLineNumber(-1) {
, iLineNumber((unsigned int)-1) {
// empty
}
@@ -129,8 +129,8 @@ void SMDImporter::SetupProperties(const Importer* pImp) {
// ------------------------------------------------------------------------------------------------
// Imports the given file into the given scene structure.
void SMDImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) {
this->pScene = pScene;
void SMDImporter::InternReadFile( const std::string& pFile, aiScene* scene, IOSystem* pIOHandler) {
this->pScene = scene;
ReadSmd(pFile, pIOHandler);
// If there are no triangles it seems to be an animation SMD,
@@ -190,19 +190,19 @@ void SMDImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
// ------------------------------------------------------------------------------------------------
// Write an error message with line number to the log file
void SMDImporter::LogErrorNoThrow(const char* msg) {
const size_t BufferSize = 1024;
char szTemp[BufferSize];
ai_snprintf(szTemp,BufferSize,"Line %u: %s",iLineNumber,msg);
const size_t _BufferSize = 1024;
char szTemp[_BufferSize];
ai_snprintf(szTemp,_BufferSize,"Line %u: %s",iLineNumber,msg);
DefaultLogger::get()->error(szTemp);
}
// ------------------------------------------------------------------------------------------------
// Write a warning with line number to the log file
void SMDImporter::LogWarning(const char* msg) {
const size_t BufferSize = 1024;
char szTemp[BufferSize];
const size_t _BufferSize = 1024;
char szTemp[_BufferSize];
ai_assert(strlen(msg) < 1000);
ai_snprintf(szTemp,BufferSize,"Line %u: %s",iLineNumber,msg);
ai_snprintf(szTemp,_BufferSize,"Line %u: %s",iLineNumber,msg);
ASSIMP_LOG_WARN(szTemp);
}