From 5e98898dca2e1a1949bef44b6fb08171beee144a Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 18 Jul 2017 19:02:08 +0200 Subject: [PATCH] Update version. --- CHANGES | 144 ++++++++++++++++++++++++++++++++++++++++++++++-- CMakeLists.txt | 8 +-- CREDITS | 2 +- code/MaterialSystem.cpp | 3 + code/Version.cpp | 39 +++++++------ 5 files changed, 165 insertions(+), 31 deletions(-) diff --git a/CHANGES b/CHANGES index 1d98700..1b9c25f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,143 @@ ---------------------------------------------------------------------- CHANGELOG ---------------------------------------------------------------------- +4.0.0 (2017-07-) + +FEATURES: + - Double precision support provided ( available via cmake option ) + - QT-Widget based assimp-viewer ( works for windows, linux, osx ) + - Open3DGC codec supported by glFT-importer + - glTF: Read and write transparency values + - Add Triangulate post-processing step to glTF exporters + - Update rapidjson to v1.0.2 + - Added method to append new metadata to structure + - Unittests: intoduce a prototype model differ + - X3D support + - AMF support + - Lugdunum3D support + - Obj-Importer: obj-homogeneous_coords support + - Obj-Importer: new streaming handling + - Added support for 64 bit version header introduced in FbxSdk2016 + - Travis: enable coverall support. + - PyAssimp: New version of the pyASSIMP 3D viewer, with much improved 3D controls + - Morph animation support for collada + - Added support for parameters Ni and Tf in OBJ/MTL file format + - aiScene: add method to add children + - Added new option to IFC importer to control tessellation angle + removed unused IFC option + - aiMetaData: introduce aiMetaData::Dealloc + - Samples: add a DX11 example + - travis ci: test on OXS ( XCode 6.3 ) as well + - travis ci: enable sudo support. + - openddlparser: integrate release v0.4.0 + - aiMetaData: Added support for metadata in assbin format + +FIXES/HOUSEKEEPING: + - Introduce usage of #pragma statement + - Put cmake-scripts into their own folder + - Fix install pathes ( issue 938 ) + - Fix object_compare in blender importer( issue 946 ) + - Fix OSX compilation error + - Fix unzip path when no other version was found ( issue 967 ) + - Set _FILE_OFFSET_BITS=64 for 32-bit linux ( issue 975 ) + - Fix constructor for radjson on OSX + - Use Assimp namespace to fix build for big-endian architectures + - Add -fPIC to C Flags for 64bit linux Shared Object builds + - MDLLoader: fix resource leak. + - MakeVerboseFormat: fix invalid delete statement + - IFC: fix possible use after free access bug + - ComputeUVMappingprocess: add missing initialization for scalar value + - Fix invalid release of mat + mesh + - IrrImporter: Fix release functions + - Split mesh before exporting gltf ( issue 995 ) + - 3MFImporter: add source group for visual studio + - IFC: Switch generated file to 2 files to fix issue related to and ( issue 1084 ) + - OBJParser: set material index when changing current material + - OBJ: check for null mesh before updating material index + - add vertex color export support ( issue 809 ) + - Fix memory leak in Collada importer ( issue 1169 ) + - add stp to the list of supported extensions for step-files ( issue 1183 ) + - fix clang build ( Issue-1169 ) + - fix for FreeBSD + - Import FindPkgMacros to main CMake Configuration + - Extended support for tessellation parameter to more IFC shapes + - defensice handling of utf-8 decode issues ( issue 1211 ) + - Fixed compiler error on clang 4.0 running on OSX + - use test extension for exported test files ( issue 1228 ) + - Set UVW index material properties for OBJ files + - Fixed no member named 'atop' in global namespace issue for Android NDK compilation + - Apply mechanism to decide use for IrrXML external or internal + - Fix static init ordering bug in OpenGEX importer + - GLTF exporter: ensure animation accessors have same count + - GLTF exporter: convert animation time from ticks to seconds + - Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v' + - Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files. + - fix wrong delete ( issue 1266 ) + - OpenGEX: fix invalid handling with color4 token ( issue 1262 ) + - LWOLoader: fix link in loader description + - Fix error when custom CMAKE_C_FLAGS is specified + - Fast-atof: log overflow errors + - Obj-Importer: do not break when detecting an overflow ( issue 1244 ) + - Obj-Importer: fix parsing of multible line data definitions + - Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model + - PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply + import - manage texture coords on faces in ply import - correction on point cloud faces generation + - Utf8: integrate new lib ( issue 1158 ) + - fixed CMAKE_MODULE_PATH overwriting previous values + - OpenGEX: Fixed bug in material color processing ( issue 1271 ) + - SceneCombiner: move header for scenecombiner to public folder. + - GLTF exporter: ensure buffer view byte offsets are correctly aligned + - X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags + - X3D Exporter: fixed missing attributes + - X3D importer: Fixed import of normals for the single index / normal per vertex case + - X3D importer: Fixed handling of inlined files + - X3D importer: fixed whitespace handling (issue 1202) + - X3D importer: Fixed iterator on MSVC 2015 + - X3D importer: Fixed problems with auto, override and regex on older compilers + - X3D importer: Fixed missing header file + - X3D importer: Fixed path handling + - X3D importer: Implemented support for binary X3D files + - fix build without 3DS ( issue 1319 ) + - pyassimp: Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet + - Fixes parameters to pyassimp.load + - Obj-Importe: Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes + - check if all exporters are disabled ( issue 1320 ) + - Remove std functions deprecated by C++11. + - X-Importer: make it deal with lines + - use correct path for compilers ( issue 1335 ) + - Collada: add workaround to deal with polygon with holes + - update python readme + - Use unique node names when loading Collada files + - Fixed many FBX bugs + +API COMPATIBILITY: + - Changed ABI-compatibility to v3.3.1, please rebuild your precompiled libraries ( see issue 1182 ) + - VS2010 outdated 3.3.1 (2016-07-08) @@ -121,8 +258,6 @@ API COMPATIBILITY: - Note: 3.0 is not binary compatible with 2.0 - - 2.0 (2010-11-21) FEATURES: @@ -159,10 +294,7 @@ API CHANGES: currently used, however ...) - Some Assimp::Importer methods are const now. - - - - + 1.1 (2010-04-17) This is the list of relevant changes from the 1.0 (r412) release to 1.1 (r700). diff --git a/CMakeLists.txt b/CMakeLists.txt index 4660f8a..be7d464 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,11 +104,11 @@ IF(NOT BUILD_SHARED_LIBS) ENDIF(NOT BUILD_SHARED_LIBS) # Define here the needed parameters -SET (ASSIMP_VERSION_MAJOR 3) -SET (ASSIMP_VERSION_MINOR 3) -SET (ASSIMP_VERSION_PATCH 1) # subversion revision? +SET (ASSIMP_VERSION_MAJOR 4) +SET (ASSIMP_VERSION_MINOR 0) +SET (ASSIMP_VERSION_PATCH 0) # subversion revision? SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH}) -SET (ASSIMP_SOVERSION 3) +SET (ASSIMP_SOVERSION 4) SET (PROJECT_VERSION "${ASSIMP_VERSION}") SET(ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources") diff --git a/CREDITS b/CREDITS index 2190791..43134ac 100644 --- a/CREDITS +++ b/CREDITS @@ -157,4 +157,4 @@ Contributed ExportProperties interface Contributed X File exporter Contributed Step (stp) exporter - +For a more detailed list just check: https://github.com/assimp/assimp/network/members diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp index be73ff8..55f1a4f 100644 --- a/code/MaterialSystem.cpp +++ b/code/MaterialSystem.cpp @@ -456,6 +456,9 @@ aiReturn aiMaterial::AddBinaryProperty (const void* pInput, ai_assert (pKey != NULL); ai_assert (0 != pSizeInBytes); + if ( 0 == pSizeInBytes ) { + + } // first search the list whether there is already an entry with this key unsigned int iOutIndex = UINT_MAX; for (unsigned int i = 0; i < mNumProperties;++i) { diff --git a/code/Version.cpp b/code/Version.cpp index fd8ed62..4149f38 100644 --- a/code/Version.cpp +++ b/code/Version.cpp @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "ScenePrivate.h" -static const unsigned int MajorVersion = 3; -static const unsigned int MinorVersion = 3; +static const unsigned int MajorVersion = 4; +static const unsigned int MinorVersion = 0; // -------------------------------------------------------------------------------- // Legal information string - dont't remove this. @@ -114,23 +114,23 @@ ASSIMP_API unsigned int aiGetVersionRevision () // ------------------------------------------------------------------------------------------------ ASSIMP_API aiScene::aiScene() - : mFlags(0) - , mRootNode(NULL) - , mNumMeshes(0) - , mMeshes(NULL) - , mNumMaterials(0) - , mMaterials(NULL) - , mNumAnimations(0) - , mAnimations(NULL) - , mNumTextures(0) - , mTextures(NULL) - , mNumLights(0) - , mLights(NULL) - , mNumCameras(0) - , mCameras(NULL) - , mPrivate(new Assimp::ScenePrivateData()) - { - } +: mFlags(0) +, mRootNode(NULL) +, mNumMeshes(0) +, mMeshes(NULL) +, mNumMaterials(0) +, mMaterials(NULL) +, mNumAnimations(0) +, mAnimations(NULL) +, mNumTextures(0) +, mTextures(NULL) +, mNumLights(0) +, mLights(NULL) +, mNumCameras(0) +, mCameras(NULL) +, mPrivate(new Assimp::ScenePrivateData()) { + // empty +} // ------------------------------------------------------------------------------------------------ ASSIMP_API aiScene::~aiScene() @@ -173,4 +173,3 @@ ASSIMP_API aiScene::~aiScene() delete static_cast( mPrivate ); } - -- 2.7.4