diff --git a/.gitattributes b/.gitattributes
index 7f9357f62..f3df90d38 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,3 +13,10 @@ CHANGES text eol=lf
CREDITS text eol=lf
LICENSE text eol=lf
Readme.md text eol=lf
+# make sure that repo-specific settings (.gitignore, CI-setup,...)
+# are excluded from the source-package generated via 'git archive'
+.git* export-ignore
+/.travis* export-ignore
+/.coveralls* export-ignore
+appveyor.yml export-ignore
+
diff --git a/.travis.sh b/.travis.sh
index 7161fd28d..9786c5321 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,6 +1,36 @@
function generate()
{
- cmake -G "Unix Makefiles" -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD -DASSIMP_COVERALLS=$ENABLE_COVERALLS
+ OPTIONS="-DASSIMP_WERROR=ON"
+
+ if [ "$DISABLE_EXPORTERS" = "YES" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=YES"
+ else
+ OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=NO"
+ fi
+
+ if [ "$SHARED_BUILD" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DBUILD_SHARED_LIBS=ON"
+ else
+ OPTIONS="$OPTIONS -DBUILD_SHARED_LIBS=OFF"
+ fi
+
+ if [ "$ENABLE_COVERALLS" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_COVERALLS=ON"
+ else
+ OPTIONS="$OPTIONS -DASSIMP_COVERALLS=OFF"
+ fi
+
+ if [ "$ASAN" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_ASAN=ON"
+ else
+ OPTIONS="$OPTIONS -DASSIMP_ASAN=OFF"
+ fi
+
+ if [ "$UBSAN" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_UBSAN=ON"
+ fi
+
+ cmake -G "Unix Makefiles" $OPTIONS
}
if [ $ANDROID ]; then
diff --git a/.travis.yml b/.travis.yml
index 661de2279..fa37e5955 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,19 @@
sudo: required
language: cpp
+cache: ccache
+
before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake python3 homebrew/x11/freeglut; fi
+ - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+ if brew ls --versions cmake > /dev/null; then
+ echo cmake already installed.;
+ else
+ brew install cmake;
+ fi;
+ brew install python3;
+ brew install homebrew/x11/freeglut;
+ fi'
- echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h
# install latest LCOV (1.9 was failing)
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ${TRAVIS_BUILD_DIR} && wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz && tar xf lcov_1.11.orig.tar.gz && sudo make -C lcov-1.11/ install && gem install coveralls-lcov && lcov --version && g++ --version ; fi
@@ -12,22 +22,36 @@ branches:
only:
- master
-osx_image: xcode8.3
+os:
+ - linux
+
+compiler:
+ - gcc
+ - clang
env:
global:
# COVERITY_SCAN_TOKEN
- secure: "lZ7pHQvl5dpZWzBQAaIMf0wqrvtcZ4wiZKeIZjf83TEsflW8+z0uTpIuN30ZV6Glth/Sq1OhLnTP5+N57fZU/1ebA5twHdvP4bS5CIUUg71/CXQZNl36xeaqvxsG/xRrdpKOsPdjAOsQ9KPTQulsX43XDLS7CasMiLvYOpqKcPc="
- PV=r8e PLATF=linux-x86_64 NDK_HOME=${TRAVIS_BUILD_DIR}/android-ndk-${PV} PATH=${PATH}:${NDK_HOME}
- matrix:
- - LINUX=1 TRAVIS_NO_EXPORT=YES ENABLE_COVERALLS=ON
- - LINUX=1 TRAVIS_NO_EXPORT=NO ENABLE_COVERALLS=OFF
- - LINUX=1 SHARED_BUILD=ON ENABLE_COVERALLS=OFF
- - LINUX=1 SHARED_BUILD=OFF ENABLE_COVERALLS=OFF
-compiler:
- - gcc
- - clang
+matrix:
+ include:
+ - os: linux
+ compiler: gcc
+ env: DISABLE_EXPORTERS=YES ENABLE_COVERALLS=ON
+ - os: linux
+ compiler: gcc
+ env: SHARED_BUILD=ON
+ - os: linux
+ compiler: clang
+ env: ASAN=ON
+ - os: linux
+ compiler: clang
+ env: UBSAN=ON
+ - os: linux
+ compiler: clang
+ env: SHARED_BUILD=ON
install:
- if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi
@@ -40,9 +64,6 @@ script:
- export COVERALLS_SERVICE_NAME=travis-ci
- export COVERALLS_REPO_TOKEN=abc12345
- . ./.travis.sh
-os:
- - linux
- - osx
after_success:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ${TRAVIS_BUILD_DIR} && lcov --directory . --capture --output-file coverage.info && lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info && lcov --list coverage.info && coveralls-lcov --source-encoding=ISO-8859-1 --repo-token=${COVERALLS_TOKEN} coverage.info ; fi
diff --git a/CHANGES b/CHANGES
index d21042b89..d5faab2e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,18 @@
----------------------------------------------------------------------
CHANGELOG
----------------------------------------------------------------------
+4.0.1 (2017-07-28)
+ - FIXES/HOUSEKEEPING:
+ - fix version test.
+ - Not compiling when using ASSIMP_DOUBLE_PRECISION
+ - Added support for python3
+ - Check if cmake is installed with brew
+ - Low performance in OptimizeMeshesProcess::ProcessNode with huge numbers of meshes
+ - Elapsed seconds not shown correctly
+ - StreamReader: fix out-of-range exception
+ - PPdPmdParser: fix compilation for clang
+
+
4.0.0 (2017-07-18)
FEATURES:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be7d46438..bc3731bbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#----------------------------------------------------------------------
SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
-cmake_minimum_required( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
PROJECT( Assimp )
# All supported options ###############################################
@@ -62,11 +62,11 @@ OPTION( ASSIMP_BUILD_ZLIB
"Build your own zlib"
OFF
)
-option( ASSIMP_BUILD_ASSIMP_TOOLS
+OPTION( ASSIMP_BUILD_ASSIMP_TOOLS
"If the supplementary tools for Assimp are built in addition to the library."
ON
)
-option ( ASSIMP_BUILD_SAMPLES
+OPTION ( ASSIMP_BUILD_SAMPLES
"If the official samples are built as well (needs Glut)."
OFF
)
@@ -75,24 +75,36 @@ OPTION ( ASSIMP_BUILD_TESTS
ON
)
OPTION ( ASSIMP_COVERALLS
- "Eańable this to measure test coverage."
- OFF
+ "Enable this to measure test coverage."
+ OFF
)
-option ( SYSTEM_IRRXML
- "Use system installed Irrlicht/IrrXML library."
- OFF
+OPTION ( ASSIMP_WERROR
+ "Treat warnings as errors."
+ OFF
+)
+OPTION ( ASSIMP_ASAN
+ "Enable AddressSanitizer."
+ OFF
+)
+OPTION ( ASSIMP_UBSAN
+ "Enable Undefined Behavior sanitizer."
+ OFF
+)
+OPTION ( SYSTEM_IRRXML
+ "Use system installed Irrlicht/IrrXML library."
+ OFF
)
OPTION ( BUILD_DOCS
- "Build documentation using Doxygen."
- OFF
+ "Build documentation using Doxygen."
+ OFF
)
if (WIN32)
- add_definitions( -DWIN32_LEAN_AND_MEAN )
+ ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN )
endif()
IF(MSVC)
- set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
+ SET (CMAKE_PREFIX_PATH "D:\\libs\\devil")
OPTION( ASSIMP_INSTALL_PDB
"Install MSVC debug files."
ON
@@ -100,21 +112,24 @@ IF(MSVC)
ENDIF(MSVC)
IF(NOT BUILD_SHARED_LIBS)
+ MESSAGE(STATUS "Shared libraries disabled")
SET(LINK_SEARCH_START_STATIC TRUE)
+ELSE()
+ MESSAGE(STATUS "Shared libraries enabled")
ENDIF(NOT BUILD_SHARED_LIBS)
# Define here the needed parameters
SET (ASSIMP_VERSION_MAJOR 4)
SET (ASSIMP_VERSION_MINOR 0)
-SET (ASSIMP_VERSION_PATCH 0) # subversion revision?
+SET (ASSIMP_VERSION_PATCH 1)
SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
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")
+SET( ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources" )
# Needed for openddl_parser config, no use of c++11 at this moment
-add_definitions( -DOPENDDL_NO_USE_CPP11 )
+ADD_DEFINITIONS( -DOPENDDL_NO_USE_CPP11 )
set_property( GLOBAL PROPERTY CXX_STANDARD 11 )
# Get the current working branch
@@ -136,32 +151,26 @@ EXECUTE_PROCESS(
)
IF(NOT GIT_COMMIT_HASH)
- SET(GIT_COMMIT_HASH 0)
+ SET(GIT_COMMIT_HASH 0)
ENDIF(NOT GIT_COMMIT_HASH)
IF(ASSIMP_DOUBLE_PRECISION)
- ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION)
+ ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION)
ENDIF(ASSIMP_DOUBLE_PRECISION)
-# Check for OpenMP support
-find_package(OpenMP)
-if (OPENMP_FOUND)
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
-configure_file(
+CONFIGURE_FILE(
${CMAKE_CURRENT_LIST_DIR}/revision.h.in
${CMAKE_CURRENT_BINARY_DIR}/revision.h
)
-configure_file(
+CONFIGURE_FILE(
${CMAKE_CURRENT_LIST_DIR}/include/assimp/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/assimp/config.h
)
-include_directories(
+INCLUDE_DIRECTORIES(
./
+ include
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/include
)
@@ -179,7 +188,7 @@ IF( UNIX )
ENDIF()
# Use GNUInstallDirs for Unix predefined directories
- include(GNUInstallDirs)
+ INCLUDE(GNUInstallDirs)
ENDIF( UNIX )
@@ -192,20 +201,48 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
ELSEIF(MSVC)
# enable multi-core compilation with MSVC
add_compile_options(/MP)
+
+ # disable "elements of array '' will be default initialized" warning on MSVC2013
+ IF(MSVC12)
+ add_compile_options(/wd4351)
+ ENDIF()
ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -Wno-long-long -pedantic -std=c++11" )
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -Wno-long-long -std=c++11" )
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
ELSEIF( CMAKE_COMPILER_IS_MINGW )
- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" )
- add_definitions( -U__STRICT_ANSI__ )
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wno-long-long -std=c++11" )
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+ ADD_DEFINITIONS( -U__STRICT_ANSI__ )
ENDIF()
if (ASSIMP_COVERALLS)
- include(Coveralls)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
+ MESSAGE(STATUS "Coveralls enabled")
+ INCLUDE(Coveralls)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
endif()
-INCLUDE_DIRECTORIES( include )
+if (ASSIMP_WERROR)
+ MESSAGE(STATUS "Treating warnings as errors")
+ IF (MSVC)
+ add_compile_options(/WX)
+ ELSE()
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ ENDIF()
+endif()
+
+if (ASSIMP_ASAN)
+ MESSAGE(STATUS "AddressSanitizer enabled")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+endif()
+
+if (ASSIMP_UBSAN)
+ MESSAGE(STATUS "Undefined Behavior sanitizer enabled")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
+endif()
INCLUDE (FindPkgMacros)
INCLUDE (PrecompiledHeader)
@@ -237,13 +274,13 @@ ENDIF()
# Only generate this target if no higher-level project already has
IF (NOT TARGET uninstall)
# add make uninstall capability
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
ENDIF()
# cmake configuration files
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE)
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT})
FIND_PACKAGE( DirectX )
@@ -265,9 +302,9 @@ ENDIF( NOT ASSIMP_BUILD_ZLIB )
IF( NOT ZLIB_FOUND )
message(STATUS "compiling zlib from souces")
- include(CheckIncludeFile)
- include(CheckTypeSize)
- include(CheckFunctionExists)
+ INCLUDE(CheckIncludeFile)
+ INCLUDE(CheckTypeSize)
+ INCLUDE(CheckFunctionExists)
# compile from sources
add_subdirectory(contrib/zlib)
SET(ZLIB_FOUND 1)
@@ -472,13 +509,25 @@ if(WIN32)
if(MSVC12 OR MSVC14)
add_custom_target(UpdateAssimpLibsDebugSymbolsAndDLLs COMMENT "Copying Assimp Libraries ..." VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.dll ${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.exp ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.lib ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll ${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
- add_custom_command(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+ IF(CMAKE_GENERATOR MATCHES "^Visual Studio")
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.dll ${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.exp ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.lib ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll ${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+ ELSE()
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.dll ${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.exp ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.lib ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll ${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+ ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+ ENDIF()
ENDIF(MSVC12 OR MSVC14)
ENDIF (WIN32)
diff --git a/Readme.md b/Readme.md
index 1e8e66b92..1eaa6b8e1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,5 +1,6 @@
Open Asset Import Library (assimp)
==================================
+A library to import and export various 3d-model-formats including scene-post-processing to generate missing render data.
### Current build status ###
[](https://travis-ci.org/assimp/assimp)
[](https://ci.appveyor.com/project/kimkulling/assimp)
@@ -7,7 +8,6 @@ Open Asset Import Library (assimp)
-
[](https://coveralls.io/github/assimp/assimp?branch=master)
[](https://gitter.im/assimp/assimp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -18,6 +18,11 @@ Additionally, assimp features various __mesh post processing tools__: normals an
This is the development repo containing the latest features and bugfixes. For productive use though, we recommend one of the stable releases available from [Github Assimp Releases](https://github.com/assimp/assimp/releases).
+Monthly donations via Patreon:
+
[](http://www.patreon.com/assimp)
+
+
+
One-off donations via PayPal:
[](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4)
@@ -29,50 +34,67 @@ Please check our Wiki as well: https://github.com/assimp/assimp/wiki
A full list [is here](http://assimp.org/main_features_formats.html).
__Importers__:
-
+- 3D
- 3DS
-- BLEND (Blender)
-- DAE/Collada
-- FBX
-- IFC-STEP
+- 3MF
+- AC
+- AC3D
+- ACC
+- AMJ
- ASE
+- ASK
+- B3D;
+- BLEND (Blender)
+- BVH
+- COB
+- CMS
+- DAE/Collada
- DXF
-- HMP
+- ENFF
+- FBX
+- glTF 1.0 + GLB
+- glTF 2.0
+- HMB
+- IFC-STEP
+- IRR / IRRMESH
+- LWO
+- LWS
+- LXO
- MD2
- MD3
- MD5
- MDC
- MDL
-- NFF
-- PLY
-- STL
-- X
-- OBJ
-- OpenGEX
-- SMD
-- LWO
-- LXO
-- LWS
-- TER
-- AC3D
+- MESH / MESH.XML
+- MOT
- MS3D
-- COB
-- Q3BSP
-- XGL
-- CSM
-- BVH
-- B3D
- NDO
-- Ogre Binary
-- Ogre XML
-- Q3D
-- ASSBIN (Assimp custom format)
-- glTF (partial)
-- 3MF
+- NFF
+- OBJ
+- OFF
+- OGEX
+- PLY
+- PMX
+- PRJ
+- Q3O
+- Q3S
+- RAW
+- SCN
+- SIB
+- SMD
+- STL
+- STP
+- TER
+- UC
+- VTA
+- X
+- X3D
+- XGL
+- ZGL
Additionally, some formats are supported by dependency on non-free code or external SDKs (not built by default):
-- C4D (https://github.com/acgessler/assimp-cinema4d)
+- C4D (https://github.com/assimp/assimp/wiki/Cinema4D-&-Melange)
__Exporters__:
@@ -85,7 +107,8 @@ __Exporters__:
- JSON (for WebGl, via https://github.com/acgessler/assimp2json)
- ASSBIN
- STEP
-- glTF (partial)
+- glTF 1.0 (partial)
+- glTF 2.0 (partial)
### Building ###
Take a look into the `INSTALL` file. Our build system is CMake, if you used CMake before there is a good chance you know what to do.
@@ -96,6 +119,8 @@ Take a look into the `INSTALL` file. Our build system is CMake, if you used CMak
* [.NET](port/AssimpNET/Readme.md)
* [Pascal](port/AssimpPascal/Readme.md)
* [Javascript (Alpha)](https://github.com/makc/assimp2json)
+* [Unity 3d Plugin] (https://www.assetstore.unity3d.com/en/#!/content/91777)
+* [JVM](https://github.com/kotlin-graphics/assimp) Full jvm port (currently supported obj, ply, stl, ~collada)
### Other tools ###
[open3mod](https://github.com/acgessler/open3mod) is a powerful 3D model viewer based on Assimp's import and export abilities.
diff --git a/appveyor.yml b/appveyor.yml
index 991cf5bc1..1b87286f6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,33 +10,54 @@ branches:
only:
- master
+matrix:
+ fast_finish: true
+
+image:
+ - Visual Studio 2013
+ - Visual Studio 2015
+ - Visual Studio 2017
+
platform:
- - x86
- - x64
-
-configuration:
- - 14 2015
- - 12 2013
- #- MinGW
- #- 10 2010 # only works for x86
-
-init:
-- if "%platform%" EQU "x64" ( for %%a in (2008 2010 MinGW) do ( if "%Configuration%"=="%%a" (echo "Skipping unsupported configuration" && exit /b 1 ) ) )
+ - Win32
+ - x64
+
+configuration: Release
install:
-# Make compiler command line tools available
-- call c:\projects\assimp\scripts\appveyor\compiler_setup.bat
-
-build_script:
-- cd c:\projects\assimp
-- if "%platform%" equ "x64" (cmake CMakeLists.txt -G "Visual Studio %Configuration% Win64")
-- if "%platform%" equ "x86" (cmake CMakeLists.txt -G "Visual Studio %Configuration%")
-- if "%platform%" equ "x64" (msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln)
-- if "%platform%" equ "x86" (msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln)
-
+ - set PATH=C:\Ruby24-x64\bin;%PATH%
+ - set CMAKE_DEFINES -DASSIMP_WERROR=ON
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" set CMAKE_GENERATOR_NAME=Visual Studio 12 2013
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017
+ - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64
+ - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%"
+
+cache:
+ - code\assimp.dir\%CONFIGURATION%
+ - contrib\zlib\zlibstatic.dir\%CONFIGURATION%
+ - contrib\zlib\zlib.dir\%CONFIGURATION%
+ - tools\assimp_cmd\assimp_cmd.dir\%CONFIGURATION%
+ - tools\assimp_view\assimp_viewer.dir\%CONFIGURATION%
+ - test\unit.dir\%CONFIGURATION%
+ - bin\.mtime_cache
+
+before_build:
+ - ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json
+
+build:
+ parallel: true
+ project: Assimp.sln
+
after_build:
- - 7z a assimp.7z c:\projects\assimp\bin\release\* c:\projects\assimp\lib\release\*
+ - 7z a assimp.7z bin\%CONFIGURATION%\* lib\%CONFIGURATION%\*
+test_script:
+ - cmd: bin\%CONFIGURATION%\unit.exe --gtest_output=xml:testout.xml
+
+on_finish:
+ - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\testout.xml))
+
artifacts:
- path: assimp.7z
name: assimp_lib
diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp
index da8c918a7..820c28f90 100644
--- a/code/3DSConverter.cpp
+++ b/code/3DSConverter.cpp
@@ -56,18 +56,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace Assimp;
+static const unsigned int NotSet = 0xcdcdcdcd;
+
// ------------------------------------------------------------------------------------------------
// Setup final material indices, generae a default material if necessary
void Discreet3DSImporter::ReplaceDefaultMaterial()
{
-
// Try to find an existing material that matches the
// typical default material setting:
// - no textures
// - diffuse color (in grey!)
// NOTE: This is here to workaround the fact that some
// exporters are writing a default material, too.
- unsigned int idx = 0xcdcdcdcd;
+ unsigned int idx( NotSet );
for (unsigned int i = 0; i < mScene->mMaterials.size();++i)
{
std::string s = mScene->mMaterials[i].mName;
@@ -93,7 +94,9 @@ void Discreet3DSImporter::ReplaceDefaultMaterial()
}
idx = i;
}
- if (0xcdcdcdcd == idx)idx = (unsigned int)mScene->mMaterials.size();
+ if ( NotSet == idx ) {
+ idx = ( unsigned int )mScene->mMaterials.size();
+ }
// now iterate through all meshes and through all faces and
// find all faces that are using the default material
diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp
index 522bec307..704884a57 100644
--- a/code/3DSLoader.cpp
+++ b/code/3DSLoader.cpp
@@ -1381,7 +1381,7 @@ void Discreet3DSImporter::ParseColorChunk( aiColor3D* out, bool acceptPercent )
bGamma = true;
case Discreet3DS::CHUNK_RGBF:
- if (sizeof(ai_real) * 3 > diff) {
+ if (sizeof(float) * 3 > diff) {
*out = clrError;
return;
}
diff --git a/code/AMFImporter_Postprocess.cpp b/code/AMFImporter_Postprocess.cpp
index 085336c51..789a11eb8 100644
--- a/code/AMFImporter_Postprocess.cpp
+++ b/code/AMFImporter_Postprocess.cpp
@@ -686,7 +686,6 @@ std::list mesh_idx;
tmesh->mNumVertices = static_cast(vert_arr.size());
tmesh->mVertices = new aiVector3D[tmesh->mNumVertices];
tmesh->mColors[0] = new aiColor4D[tmesh->mNumVertices];
- tmesh->mFaces = new aiFace[face_list_cur.size()];
memcpy(tmesh->mVertices, vert_arr.data(), tmesh->mNumVertices * sizeof(aiVector3D));
memcpy(tmesh->mColors[0], col_arr.data(), tmesh->mNumVertices * sizeof(aiColor4D));
diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp
index e97f27a8a..a6fbcd8f7 100644
--- a/code/AssbinExporter.cpp
+++ b/code/AssbinExporter.cpp
@@ -139,6 +139,17 @@ inline size_t Write(IOStream * stream, const aiVector3D& v)
return t;
}
+// -----------------------------------------------------------------------------------
+// Serialize a color value
+template <>
+inline size_t Write(IOStream * stream, const aiColor3D& v)
+{
+ size_t t = Write(stream,v.r);
+ t += Write(stream,v.g);
+ t += Write(stream,v.b);
+ return t;
+}
+
// -----------------------------------------------------------------------------------
// Serialize a color value
template <>
@@ -325,7 +336,7 @@ inline size_t WriteArray(IOStream * stream, const T* in, unsigned int size)
{
AssbinChunkWriter chunk( container, ASSBIN_CHUNK_AINODE );
- size_t nb_metadata = (node->mMetaData != NULL ? node->mMetaData->mNumProperties : 0);
+ unsigned int nb_metadata = (node->mMetaData != NULL ? node->mMetaData->mNumProperties : 0);
Write(&chunk,node->mName);
Write(&chunk,node->mTransformation);
@@ -639,9 +650,9 @@ inline size_t WriteArray(IOStream * stream, const T* in, unsigned int size)
Write(&chunk,l->mAttenuationQuadratic);
}
- Write(&chunk,(const aiVector3D&)l->mColorDiffuse);
- Write(&chunk,(const aiVector3D&)l->mColorSpecular);
- Write(&chunk,(const aiVector3D&)l->mColorAmbient);
+ Write(&chunk,l->mColorDiffuse);
+ Write(&chunk,l->mColorSpecular);
+ Write(&chunk,l->mColorAmbient);
if (l->mType == aiLightSource_SPOT) {
Write(&chunk,l->mAngleInnerCone);
diff --git a/code/AssbinLoader.h b/code/AssbinLoader.h
index fc28d1667..2eb7a6488 100644
--- a/code/AssbinLoader.h
+++ b/code/AssbinLoader.h
@@ -71,7 +71,6 @@ class AssbinImporter : public BaseImporter
private:
bool shortened;
bool compressed;
-protected:
public:
virtual bool CanRead(
diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp
index 5de7bd67c..bc888fb66 100644
--- a/code/B3DImporter.cpp
+++ b/code/B3DImporter.cpp
@@ -82,6 +82,20 @@ static const aiImporterDesc desc = {
//#define DEBUG_B3D
+template
+void DeleteAllBarePointers(std::vector& x)
+{
+ for(auto p : x)
+ {
+ delete p;
+ }
+}
+
+B3DImporter::~B3DImporter()
+{
+ DeleteAllBarePointers(_animations);
+}
+
// ------------------------------------------------------------------------------------------------
bool B3DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const{
@@ -157,7 +171,8 @@ int B3DImporter::ReadByte(){
// ------------------------------------------------------------------------------------------------
int B3DImporter::ReadInt(){
if( _pos+4<=_buf.size() ){
- int n=*(int*)&_buf[_pos];
+ int n;
+ memcpy(&n, &_buf[_pos], 4);
_pos+=4;
return n;
}
@@ -168,7 +183,8 @@ int B3DImporter::ReadInt(){
// ------------------------------------------------------------------------------------------------
float B3DImporter::ReadFloat(){
if( _pos+4<=_buf.size() ){
- float n=*(float*)&_buf[_pos];
+ float n;
+ memcpy(&n, &_buf[_pos], 4);
_pos+=4;
return n;
}
@@ -558,13 +574,19 @@ aiNode *B3DImporter::ReadNODE( aiNode *parent ){
void B3DImporter::ReadBB3D( aiScene *scene ){
_textures.clear();
+
_materials.clear();
_vertices.clear();
+
_meshes.clear();
+ DeleteAllBarePointers(_nodes);
_nodes.clear();
+
_nodeAnims.clear();
+
+ DeleteAllBarePointers(_animations);
_animations.clear();
string t=ReadChunk();
diff --git a/code/B3DImporter.h b/code/B3DImporter.h
index 4d3576dc3..94644edd4 100644
--- a/code/B3DImporter.h
+++ b/code/B3DImporter.h
@@ -59,6 +59,8 @@ namespace Assimp{
class B3DImporter : public BaseImporter{
public:
+ B3DImporter() = default;
+ virtual ~B3DImporter();
virtual bool CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const;
diff --git a/code/BlenderBMesh.cpp b/code/BlenderBMesh.cpp
index c328947ae..8a13819a6 100644
--- a/code/BlenderBMesh.cpp
+++ b/code/BlenderBMesh.cpp
@@ -52,7 +52,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp
{
- template< > const std::string LogFunctions< BlenderBMeshConverter >::log_prefix = "BLEND_BMESH: ";
+ template< > const char* LogFunctions< BlenderBMeshConverter >::Prefix()
+ {
+ static auto prefix = "BLEND_BMESH: ";
+ return prefix;
+ }
}
using namespace Assimp;
diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h
index de0a5a62f..4c7d0fc26 100644
--- a/code/BlenderDNA.h
+++ b/code/BlenderDNA.h
@@ -253,7 +253,7 @@ public:
* a compiler complain is the result.
* @param dest Destination value to be written
* @param db File database, including input stream. */
- template inline void Convert (T& dest, const FileDatabase& db) const;
+ template void Convert (T& dest, const FileDatabase& db) const;
// --------------------------------------------------------
// generic converter
diff --git a/code/BlenderDNA.inl b/code/BlenderDNA.inl
index 6919c9153..8b669180c 100644
--- a/code/BlenderDNA.inl
+++ b/code/BlenderDNA.inl
@@ -589,7 +589,10 @@ template <> inline void Structure :: Convert (short& dest,const FileData
{
// automatic rescaling from short to float and vice versa (seems to be used by normals)
if (name == "float") {
- dest = static_cast(db.reader->GetF4() * 32767.f);
+ float f = db.reader->GetF4();
+ if ( f > 1.0f )
+ f = 1.0f;
+ dest = static_cast( f * 32767.f);
//db.reader->IncPtr(-4);
return;
}
diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp
index 1453ef000..6d4c97cbf 100644
--- a/code/BlenderLoader.cpp
+++ b/code/BlenderLoader.cpp
@@ -74,7 +74,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif
namespace Assimp {
- template<> const std::string LogFunctions::log_prefix = "BLEND: ";
+ template<> const char* LogFunctions::Prefix()
+ {
+ static auto prefix = "BLEND: ";
+ return prefix;
+ }
}
using namespace Assimp;
diff --git a/code/BlenderTessellator.cpp b/code/BlenderTessellator.cpp
index 2eaa938dd..9f4c51048 100644
--- a/code/BlenderTessellator.cpp
+++ b/code/BlenderTessellator.cpp
@@ -59,7 +59,11 @@ static const unsigned int BLEND_TESS_MAGIC = 0x83ed9ac3;
namspace Assimp
{
- template< > const std::string LogFunctions< BlenderTessellatorGL >::log_prefix = "BLEND_TESS_GL: ";
+ template< > const char* LogFunctions< BlenderTessellatorGL >::Prefix()
+ {
+ static auto prefix = "BLEND_TESS_GL: ";
+ return prefix;
+ }
}
using namespace Assimp;
@@ -252,7 +256,11 @@ void BlenderTessellatorGL::TessellateError( GLenum errorCode, void* )
namespace Assimp
{
- template< > const std::string LogFunctions< BlenderTessellatorP2T >::log_prefix = "BLEND_TESS_P2T: ";
+ template< > const char* LogFunctions< BlenderTessellatorP2T >::Prefix()
+ {
+ static auto prefix = "BLEND_TESS_P2T: ";
+ return prefix;
+ }
}
using namespace Assimp;
diff --git a/code/C4DImporter.cpp b/code/C4DImporter.cpp
index 252766ca6..39514f6b8 100644
--- a/code/C4DImporter.cpp
+++ b/code/C4DImporter.cpp
@@ -393,7 +393,7 @@ void C4DImporter::RecurseHierarchy(BaseObject* object, aiNode* parent)
// ------------------------------------------------------------------------------------------------
aiMesh* C4DImporter::ReadMesh(BaseObject* object)
{
- assert(object != NULL && object->GetType() == Opolygon);
+ ai_assert(object != NULL && object->GetType() == Opolygon);
// based on Melange sample code
PolygonObject* const polyObject = dynamic_cast(object);
@@ -635,7 +635,7 @@ unsigned int C4DImporter::ResolveMaterial(PolygonObject* obj)
TextureTag& ttag = dynamic_cast(*tag);
BaseMaterial* const mat = ttag.GetMaterial();
- assert(mat != NULL);
+ ai_assert(mat != NULL);
const MaterialMap::const_iterator it = material_mapping.find(mat);
if(it == material_mapping.end()) {
diff --git a/code/C4DImporter.h b/code/C4DImporter.h
index 3ba2a17c6..4dea82161 100644
--- a/code/C4DImporter.h
+++ b/code/C4DImporter.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h"
#include "LogAux.h"
-#include
+#include