diff options
Diffstat (limited to 'src/3rdparty/assimp/code/Importer.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/Importer.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/3rdparty/assimp/code/Importer.cpp b/src/3rdparty/assimp/code/Importer.cpp index 3599138eb..c6c6f0edd 100644 --- a/src/3rdparty/assimp/code/Importer.cpp +++ b/src/3rdparty/assimp/code/Importer.cpp @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -44,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <assimp/version.h> +#include <assimp/config.h> +#include <assimp/importerdesc.h> // ------------------------------------------------------------------------------------------------ /* Uncomment this line to prevent Assimp from catching unknown exceptions. @@ -64,8 +67,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseImporter.h" #include "BaseProcess.h" -#include "DefaultIOStream.h" -#include "DefaultIOSystem.h" #include "DefaultProgressHandler.h" #include "GenericProperty.h" #include "ProcessHelper.h" @@ -80,6 +81,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <memory> #include <cctype> +#include <assimp/DefaultIOStream.h> +#include <assimp/DefaultIOSystem.h> + #ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS # include "ValidateDataStructure.h" #endif @@ -270,10 +274,6 @@ aiReturn Importer::UnregisterLoader(BaseImporter* pImp) if (it != pimpl->mImporter.end()) { pimpl->mImporter.erase(it); - - std::set<std::string> st; - pImp->GetExtensionList(st); - DefaultLogger::get()->info("Unregistering custom importer: "); return AI_SUCCESS; } @@ -653,7 +653,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags) uint32_t fileSize = 0; if (fileIO) { - fileSize = fileIO->FileSize(); + fileSize = static_cast<uint32_t>(fileIO->FileSize()); pimpl->mIOHandler->Close( fileIO ); } @@ -789,7 +789,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) for( unsigned int a = 0; a < pimpl->mPostProcessingSteps.size(); a++) { BaseProcess* process = pimpl->mPostProcessingSteps[a]; - pimpl->mProgressHandler->UpdatePostProcess( a, pimpl->mPostProcessingSteps.size() ); + pimpl->mProgressHandler->UpdatePostProcess(static_cast<int>(a), static_cast<int>(pimpl->mPostProcessingSteps.size()) ); if( process->IsActive( pFlags)) { if (profiler) { @@ -824,11 +824,11 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) } #endif // ! DEBUG } - pimpl->mProgressHandler->UpdatePostProcess( pimpl->mPostProcessingSteps.size(), pimpl->mPostProcessingSteps.size() ); + pimpl->mProgressHandler->UpdatePostProcess( static_cast<int>(pimpl->mPostProcessingSteps.size()), static_cast<int>(pimpl->mPostProcessingSteps.size()) ); // update private scene flags - if( pimpl->mScene ) - ScenePriv(pimpl->mScene)->mPPStepsApplied |= pFlags; + if( pimpl->mScene ) + ScenePriv(pimpl->mScene)->mPPStepsApplied |= pFlags; // clear any data allocated by post-process steps pimpl->mPPShared->Clean(); @@ -1017,11 +1017,11 @@ bool Importer::SetPropertyInteger(const char* szName, int iValue) // ------------------------------------------------------------------------------------------------ // Set a configuration property -bool Importer::SetPropertyFloat(const char* szName, float iValue) +bool Importer::SetPropertyFloat(const char* szName, ai_real iValue) { bool exising; ASSIMP_BEGIN_EXCEPTION_REGION(); - exising = SetGenericProperty<float>(pimpl->mFloatProperties, szName,iValue); + exising = SetGenericProperty<ai_real>(pimpl->mFloatProperties, szName,iValue); ASSIMP_END_EXCEPTION_REGION(bool); return exising; } @@ -1058,10 +1058,10 @@ int Importer::GetPropertyInteger(const char* szName, // ------------------------------------------------------------------------------------------------ // Get a configuration property -float Importer::GetPropertyFloat(const char* szName, - float iErrorReturn /*= 10e10*/) const +ai_real Importer::GetPropertyFloat(const char* szName, + ai_real iErrorReturn /*= 10e10*/) const { - return GetGenericProperty<float>(pimpl->mFloatProperties,szName,iErrorReturn); + return GetGenericProperty<ai_real>(pimpl->mFloatProperties,szName,iErrorReturn); } // ------------------------------------------------------------------------------------------------ |