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

Merge branch 'master' into exportGLTF

pull/5243/head
fvbj 2023-09-26 23:23:05 +02:00
parent 79965d8c82 6a08c39e3a
commit b295defc1c
10 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -49,13 +49,13 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)
include("cmake-modules/HunterGate.cmake") include("cmake-modules/HunterGate.cmake")
HunterGate( HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.24.17.tar.gz" URL "https://github.com/cpp-pm/hunter/archive/v0.24.18.tar.gz"
SHA1 "e6396699e414120e32557fe92db097b7655b760b" SHA1 "1292e4d661e1770d6d6ca08c12c07cf34a0bf718"
) )
add_definitions(-DASSIMP_USE_HUNTER) add_definitions(-DASSIMP_USE_HUNTER)
ENDIF() ENDIF()
PROJECT(Assimp VERSION 5.2.5) PROJECT(Assimp VERSION 5.3.0)
# All supported options ############################################### # All supported options ###############################################
@ -777,7 +777,7 @@ IF ( ASSIMP_INSTALL )
SET(CPACK_DEBIAN_PACKAGE_SECTION "libs" ) SET(CPACK_DEBIAN_PACKAGE_SECTION "libs" )
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_COMPONENTS_ALL}") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_COMPONENTS_ALL}")
SET(CPACK_DEBIAN_PACKAGE_SUGGESTS) SET(CPACK_DEBIAN_PACKAGE_SUGGESTS)
SET(cPACK_DEBIAN_PACKAGE_NAME "assimp") SET(CPACK_DEBIAN_PACKAGE_NAME "assimp")
SET(CPACK_DEBIAN_PACKAGE_REMOVE_SOURCE_FILES contrib/gtest contrib/zlib workspaces test doc obj samples packaging) SET(CPACK_DEBIAN_PACKAGE_REMOVE_SOURCE_FILES contrib/gtest contrib/zlib workspaces test doc obj samples packaging)
SET(CPACK_DEBIAN_PACKAGE_SOURCE_COPY svn export --force) SET(CPACK_DEBIAN_PACKAGE_SOURCE_COPY svn export --force)
SET(CPACK_DEBIAN_CHANGELOG) SET(CPACK_DEBIAN_CHANGELOG)

36
code/Common/Version.cpp
View File

@ -3,7 +3,7 @@
Open Asset Import Library (assimp) Open Asset Import Library (assimp)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 2006-2022, assimp team Copyright (c) 2006-2023, assimp team
All rights reserved. All rights reserved.
@ -49,10 +49,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
// Legal information string - don't remove this. // Legal information string - don't remove this.
static const char *LEGAL_INFORMATION = static constexpr char LEGAL_INFORMATION[] =
"Open Asset Import Library (Assimp).\n" "Open Asset Import Library (Assimp).\n"
"A free C/C++ library to import various 3D file formats into applications\n\n" "A free C/C++ library to import various 3D file formats into applications\n\n"
"(c) 2006-2022, Assimp team\n" "(c) 2006-2023, Assimp team\n"
"License under the terms and conditions of the 3-clause BSD license\n" "License under the terms and conditions of the 3-clause BSD license\n"
"https://www.assimp.org\n"; "https://www.assimp.org\n";
@ -150,9 +150,11 @@ ASSIMP_API aiScene::~aiScene() {
// To make sure we won't crash if the data is invalid it's // To make sure we won't crash if the data is invalid it's
// much better to check whether both mNumXXX and mXXX are // much better to check whether both mNumXXX and mXXX are
// valid instead of relying on just one of them. // valid instead of relying on just one of them.
if (mNumMeshes && mMeshes) if (mNumMeshes && mMeshes) {
for (unsigned int a = 0; a < mNumMeshes; a++) for (unsigned int a = 0; a < mNumMeshes; ++a) {
delete mMeshes[a]; delete mMeshes[a];
}
}
delete[] mMeshes; delete[] mMeshes;
if (mNumMaterials && mMaterials) { if (mNumMaterials && mMaterials) {
@ -162,24 +164,32 @@ ASSIMP_API aiScene::~aiScene() {
} }
delete[] mMaterials; delete[] mMaterials;
if (mNumAnimations && mAnimations) if (mNumAnimations && mAnimations) {
for (unsigned int a = 0; a < mNumAnimations; a++) for (unsigned int a = 0; a < mNumAnimations; ++a) {
delete mAnimations[a]; delete mAnimations[a];
}
}
delete[] mAnimations; delete[] mAnimations;
if (mNumTextures && mTextures) if (mNumTextures && mTextures) {
for (unsigned int a = 0; a < mNumTextures; a++) for (unsigned int a = 0; a < mNumTextures; ++a) {
delete mTextures[a]; delete mTextures[a];
}
}
delete[] mTextures; delete[] mTextures;
if (mNumLights && mLights) if (mNumLights && mLights) {
for (unsigned int a = 0; a < mNumLights; a++) for (unsigned int a = 0; a < mNumLights; ++a) {
delete mLights[a]; delete mLights[a];
}
}
delete[] mLights; delete[] mLights;
if (mNumCameras && mCameras) if (mNumCameras && mCameras) {
for (unsigned int a = 0; a < mNumCameras; a++) for (unsigned int a = 0; a < mNumCameras; ++a) {
delete mCameras[a]; delete mCameras[a];
}
}
delete[] mCameras; delete[] mCameras;
aiMetadata::Dealloc(mMetaData); aiMetadata::Dealloc(mMetaData);

4
contrib/zip/src/zip.h
View File

@ -83,9 +83,9 @@ typedef long ssize_t; /* byte count or error */
#define ZIP_EFWRITE -29 // fwrite error #define ZIP_EFWRITE -29 // fwrite error
/** /**
* Looks up the error message string coresponding to an error number. * Looks up the error message string corresponding to an error number.
* @param errnum error number * @param errnum error number
* @return error message string coresponding to errnum or NULL if error is not * @return error message string corresponding to errnum or NULL if error is not
* found. * found.
*/ */
extern const char *zip_strerror(int errnum); extern const char *zip_strerror(int errnum);

28
include/assimp/types.h
View File

@ -73,14 +73,8 @@ typedef uint32_t ai_uint32;
#ifdef __cplusplus #ifdef __cplusplus
#ifdef ASSIMP_USE_HUNTER
# include <utf8.h>
#else
# include "../contrib/utf8cpp/source/utf8.h"
#endif
#include <cstring> #include <cstring>
#include <new> // for std::nothrow_t #include <new> // for std::nothrow_t
#include <string> // for aiString::Set(const std::string&) #include <string> // for aiString::Set(const std::string&)
namespace Assimp { namespace Assimp {
@ -88,16 +82,16 @@ namespace Assimp {
namespace Intern { namespace Intern {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
/** @brief Internal helper class to utilize our internal new/delete /** @brief Internal helper class to utilize our internal new/delete
* routines for allocating object of this and derived classes. * routines for allocating object of this and derived classes.
* *
* By doing this you can safely share class objects between Assimp * By doing this you can safely share class objects between Assimp
* and the application - it works even over DLL boundaries. A good * and the application - it works even over DLL boundaries. A good
* example is the #IOSystem where the application allocates its custom * example is the #IOSystem where the application allocates its custom
* #IOSystem, then calls #Importer::SetIOSystem(). When the Importer * #IOSystem, then calls #Importer::SetIOSystem(). When the Importer
* destructs, Assimp calls operator delete on the stored #IOSystem. * destructs, Assimp calls operator delete on the stored #IOSystem.
* If it lies on a different heap than Assimp is working with, * If it lies on a different heap than Assimp is working with,
* the application is determined to crash. * the application is determined to crash.
*/ */
// -------------------------------------------------------------------- // --------------------------------------------------------------------
#ifndef SWIG #ifndef SWIG
struct ASSIMP_API AllocateFromAssimpHeap { struct ASSIMP_API AllocateFromAssimpHeap {

2
include/assimp/version.h
View File

@ -3,7 +3,7 @@
Open Asset Import Library (assimp) Open Asset Import Library (assimp)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 2006-2022, assimp team Copyright (c) 2006-2023, assimp team
All rights reserved. All rights reserved.

8
packaging/windows-innosetup/script_vieweronly.iss
View File

@ -2,7 +2,7 @@
[Setup] [Setup]
AppName=Open Asset Import Library - Viewer AppName=Open Asset Import Library - Viewer
AppVerName=Open Asset Import Library - Viewer (v2.0) AppVerName=Open Asset Import Library - Viewer (v5.3.0)
DefaultDirName={pf}\AssimpView DefaultDirName={pf}\AssimpView
DefaultGroupName=AssimpView DefaultGroupName=AssimpView
UninstallDisplayIcon={app}\bin\x86\assimp.exe UninstallDisplayIcon={app}\bin\x86\assimp.exe
@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
WizardImageFile=compiler:WizModernImage-IS.BMP WizardImageFile=compiler:WizModernImage-IS.BMP
WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
LicenseFile=License.rtf LicenseFile=License.rtf
OutputBaseFileName=assimp-view-2.0-setup OutputBaseFileName=assimp-view-5.0-setup
VersionInfoVersion=2.0.0.0 VersionInfoVersion=5.3.0.0
VersionInfoTextVersion=2.0 VersionInfoTextVersion=5.3.0
VersionInfoCompany=Assimp Development Team VersionInfoCompany=Assimp Development Team
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64

8
packaging/windows-innosetup/script_x64.iss
View File

@ -2,7 +2,7 @@
[Setup] [Setup]
AppName=Open Asset Import Library - SDK AppName=Open Asset Import Library - SDK
AppVerName=Open Asset Import Library - SDK (v5.1.0) AppVerName=Open Asset Import Library - SDK (v5.3.0)
DefaultDirName={pf}\Assimp DefaultDirName={pf}\Assimp
DefaultGroupName=Assimp DefaultGroupName=Assimp
UninstallDisplayIcon={app}\bin\x64\assimp.exe UninstallDisplayIcon={app}\bin\x64\assimp.exe
@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
WizardImageFile=compiler:WizModernImage-IS.BMP WizardImageFile=compiler:WizModernImage-IS.BMP
WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
LicenseFile=License.rtf LicenseFile=License.rtf
OutputBaseFileName=assimp-sdk-5.1.0-setup OutputBaseFileName=assimp-sdk-5.2.6-setup
VersionInfoVersion=5.1.0.0 VersionInfoVersion=5.3.0.0
VersionInfoTextVersion=5.1.0 VersionInfoTextVersion=5.3.0
VersionInfoCompany=Assimp Development Team VersionInfoCompany=Assimp Development Team
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64

8
packaging/windows-innosetup/script_x86.iss
View File

@ -2,7 +2,7 @@
[Setup] [Setup]
AppName=Open Asset Import Library - SDK AppName=Open Asset Import Library - SDK
AppVerName=Open Asset Import Library - SDK (v5.1.0) AppVerName=Open Asset Import Library - SDK (v5.3.0)
DefaultDirName={pf}\Assimp DefaultDirName={pf}\Assimp
DefaultGroupName=Assimp DefaultGroupName=Assimp
UninstallDisplayIcon={app}\bin\x86\assimp.exe UninstallDisplayIcon={app}\bin\x86\assimp.exe
@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
WizardImageFile=compiler:WizModernImage-IS.BMP WizardImageFile=compiler:WizModernImage-IS.BMP
WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
LicenseFile=License.rtf LicenseFile=License.rtf
OutputBaseFileName=assimp-sdk-5.1.0-setup OutputBaseFileName=assimp-sdk-5.2.6-setup
VersionInfoVersion=5.1.0.0 VersionInfoVersion=5.3.0.
VersionInfoTextVersion=5.1.0 VersionInfoTextVersion=5.3.0
VersionInfoCompany=Assimp Development Team VersionInfoCompany=Assimp Development Team
;ArchitecturesInstallIn64BitMode=x64 ;ArchitecturesInstallIn64BitMode=x64

2
revision.h.in
View File

@ -18,7 +18,7 @@
#else #else
#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit @GIT_COMMIT_HASH@)" #define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit @GIT_COMMIT_HASH@)"
#endif #endif
#define VER_COPYRIGHT_STR "\xA9 2006-2022" #define VER_COPYRIGHT_STR "\xA9 2006-2023"
#ifdef NDEBUG #ifdef NDEBUG
#define VER_ORIGINAL_FILENAME_STR "@CMAKE_SHARED_LIBRARY_PREFIX@assimp@LIBRARY_SUFFIX@.dll" #define VER_ORIGINAL_FILENAME_STR "@CMAKE_SHARED_LIBRARY_PREFIX@assimp@LIBRARY_SUFFIX@.dll"

8
test/unit/utVersion.cpp
View File

@ -2,7 +2,7 @@
Open Asset Import Library (assimp) Open Asset Import Library (assimp)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 2006-2022, assimp team Copyright (c) 2006-2023, assimp team
All rights reserved. All rights reserved.
@ -48,12 +48,12 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
EXPECT_NE( lv, nullptr ); EXPECT_NE( lv, nullptr );
std::string text( lv ); std::string text( lv );
size_t pos = text.find(std::string("2022")); size_t pos = text.find(std::string("2023"));
EXPECT_NE(pos, std::string::npos); EXPECT_NE(pos, std::string::npos);
} }
TEST_F( utVersion, aiGetVersionMinorTest ) { TEST_F( utVersion, aiGetVersionMinorTest ) {
EXPECT_EQ(aiGetVersionMinor(), 2U); EXPECT_EQ(aiGetVersionMinor(), 3U);
} }
TEST_F( utVersion, aiGetVersionMajorTest ) { TEST_F( utVersion, aiGetVersionMajorTest ) {
@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
} }
TEST_F( utVersion, aiGetVersionPatchTest ) { TEST_F( utVersion, aiGetVersionPatchTest ) {
EXPECT_EQ(aiGetVersionPatch(), 5U ); EXPECT_EQ(aiGetVersionPatch(), 0U );
} }
TEST_F( utVersion, aiGetCompileFlagsTest ) { TEST_F( utVersion, aiGetCompileFlagsTest ) {