diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f893646a..4e47b5732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF() -PROJECT( Assimp VERSION 5.0.1 ) +PROJECT(Assimp VERSION 5.1.0) # All supported options ############################################### diff --git a/Readme.md b/Readme.md index 09f9af7fa..f4167c9f2 100644 --- a/Readme.md +++ b/Readme.md @@ -44,6 +44,7 @@ Take a look into the https://github.com/assimp/assimp/blob/master/Build.md file. * [Javascript (Alpha)](https://github.com/makc/assimp2json) * [Javascript/Node.js Interface](https://github.com/kovacsv/assimpjs) * [Unity 3d Plugin](https://ricardoreis.net/trilib-2/) +* [Unreal Engine Plugin](https://github.com/irajsb/UE4_Assimp/) * [JVM](https://github.com/kotlin-graphics/assimp) Full jvm port (current [status](https://github.com/kotlin-graphics/assimp/wiki/Status)) * [HAXE-Port](https://github.com/longde123/assimp-haxe) The Assimp-HAXE-port. * [Rust](https://github.com/jkvargas/russimp) diff --git a/code/AssetLib/3MF/D3MFOpcPackage.cpp b/code/AssetLib/3MF/D3MFOpcPackage.cpp index ac5b91e67..8d51a7417 100644 --- a/code/AssetLib/3MF/D3MFOpcPackage.cpp +++ b/code/AssetLib/3MF/D3MFOpcPackage.cpp @@ -149,7 +149,7 @@ D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) : IOStream *fileStream = mZipArchive->Open(file.c_str()); if (nullptr == fileStream) { - ai_assert(fileStream != nullptr); + ASSIMP_LOG_ERROR("Filestream is nullptr."); continue; } diff --git a/code/AssetLib/STEPParser/STEPFileReader.cpp b/code/AssetLib/STEPParser/STEPFileReader.cpp index 360277912..09a596aa4 100644 --- a/code/AssetLib/STEPParser/STEPFileReader.cpp +++ b/code/AssetLib/STEPParser/STEPFileReader.cpp @@ -325,7 +325,7 @@ std::shared_ptr EXPRESS::DataType::Parse(const char*& i std::transform(s.begin(),s.end(),s.begin(),&ai_tolower ); if (schema->IsKnownToken(s)) { for(cur = t+1;*cur++ != '(';); - const std::shared_ptr dt = Parse(cur); + std::shared_ptr dt = Parse(cur); inout = *cur ? cur+1 : cur; return dt; } diff --git a/include/assimp/anim.h b/include/assimp/anim.h index dcd054d1e..8a73297a5 100644 --- a/include/assimp/anim.h +++ b/include/assimp/anim.h @@ -98,6 +98,7 @@ struct aiVectorKey { bool operator<(const aiVectorKey &rhs) const { return mTime < rhs.mTime; } + bool operator>(const aiVectorKey &rhs) const { return mTime > rhs.mTime; } @@ -131,6 +132,7 @@ struct aiQuatKey { bool operator==(const aiQuatKey &rhs) const { return rhs.mValue == this->mValue; } + bool operator!=(const aiQuatKey &rhs) const { return rhs.mValue != this->mValue; } @@ -139,6 +141,7 @@ struct aiQuatKey { bool operator<(const aiQuatKey &rhs) const { return mTime < rhs.mTime; } + bool operator>(const aiQuatKey &rhs) const { return mTime > rhs.mTime; } diff --git a/include/assimp/mesh.h b/include/assimp/mesh.h index 8223b3443..225f8556a 100644 --- a/include/assimp/mesh.h +++ b/include/assimp/mesh.h @@ -300,6 +300,10 @@ struct aiBone { aiBone() AI_NO_EXCEPT : mName(), mNumWeights(0), +#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS + mArmature(nullptr), + mNode(nullptr), +#endif mWeights(nullptr), mOffsetMatrix() { // empty @@ -309,6 +313,10 @@ struct aiBone { aiBone(const aiBone &other) : mName(other.mName), mNumWeights(other.mNumWeights), +#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS + mArmature(nullptr), + mNode(nullptr), +#endif mWeights(nullptr), mOffsetMatrix(other.mOffsetMatrix) { if (other.mWeights && other.mNumWeights) { diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index 0de6ef39c..6577c7758 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -44,16 +44,16 @@ class utVersion : public ::testing::Test { }; TEST_F( utVersion, aiGetLegalStringTest ) { - const char *lv( aiGetLegalString() ); + const char *lv = aiGetLegalString(); EXPECT_NE( lv, nullptr ); std::string text( lv ); - size_t pos( text.find( std::string( "2021" ) ) ); + size_t pos = text.find(std::string("2021")); EXPECT_NE( pos, std::string::npos ); } TEST_F( utVersion, aiGetVersionMinorTest ) { - EXPECT_EQ( aiGetVersionMinor(), 0U ); + EXPECT_EQ( aiGetVersionMinor(), 1U ); } TEST_F( utVersion, aiGetVersionMajorTest ) {