diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f799c74..5c1804159 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
# Open Asset Import Library (assimp)
# ----------------------------------------------------------------------
-#
-# Copyright (c) 2006-2016, assimp team
+# Copyright (c) 2006-2017, assimp team
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms,
@@ -33,7 +32,6 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# 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 )
@@ -81,6 +79,16 @@ OPTION ( ASSIMP_COVERALLS
OFF
)
+option ( SYSTEM_IRRXML
+ "Use system installed Irrlicht/IrrXML library."
+ OFF
+)
+
+OPTION ( BUILD_DOCS
+ "Build documentation using Doxygen."
+ OFF
+)
+
IF(MSVC)
set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
OPTION( ASSIMP_INSTALL_PDB
@@ -140,7 +148,7 @@ configure_file(
configure_file(
${CMAKE_CURRENT_LIST_DIR}/include/assimp/config.h.in
- ${CMAKE_CURRENT_LIST_DIR}/include/assimp/config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/include/assimp/config.h
)
include_directories(
@@ -155,25 +163,28 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
-# Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
IF( UNIX )
+ # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit linux
ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 )
ENDIF()
-ENDIF()
-IF((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT CMAKE_COMPILER_IS_MINGW)
- IF (BUILD_SHARED_LIBS AND CMAKE_SIZEOF_VOID_P EQUAL 8) # -fPIC is only required for shared libs on 64 bit
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
- ENDIF()
+ # Use GNUInstallDirs for Unix predefined directories
+ include(GNUInstallDirs)
+ENDIF( UNIX )
+
+
+# Grouped compiler settings
+IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
# hide all not-exported symbols
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -Wall -std=c++0x" )
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -fPIC -Wall -std=c++0x")
+ SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -fPIC)
+ SET(LIBSTDC++_LIBRARIES -lstdc++)
ELSEIF(MSVC)
# enable multi-core compilation with MSVC
add_compile_options(/MP)
-ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fvisibility=hidden -Wall -Wno-long-long -pedantic -std=c++11" )
+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" )
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__ )
@@ -228,9 +239,14 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" "${C
FIND_PACKAGE( DirectX )
-IF( CMAKE_COMPILER_IS_GNUCXX )
- SET(LIBSTDC++_LIBRARIES -lstdc++)
-ENDIF( CMAKE_COMPILER_IS_GNUCXX )
+IF( BUILD_DOCS )
+ add_subdirectory(doc)
+ENDIF( BUILD_DOCS )
+
+# Look for system installed irrXML
+IF ( SYSTEM_IRRXML )
+ find_package( IrrXML REQUIRED )
+ENDIF( SYSTEM_IRRXML )
# Search for external dependencies, and build them from source if not found
# Search for zlib
@@ -326,6 +342,8 @@ ELSE (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER )
ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
+ADD_SUBDIRECTORY(contrib)
+
ADD_SUBDIRECTORY( code/ )
IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
IF ( WIN32 AND DirectX_D3DX9_LIBRARY )
@@ -429,29 +447,29 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES)
ENDIF()
if(WIN32)
- if (CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/")
- SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/")
- elseif()
- SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin32/")
- SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib32/")
- ENDIF()
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/")
+ SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/")
+ elseif()
+ SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin32/")
+ SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib32/")
+ ENDIF()
- if(MSVC12)
- SET(ASSIMP_MSVC_VERSION "vc120")
- elseif(MSVC14)
- SET(ASSIMP_MSVC_VERSION "vc140")
- ENDIF(MSVC12)
+ if(MSVC12)
+ SET(ASSIMP_MSVC_VERSION "vc120")
+ elseif(MSVC14)
+ SET(ASSIMP_MSVC_VERSION "vc140")
+ ENDIF(MSVC12)
- 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)
- ENDIF(MSVC12 OR MSVC14)
+ 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)
+ ENDIF(MSVC12 OR MSVC14)
ENDIF (WIN32)
diff --git a/Readme.md b/Readme.md
index 5d4214d89..2dc024a52 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,6 +7,7 @@ Open Asset Import Library (assimp)
+
[![Coverage Status](https://coveralls.io/repos/github/assimp/assimp/badge.svg?branch=master)](https://coveralls.io/github/assimp/assimp?branch=master)
@@ -133,10 +134,6 @@ And we also have a Gitter-channel:Gitter [![Join the chat at https://gitter.im/a
Contributions to assimp are highly appreciated. The easiest way to get involved is to submit
a pull request with your changes against the main repository's `master` branch.
-### Donate ###
-If you like assimp, consider buying us a beer (or two):
-[Donate](http://sourceforge.net/donate/index.php?group_id=226462)
-
### License ###
Our license is based on the modified, __3-clause BSD__-License.
diff --git a/assimp-config-version.cmake.in b/assimp-config-version.cmake.in
index ff48b4822..923a38798 100644
--- a/assimp-config-version.cmake.in
+++ b/assimp-config-version.cmake.in
@@ -1,8 +1,43 @@
+# Open Asset Import Library (assimp)
+# ----------------------------------------------------------------------
+# Copyright (c) 2006-2017, assimp team
+# All rights reserved.
+#
+# Redistribution and use of this software in source and binary forms,
+# with or without modification, are permitted provided that the
+# following conditions are met:
+#
+# * Redistributions of source code must retain the above
+# copyright notice, this list of conditions and the
+# following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the
+# following disclaimer in the documentation and/or other
+# materials provided with the distribution.
+#
+# * Neither the name of the assimp team, nor the names of its
+# contributors may be used to endorse or promote products
+# derived from this software without specific prior
+# written permission of the assimp team.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#----------------------------------------------------------------------
set( PACKAGE_VERSION "@ASSIMP_VERSION@" )
if( "${PACKAGE_FIND_VERSION}" VERSION_EQUAL "@ASSIMP_VERSION@")
set(PACKAGE_VERSION_EXACT 1)
endif()
-if( "${PACKAGE_FIND_VERSION_MAJOR}.${PACKAGE_FIND_VERSION_MINOR}" EQUAL "@ASSIMP_SOVERSION@" )
+if( "${PACKAGE_FIND_VERSION_MAJOR}.${PACKAGE_FIND_VERSION_MINOR}" EQUAL "@ASSIMP_VERSION@" )
set(PACKAGE_VERSION_COMPATIBLE 1)
elseif( "${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "@ASSIMP_VERSION_MAJOR@" )
# for now backward compatible if minor version is less
diff --git a/cmake-modules/FindIrrXML.cmake b/cmake-modules/FindIrrXML.cmake
new file mode 100644
index 000000000..5434e0b86
--- /dev/null
+++ b/cmake-modules/FindIrrXML.cmake
@@ -0,0 +1,17 @@
+# Find IrrXMl from irrlicht project
+#
+# Find LibIrrXML headers and library
+#
+# IRRXML_FOUND - IrrXML found
+# IRRXML_INCLUDE_DIR - Headers location
+# IRRXML_LIBRARY - IrrXML main library
+
+find_path(IRRXML_INCLUDE_DIR irrXML.h
+ PATH_SUFFIXES include/irrlicht include/irrxml)
+find_library(IRRXML_LIBRARY IrrXML)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(IrrXML REQUIRED_VARS IRRXML_INCLUDE_DIR IRRXML_LIBRARY)
+
+
+mark_as_advanced(IRRXML_INCLUDE_DIR IRRXML_LIBRARY)
diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp
index 8390dd216..da8c918a7 100644
--- a/code/3DSConverter.cpp
+++ b/code/3DSConverter.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.
diff --git a/code/3DSExporter.cpp b/code/3DSExporter.cpp
index 1d49a536b..4be83355a 100644
--- a/code/3DSExporter.cpp
+++ b/code/3DSExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/3DSExporter.h b/code/3DSExporter.h
index 8bcce338d..dd3c4d427 100644
--- a/code/3DSExporter.h
+++ b/code/3DSExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/3DSHelper.h b/code/3DSHelper.h
index 699767cee..d5a51dfb7 100644
--- a/code/3DSHelper.h
+++ b/code/3DSHelper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp
index f0285a899..522bec307 100644
--- a/code/3DSLoader.cpp
+++ b/code/3DSLoader.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.
diff --git a/code/3DSLoader.h b/code/3DSLoader.h
index 26b2a935e..0e377180b 100644
--- a/code/3DSLoader.h
+++ b/code/3DSLoader.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ACLoader.cpp b/code/ACLoader.cpp
index bca24e948..a30baa75a 100644
--- a/code/ACLoader.cpp
+++ b/code/ACLoader.cpp
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/ACLoader.h b/code/ACLoader.h
index 52563adad..4b202b77a 100644
--- a/code/ACLoader.h
+++ b/code/ACLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/AMFImporter.cpp b/code/AMFImporter.cpp
index 0ebfcbcc4..e9211fe53 100644
--- a/code/AMFImporter.cpp
+++ b/code/AMFImporter.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.
diff --git a/code/AMFImporter.hpp b/code/AMFImporter.hpp
index 9731f2e41..561ec3c8f 100644
--- a/code/AMFImporter.hpp
+++ b/code/AMFImporter.hpp
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/AMFImporter_Geometry.cpp b/code/AMFImporter_Geometry.cpp
index 493d06bff..afba3f2bc 100644
--- a/code/AMFImporter_Geometry.cpp
+++ b/code/AMFImporter_Geometry.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.
diff --git a/code/AMFImporter_Macro.hpp b/code/AMFImporter_Macro.hpp
index 973e17490..b7c0f9863 100644
--- a/code/AMFImporter_Macro.hpp
+++ b/code/AMFImporter_Macro.hpp
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/AMFImporter_Material.cpp b/code/AMFImporter_Material.cpp
index 4550f6fe2..d15099fac 100644
--- a/code/AMFImporter_Material.cpp
+++ b/code/AMFImporter_Material.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.
diff --git a/code/AMFImporter_Node.hpp b/code/AMFImporter_Node.hpp
index f8c3a7933..cb8b0b66d 100644
--- a/code/AMFImporter_Node.hpp
+++ b/code/AMFImporter_Node.hpp
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
@@ -59,18 +60,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/// \class CAMFImporter_NodeElement
/// Base class for elements of nodes.
-class CAMFImporter_NodeElement
-{
- /***********************************************/
- /******************** Types ********************/
- /***********************************************/
+class CAMFImporter_NodeElement {
public:
-
- /// \enum EType
/// Define what data type contain node element.
- enum EType
- {
+ enum EType {
ENET_Color, ///< Color element: .
ENET_Constellation,///< Grouping element: .
ENET_Coordinates, ///< Coordinates element: .
@@ -91,52 +85,37 @@ public:
ENET_Invalid ///< Element has invalid type and possible contain invalid data.
};
- /***********************************************/
- /****************** Constants ******************/
- /***********************************************/
-
-public:
-
const EType Type;///< Type of element.
-
- /***********************************************/
- /****************** Variables ******************/
- /***********************************************/
-
-public:
-
std::string ID;///< ID of element.
- CAMFImporter_NodeElement* Parent;///< Parrent element. If nullptr then this node is root.
+ CAMFImporter_NodeElement* Parent;///< Parent element. If nullptr then this node is root.
std::list Child;///< Child elements.
- /***********************************************/
- /****************** Functions ******************/
- /***********************************************/
+public: /// Destructor, virtual..
+ virtual ~CAMFImporter_NodeElement() {
+ // empty
+ }
private:
-
- /// \fn CAMFImporter_NodeElement(const CAMFImporter_NodeElement& pNodeElement)
/// Disabled copy constructor.
CAMFImporter_NodeElement(const CAMFImporter_NodeElement& pNodeElement);
- /// \fn CAMFImporter_NodeElement& operator=(const CAMFImporter_NodeElement& pNodeElement)
/// Disabled assign operator.
CAMFImporter_NodeElement& operator=(const CAMFImporter_NodeElement& pNodeElement);
- /// \fn CAMFImporter_NodeElement()
/// Disabled default constructor.
CAMFImporter_NodeElement();
protected:
-
- /// \fn CAMFImporter_NodeElement(const EType pType, CAMFImporter_NodeElement* pParent)
/// In constructor inheritor must set element type.
/// \param [in] pType - element type.
/// \param [in] pParent - parent element.
CAMFImporter_NodeElement(const EType pType, CAMFImporter_NodeElement* pParent)
- : Type(pType), Parent(pParent)
- {}
-
+ : Type(pType)
+ , ID()
+ , Parent(pParent)
+ , Child() {
+ // empty
+ }
};// class IAMFImporter_NodeElement
/// \struct CAMFImporter_NodeElement_Constellation
@@ -399,25 +378,23 @@ struct CAMFImporter_NodeElement_Triangle : public CAMFImporter_NodeElement
};// struct CAMFImporter_NodeElement_Triangle
-/// \struct CAMFImporter_NodeElement_Texture
/// Structure that define texture node.
-struct CAMFImporter_NodeElement_Texture : public CAMFImporter_NodeElement
-{
- /****************** Variables ******************/
-
+struct CAMFImporter_NodeElement_Texture : public CAMFImporter_NodeElement {
size_t Width, Height, Depth;///< Size of the texture.
std::vector Data;///< Data of the texture.
bool Tiled;
- /****************** Functions ******************/
-
- /// \fn CAMFImporter_NodeElement_Texture(CAMFImporter_NodeElement* pParent)
/// Constructor.
/// \param [in] pParent - pointer to parent node.
CAMFImporter_NodeElement_Texture(CAMFImporter_NodeElement* pParent)
- : CAMFImporter_NodeElement(ENET_Texture, pParent)
- {}
-
+ : CAMFImporter_NodeElement(ENET_Texture, pParent)
+ , Width( 0 )
+ , Height( 0 )
+ , Depth( 0 )
+ , Data()
+ , Tiled( false ){
+ // empty
+ }
};// struct CAMFImporter_NodeElement_Texture
#endif // INCLUDED_AI_AMF_IMPORTER_NODE_H
diff --git a/code/AMFImporter_Postprocess.cpp b/code/AMFImporter_Postprocess.cpp
index 6f82d5367..3a48d3b42 100644
--- a/code/AMFImporter_Postprocess.cpp
+++ b/code/AMFImporter_Postprocess.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.
@@ -260,21 +261,20 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string&
size_t off_b = 0;
// Calculate size of the target array and rule how data will be copied.
- if ( nullptr != src_texture ) {
- if(!pID_R.empty()) {
- tex_size += src_texture[0]->Data.size(); step++, off_g++, off_b++;
- }
- if(!pID_G.empty()) {
- tex_size += src_texture[1]->Data.size(); step++, off_b++;
- }
- if(!pID_B.empty()) {
- tex_size += src_texture[2]->Data.size(); step++;
- }
- if(!pID_A.empty()) {
- tex_size += src_texture[3]->Data.size(); step++;
- }
+ if(!pID_R.empty() && nullptr != src_texture[ 0 ] ) {
+ tex_size += src_texture[0]->Data.size(); step++, off_g++, off_b++;
}
- // Create target array.
+ if(!pID_G.empty() && nullptr != src_texture[ 1 ] ) {
+ tex_size += src_texture[1]->Data.size(); step++, off_b++;
+ }
+ if(!pID_B.empty() && nullptr != src_texture[ 2 ] ) {
+ tex_size += src_texture[2]->Data.size(); step++;
+ }
+ if(!pID_A.empty() && nullptr != src_texture[ 3 ] ) {
+ tex_size += src_texture[3]->Data.size(); step++;
+ }
+
+ // Create target array.
converted_texture.Data = new uint8_t[tex_size];
// And copy data
auto CopyTextureData = [&](const std::string& pID, const size_t pOffset, const size_t pStep, const uint8_t pSrcTexNum) -> void
diff --git a/code/ASELoader.cpp b/code/ASELoader.cpp
index 24f63d2d0..2ea5f7b1c 100644
--- a/code/ASELoader.cpp
+++ b/code/ASELoader.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.
diff --git a/code/ASELoader.h b/code/ASELoader.h
index 6ef4d28f8..d1a5769de 100644
--- a/code/ASELoader.h
+++ b/code/ASELoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ASEParser.cpp b/code/ASEParser.cpp
index b06447cfa..e3ec0fe34 100644
--- a/code/ASEParser.cpp
+++ b/code/ASEParser.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.
diff --git a/code/ASEParser.h b/code/ASEParser.h
index 095d089d4..cdae4affe 100644
--- a/code/ASEParser.h
+++ b/code/ASEParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp
index fcb32c70a..b03a45309 100644
--- a/code/AssbinExporter.cpp
+++ b/code/AssbinExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/AssbinExporter.h b/code/AssbinExporter.h
index 4a0219c04..55bb9fc82 100644
--- a/code/AssbinExporter.h
+++ b/code/AssbinExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/AssbinLoader.cpp b/code/AssbinLoader.cpp
index 408620c3a..d5a50b40a 100644
--- a/code/AssbinLoader.cpp
+++ b/code/AssbinLoader.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.
diff --git a/code/AssbinLoader.h b/code/AssbinLoader.h
index 75c0f3a16..ece67c983 100644
--- a/code/AssbinLoader.h
+++ b/code/AssbinLoader.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Assimp.cpp b/code/Assimp.cpp
index 092c40979..11dd5b939 100644
--- a/code/Assimp.cpp
+++ b/code/Assimp.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.
diff --git a/code/AssimpCExport.cpp b/code/AssimpCExport.cpp
index fff9d8e21..d3c3d3298 100644
--- a/code/AssimpCExport.cpp
+++ b/code/AssimpCExport.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.
diff --git a/code/AssxmlExporter.cpp b/code/AssxmlExporter.cpp
index 677bea265..8019232c0 100644
--- a/code/AssxmlExporter.cpp
+++ b/code/AssxmlExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/AssxmlExporter.h b/code/AssxmlExporter.h
index ba9921f70..9694f74a3 100644
--- a/code/AssxmlExporter.h
+++ b/code/AssxmlExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp
index e2a685d1a..5de7bd67c 100644
--- a/code/B3DImporter.cpp
+++ b/code/B3DImporter.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.
diff --git a/code/B3DImporter.h b/code/B3DImporter.h
index 167078655..4d3576dc3 100644
--- a/code/B3DImporter.h
+++ b/code/B3DImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BVHLoader.cpp b/code/BVHLoader.cpp
index 1324dcdca..c20cbec4e 100644
--- a/code/BVHLoader.cpp
+++ b/code/BVHLoader.cpp
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/BVHLoader.h b/code/BVHLoader.h
index 8a163d1e7..6a89e1aaf 100644
--- a/code/BVHLoader.h
+++ b/code/BVHLoader.h
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp
index e96b35cf2..e8d547783 100644
--- a/code/BaseImporter.cpp
+++ b/code/BaseImporter.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.
diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index 781318be8..06ed0691f 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BaseProcess.cpp b/code/BaseProcess.cpp
index 580f89cdb..9e175d315 100644
--- a/code/BaseProcess.cpp
+++ b/code/BaseProcess.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.
diff --git a/code/BaseProcess.h b/code/BaseProcess.h
index e4838fa7f..aa873f717 100644
--- a/code/BaseProcess.h
+++ b/code/BaseProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp
index ae6d62083..b1cf8a409 100644
--- a/code/Bitmap.cpp
+++ b/code/Bitmap.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.
diff --git a/code/Bitmap.h b/code/Bitmap.h
index f665605b9..96c994dbe 100644
--- a/code/Bitmap.h
+++ b/code/Bitmap.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/BlenderDNA.cpp b/code/BlenderDNA.cpp
index 5dbc950aa..23ece913f 100644
--- a/code/BlenderDNA.cpp
+++ b/code/BlenderDNA.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h
index dbddad336..c09f1ca42 100644
--- a/code/BlenderDNA.h
+++ b/code/BlenderDNA.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderDNA.inl b/code/BlenderDNA.inl
index 25aa81c91..6919c9153 100644
--- a/code/BlenderDNA.inl
+++ b/code/BlenderDNA.inl
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderIntermediate.h b/code/BlenderIntermediate.h
index c79bc08f2..0fc9cdafc 100644
--- a/code/BlenderIntermediate.h
+++ b/code/BlenderIntermediate.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp
index ea443b14b..b9a4e8890 100644
--- a/code/BlenderLoader.cpp
+++ b/code/BlenderLoader.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.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderLoader.h b/code/BlenderLoader.h
index 505409260..66fff594b 100644
--- a/code/BlenderLoader.h
+++ b/code/BlenderLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderModifier.cpp b/code/BlenderModifier.cpp
index f903a1380..d71ae5098 100644
--- a/code/BlenderModifier.cpp
+++ b/code/BlenderModifier.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderModifier.h b/code/BlenderModifier.h
index 1d176756e..9fa8c74ee 100644
--- a/code/BlenderModifier.h
+++ b/code/BlenderModifier.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderScene.h b/code/BlenderScene.h
index fe6d6e14c..36094eabd 100644
--- a/code/BlenderScene.h
+++ b/code/BlenderScene.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -638,6 +639,7 @@ struct Base : ElemBase {
Base()
: ElemBase()
+ , prev( nullptr )
, next()
, object() {
// empty
@@ -784,10 +786,12 @@ struct Tex : ElemBase {
//char use_nodes;
Tex()
- : ElemBase() {
+ : ElemBase()
+ , imaflag( ImageFlags_INTERPOL )
+ , type( Type_CLOUDS )
+ , ima() {
// empty
}
-
};
// -------------------------------------------------------------------------------
diff --git a/code/BlenderTessellator.cpp b/code/BlenderTessellator.cpp
index 60879b417..2eaa938dd 100644
--- a/code/BlenderTessellator.cpp
+++ b/code/BlenderTessellator.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlenderTessellator.h b/code/BlenderTessellator.h
index 530bd2c3e..47d3a4665 100644
--- a/code/BlenderTessellator.h
+++ b/code/BlenderTessellator.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/BlobIOSystem.h b/code/BlobIOSystem.h
index bb76ffadb..f406ea0fe 100644
--- a/code/BlobIOSystem.h
+++ b/code/BlobIOSystem.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/ByteSwapper.h b/code/ByteSwapper.h
index 37538e7cb..e5c7569f1 100644
--- a/code/ByteSwapper.h
+++ b/code/ByteSwapper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/CInterfaceIOWrapper.cpp b/code/CInterfaceIOWrapper.cpp
index 0a80c1990..9de75b683 100644
--- a/code/CInterfaceIOWrapper.cpp
+++ b/code/CInterfaceIOWrapper.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.
diff --git a/code/CInterfaceIOWrapper.h b/code/CInterfaceIOWrapper.h
index 0172fb49f..78cac0cf9 100644
--- a/code/CInterfaceIOWrapper.h
+++ b/code/CInterfaceIOWrapper.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 60d0ef23e..fe0b58af6 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1,7 +1,8 @@
# Open Asset Import Library (assimp)
# ----------------------------------------------------------------------
#
-# Copyright (c) 2006-2016, assimp team
+# Copyright (c) 2006-2017, assimp team
+
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms,
@@ -58,7 +59,7 @@ SET( PUBLIC_HEADERS
${HEADER_PATH}/camera.h
${HEADER_PATH}/color4.h
${HEADER_PATH}/color4.inl
- ${HEADER_PATH}/config.h
+ ${CMAKE_BINARY_DIR}/include/assimp/config.h
${HEADER_PATH}/defs.h
${HEADER_PATH}/cfileio.h
${HEADER_PATH}/light.h
@@ -569,6 +570,9 @@ SET( PostProcessing_SRCS
)
SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
+SET( IrrXML_SRCS irrXMLWrapper.h )
+SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})
+
ADD_ASSIMP_IMPORTER( Q3D
Q3DLoader.cpp
Q3DLoader.h
@@ -681,18 +685,6 @@ SET( Extra_SRCS
)
SOURCE_GROUP( Extra FILES ${Extra_SRCS})
-SET( IrrXML_SRCS
- irrXMLWrapper.h
- ../contrib/irrXML/CXMLReaderImpl.h
- ../contrib/irrXML/heapsort.h
- ../contrib/irrXML/irrArray.h
- ../contrib/irrXML/irrString.h
- ../contrib/irrXML/irrTypes.h
- ../contrib/irrXML/irrXML.cpp
- ../contrib/irrXML/irrXML.h
-)
-SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})
-
SET( ConvertUTF_SRCS
../contrib/ConvertUTF/ConvertUTF.h
../contrib/ConvertUTF/ConvertUTF.c
@@ -848,7 +840,8 @@ SET( assimp_src
ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD )
INCLUDE_DIRECTORIES(
- ../contrib/openddlparser/include
+ ${IRRXML_INCLUDE_DIR}
+ ../contrib/openddlparser/include
)
IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
@@ -858,7 +851,7 @@ ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
ADD_LIBRARY( assimp ${assimp_src} )
-TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} )
+TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} )
if(ANDROID AND ASSIMP_ANDROID_JNIIOSYSTEM)
set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI)
@@ -936,7 +929,7 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
CONFIGURATIONS Debug
)
- install(FILES ${Assimp_BINARY_DIR}/code/RelWithDebInfo/assimp.pdb
+ install(FILES ${Assimp_BINARY_DIR}/code/RelWithDebInfo/assimp${LIBRARY_SUFFIX}.pdb
DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
CONFIGURATIONS RelWithDebInfo
)
diff --git a/code/COBLoader.cpp b/code/COBLoader.cpp
index e1d238a1c..a92e231a5 100644
--- a/code/COBLoader.cpp
+++ b/code/COBLoader.cpp
@@ -2,7 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -941,20 +941,22 @@ void COBImporter::UnsupportedChunk_Binary( StreamReaderLE& reader, const ChunkIn
// ------------------------------------------------------------------------------------------------
// tiny utility guard to aid me at staying within chunk boundaries.
class chunk_guard {
-
public:
-
chunk_guard(const COB::ChunkInfo& nfo, StreamReaderLE& reader)
- : nfo(nfo)
- , reader(reader)
- , cur(reader.GetCurrentPos())
- {
+ : nfo(nfo)
+ , reader(reader)
+ , cur(reader.GetCurrentPos()) {
}
~chunk_guard() {
// don't do anything if the size is not given
if(nfo.size != static_cast(-1)) {
- reader.IncPtr(static_cast(nfo.size)-reader.GetCurrentPos()+cur);
+ try {
+ reader.IncPtr( static_cast< int >( nfo.size ) - reader.GetCurrentPos() + cur );
+ } catch ( DeadlyImportError e ) {
+ // out of limit so correct the value
+ reader.IncPtr( reader.GetReadLimit() );
+ }
}
}
diff --git a/code/COBLoader.h b/code/COBLoader.h
index efccc448d..46dc86f62 100644
--- a/code/COBLoader.h
+++ b/code/COBLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/COBScene.h b/code/COBScene.h
index a73a6df3a..a1d6ebc27 100644
--- a/code/COBScene.h
+++ b/code/COBScene.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/CSMLoader.cpp b/code/CSMLoader.cpp
index 1d10f3965..eeb6986b0 100644
--- a/code/CSMLoader.cpp
+++ b/code/CSMLoader.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.
diff --git a/code/CSMLoader.h b/code/CSMLoader.h
index 71abb7e91..55a632dc6 100644
--- a/code/CSMLoader.h
+++ b/code/CSMLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/CalcTangentsProcess.cpp b/code/CalcTangentsProcess.cpp
index c13ffcb24..2af16fcc0 100644
--- a/code/CalcTangentsProcess.cpp
+++ b/code/CalcTangentsProcess.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.
diff --git a/code/CalcTangentsProcess.h b/code/CalcTangentsProcess.h
index 4a6122668..a22785639 100644
--- a/code/CalcTangentsProcess.h
+++ b/code/CalcTangentsProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index 1bac8b7f6..3966d0d79 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -690,7 +691,6 @@ void ColladaExporter::WriteMaterials()
materials[a].shininess.exist = mat->Get( AI_MATKEY_SHININESS, materials[a].shininess.value) == aiReturn_SUCCESS;
materials[a].transparency.exist = mat->Get( AI_MATKEY_OPACITY, materials[a].transparency.value) == aiReturn_SUCCESS;
- materials[a].transparency.value = materials[a].transparency.value;
materials[a].index_refraction.exist = mat->Get( AI_MATKEY_REFRACTI, materials[a].index_refraction.value) == aiReturn_SUCCESS;
}
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index e8bd9b71f..cb1f31066 100644
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ColladaHelper.h b/code/ColladaHelper.h
index e805ed0a0..8ccd6cafe 100644
--- a/code/ColladaHelper.h
+++ b/code/ColladaHelper.h
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index 2a30fc5e2..457b62c20 100644
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.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.
diff --git a/code/ColladaLoader.h b/code/ColladaLoader.h
index 2b31531d2..8388ab01e 100644
--- a/code/ColladaLoader.h
+++ b/code/ColladaLoader.h
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp
index 3ed41a441..851a31edd 100644
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.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.
diff --git a/code/ColladaParser.h b/code/ColladaParser.h
index 4f2b6b8ce..b34974470 100644
--- a/code/ColladaParser.h
+++ b/code/ColladaParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
- Copyright (c) 2006-2016, assimp team
+ Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ComputeUVMappingProcess.cpp b/code/ComputeUVMappingProcess.cpp
index 0fee43a70..c49666de8 100644
--- a/code/ComputeUVMappingProcess.cpp
+++ b/code/ComputeUVMappingProcess.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ComputeUVMappingProcess.h b/code/ComputeUVMappingProcess.h
index db4287863..1de97961d 100644
--- a/code/ComputeUVMappingProcess.h
+++ b/code/ComputeUVMappingProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ConvertToLHProcess.cpp b/code/ConvertToLHProcess.cpp
index 017282796..6a43d5c2d 100644
--- a/code/ConvertToLHProcess.cpp
+++ b/code/ConvertToLHProcess.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.
diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h
index 0c5f91c96..130fdcafd 100644
--- a/code/ConvertToLHProcess.h
+++ b/code/ConvertToLHProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/CreateAnimMesh.h b/code/CreateAnimMesh.h
index c5ceb4028..84cab8932 100644
--- a/code/CreateAnimMesh.h
+++ b/code/CreateAnimMesh.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp
index 500b27528..0f06d4a1e 100644
--- a/code/D3MFImporter.cpp
+++ b/code/D3MFImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -97,21 +98,31 @@ public:
}
- void ImportXml(aiScene* scene) {
+ void ImportXml(aiScene* scene)
+ {
+
+ scene->mFlags |= AI_SCENE_FLAGS_NON_VERBOSE_FORMAT;
+
scene->mRootNode = new aiNode();
std::vector children;
- while(ReadToEndElement(D3MF::XmlTag::model)) {
- if(xmlReader->getNodeName() == D3MF::XmlTag::object) {
+ while(ReadToEndElement(D3MF::XmlTag::model))
+ {
+
+ if(xmlReader->getNodeName() == D3MF::XmlTag::object)
+ {
children.push_back(ReadObject(scene));
- } else if(xmlReader->getNodeName() == D3MF::XmlTag::build) {
- // ???
+ }
+ else if(xmlReader->getNodeName() == D3MF::XmlTag::build)
+ {
+
}
}
if(scene->mRootNode->mName.length == 0)
scene->mRootNode->mName.Set("3MF");
+
scene->mNumMeshes = static_cast(meshes.size());
scene->mMeshes = new aiMesh*[scene->mNumMeshes]();
@@ -237,9 +248,7 @@ private:
mesh->mFaces = new aiFace[mesh->mNumFaces];
mesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
-
std::copy(faces.begin(), faces.end(), mesh->mFaces);
-
}
aiFace ReadTriangle()
diff --git a/code/D3MFImporter.h b/code/D3MFImporter.h
index 372dc59ed..fb65d8606 100644
--- a/code/D3MFImporter.h
+++ b/code/D3MFImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/D3MFOpcPackage.cpp b/code/D3MFOpcPackage.cpp
index a9633b6a5..562b891be 100644
--- a/code/D3MFOpcPackage.cpp
+++ b/code/D3MFOpcPackage.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/D3MFOpcPackage.h b/code/D3MFOpcPackage.h
index e63243676..e46eb7636 100644
--- a/code/D3MFOpcPackage.h
+++ b/code/D3MFOpcPackage.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/DXFHelper.h b/code/DXFHelper.h
index 1947469a8..e16b7f1aa 100644
--- a/code/DXFHelper.h
+++ b/code/DXFHelper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/DXFLoader.cpp b/code/DXFLoader.cpp
index f1acb65f2..1e932e509 100644
--- a/code/DXFLoader.cpp
+++ b/code/DXFLoader.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.
diff --git a/code/DXFLoader.h b/code/DXFLoader.h
index 2b61c19a9..64822e9e2 100644
--- a/code/DXFLoader.h
+++ b/code/DXFLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/DeboneProcess.cpp b/code/DeboneProcess.cpp
index 41941b4ac..b43dcad84 100644
--- a/code/DeboneProcess.cpp
+++ b/code/DeboneProcess.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/DeboneProcess.h b/code/DeboneProcess.h
index 5920473e2..75f158c03 100644
--- a/code/DeboneProcess.h
+++ b/code/DeboneProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/DefaultIOStream.cpp b/code/DefaultIOStream.cpp
index db1b6baf8..cce9af19d 100644
--- a/code/DefaultIOStream.cpp
+++ b/code/DefaultIOStream.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.
diff --git a/code/DefaultIOSystem.cpp b/code/DefaultIOSystem.cpp
index 711476806..ca4ae4564 100644
--- a/code/DefaultIOSystem.cpp
+++ b/code/DefaultIOSystem.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.
diff --git a/code/DefaultLogger.cpp b/code/DefaultLogger.cpp
index 106c51561..5a6f19544 100644
--- a/code/DefaultLogger.cpp
+++ b/code/DefaultLogger.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.
diff --git a/code/DefaultProgressHandler.h b/code/DefaultProgressHandler.h
index b729e4bfa..6cd872eaa 100644
--- a/code/DefaultProgressHandler.h
+++ b/code/DefaultProgressHandler.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Exporter.cpp b/code/Exporter.cpp
index 65e40eec2..5f0e75200 100644
--- a/code/Exporter.cpp
+++ b/code/Exporter.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.
diff --git a/code/FBXAnimation.cpp b/code/FBXAnimation.cpp
index 09d7c184d..6b2c1eff6 100644
--- a/code/FBXAnimation.cpp
+++ b/code/FBXAnimation.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp
index 550859345..17cb942ff 100644
--- a/code/FBXBinaryTokenizer.cpp
+++ b/code/FBXBinaryTokenizer.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXCompileConfig.h b/code/FBXCompileConfig.h
index c3934e0c8..d4d40b056 100644
--- a/code/FBXCompileConfig.h
+++ b/code/FBXCompileConfig.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index 30d332f5b..b2e8e4a91 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXConverter.h b/code/FBXConverter.h
index ddbbbbf25..8a62d8811 100644
--- a/code/FBXConverter.h
+++ b/code/FBXConverter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXDeformer.cpp b/code/FBXDeformer.cpp
index c7cc52e5f..637144ab1 100644
--- a/code/FBXDeformer.cpp
+++ b/code/FBXDeformer.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXDocument.cpp b/code/FBXDocument.cpp
index 0d5e24f96..d2f26c4c7 100644
--- a/code/FBXDocument.cpp
+++ b/code/FBXDocument.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXDocument.h b/code/FBXDocument.h
index 9c446250b..5c8bc610f 100644
--- a/code/FBXDocument.h
+++ b/code/FBXDocument.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXDocumentUtil.cpp b/code/FBXDocumentUtil.cpp
index 442c60b5d..27921b920 100644
--- a/code/FBXDocumentUtil.cpp
+++ b/code/FBXDocumentUtil.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXImportSettings.h b/code/FBXImportSettings.h
index df7cdbd37..ca7435f4c 100644
--- a/code/FBXImportSettings.h
+++ b/code/FBXImportSettings.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXImporter.cpp b/code/FBXImporter.cpp
index 83b74f8cd..7078fde58 100644
--- a/code/FBXImporter.cpp
+++ b/code/FBXImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXImporter.h b/code/FBXImporter.h
index 350ecfb67..43be97ffa 100644
--- a/code/FBXImporter.h
+++ b/code/FBXImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXMaterial.cpp b/code/FBXMaterial.cpp
index e5e9cd259..5391c0a45 100644
--- a/code/FBXMaterial.cpp
+++ b/code/FBXMaterial.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXMeshGeometry.cpp b/code/FBXMeshGeometry.cpp
index e7a105d45..63de9460a 100644
--- a/code/FBXMeshGeometry.cpp
+++ b/code/FBXMeshGeometry.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXMeshGeometry.h b/code/FBXMeshGeometry.h
index 690a86a01..19f7b0a9c 100644
--- a/code/FBXMeshGeometry.h
+++ b/code/FBXMeshGeometry.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXModel.cpp b/code/FBXModel.cpp
index 27e5429c3..90939c142 100644
--- a/code/FBXModel.cpp
+++ b/code/FBXModel.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXNodeAttribute.cpp b/code/FBXNodeAttribute.cpp
index 1638d6751..bcf079c2e 100644
--- a/code/FBXNodeAttribute.cpp
+++ b/code/FBXNodeAttribute.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXParser.cpp b/code/FBXParser.cpp
index 6562ef41d..428c29a62 100644
--- a/code/FBXParser.cpp
+++ b/code/FBXParser.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXParser.h b/code/FBXParser.h
index 6bc34272a..d2b2c8bb5 100644
--- a/code/FBXParser.h
+++ b/code/FBXParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXProperties.cpp b/code/FBXProperties.cpp
index 23d072b18..774beac3c 100644
--- a/code/FBXProperties.cpp
+++ b/code/FBXProperties.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXProperties.h b/code/FBXProperties.h
index ed7af673d..a89a858be 100644
--- a/code/FBXProperties.h
+++ b/code/FBXProperties.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXTokenizer.cpp b/code/FBXTokenizer.cpp
index 7ede49f39..881dcf53d 100644
--- a/code/FBXTokenizer.cpp
+++ b/code/FBXTokenizer.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXTokenizer.h b/code/FBXTokenizer.h
index 3b60142e4..f8af0ca16 100644
--- a/code/FBXTokenizer.h
+++ b/code/FBXTokenizer.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXUtil.cpp b/code/FBXUtil.cpp
index 280349d20..4fd91e18f 100644
--- a/code/FBXUtil.cpp
+++ b/code/FBXUtil.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FBXUtil.h b/code/FBXUtil.h
index 7da51dac8..c1d9459b3 100644
--- a/code/FBXUtil.h
+++ b/code/FBXUtil.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FindDegenerates.cpp b/code/FindDegenerates.cpp
index 62750bfad..32a09f0c0 100644
--- a/code/FindDegenerates.cpp
+++ b/code/FindDegenerates.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.
diff --git a/code/FindDegenerates.h b/code/FindDegenerates.h
index 7b945ea3a..9bd410dcd 100644
--- a/code/FindDegenerates.h
+++ b/code/FindDegenerates.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FindInstancesProcess.cpp b/code/FindInstancesProcess.cpp
index 479f6561e..ab2d2257b 100644
--- a/code/FindInstancesProcess.cpp
+++ b/code/FindInstancesProcess.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.
diff --git a/code/FindInstancesProcess.h b/code/FindInstancesProcess.h
index 14876045c..dc4396566 100644
--- a/code/FindInstancesProcess.h
+++ b/code/FindInstancesProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FindInvalidDataProcess.cpp b/code/FindInvalidDataProcess.cpp
index bed2eee06..77915bc4e 100644
--- a/code/FindInvalidDataProcess.cpp
+++ b/code/FindInvalidDataProcess.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.
diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h
index 8a1df21fd..cc0ef946d 100644
--- a/code/FindInvalidDataProcess.h
+++ b/code/FindInvalidDataProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/FixNormalsStep.cpp b/code/FixNormalsStep.cpp
index 0325f8dfb..05d05e873 100644
--- a/code/FixNormalsStep.cpp
+++ b/code/FixNormalsStep.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.
diff --git a/code/FixNormalsStep.h b/code/FixNormalsStep.h
index 5dea5d868..b47155ccd 100644
--- a/code/FixNormalsStep.h
+++ b/code/FixNormalsStep.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/GenFaceNormalsProcess.cpp b/code/GenFaceNormalsProcess.cpp
index 9218d9db8..82d80db77 100644
--- a/code/GenFaceNormalsProcess.cpp
+++ b/code/GenFaceNormalsProcess.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.
diff --git a/code/GenFaceNormalsProcess.h b/code/GenFaceNormalsProcess.h
index f56570078..024c74a28 100644
--- a/code/GenFaceNormalsProcess.h
+++ b/code/GenFaceNormalsProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/GenVertexNormalsProcess.cpp b/code/GenVertexNormalsProcess.cpp
index c205ac5ac..93c0e1351 100644
--- a/code/GenVertexNormalsProcess.cpp
+++ b/code/GenVertexNormalsProcess.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.
diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h
index caa327aa3..0471ed6b0 100644
--- a/code/GenVertexNormalsProcess.h
+++ b/code/GenVertexNormalsProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/GenericProperty.h b/code/GenericProperty.h
index 507bfb693..8632e7577 100644
--- a/code/GenericProperty.h
+++ b/code/GenericProperty.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/HMPFileData.h b/code/HMPFileData.h
index cff3b6b18..3c060ba1a 100644
--- a/code/HMPFileData.h
+++ b/code/HMPFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/HMPLoader.cpp b/code/HMPLoader.cpp
index fce0daf4a..a6a0262bf 100644
--- a/code/HMPLoader.cpp
+++ b/code/HMPLoader.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.
diff --git a/code/HMPLoader.h b/code/HMPLoader.h
index 036b37894..546643e8d 100644
--- a/code/HMPLoader.h
+++ b/code/HMPLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/HalfLifeFileData.h b/code/HalfLifeFileData.h
index 9837a4e29..9a498d14c 100644
--- a/code/HalfLifeFileData.h
+++ b/code/HalfLifeFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Hash.h b/code/Hash.h
index cd7ca6def..a567adbc3 100644
--- a/code/Hash.h
+++ b/code/Hash.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IFCCurve.cpp b/code/IFCCurve.cpp
index 97d9fd574..ede1c87b8 100644
--- a/code/IFCCurve.cpp
+++ b/code/IFCCurve.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IFCLoader.cpp b/code/IFCLoader.cpp
index 0021ceb86..24c5452b2 100644
--- a/code/IFCLoader.cpp
+++ b/code/IFCLoader.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IFCLoader.h b/code/IFCLoader.h
index 9fa6cba38..4cf116f8e 100644
--- a/code/IFCLoader.h
+++ b/code/IFCLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IFCMaterial.cpp b/code/IFCMaterial.cpp
index ae2fa3619..aa11c5c22 100644
--- a/code/IFCMaterial.cpp
+++ b/code/IFCMaterial.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -42,19 +43,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @brief Implementation of conversion routines to convert IFC materials to aiMaterial
*/
-
-
#ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
+
#include "IFCUtil.h"
#include
#include
namespace Assimp {
- namespace IFC {
+namespace IFC {
// ------------------------------------------------------------------------------------------------
-int ConvertShadingMode(const std::string& name)
-{
+static int ConvertShadingMode(const std::string& name) {
if (name == "BLINN") {
return aiShadingMode_Blinn;
}
@@ -69,8 +68,7 @@ int ConvertShadingMode(const std::string& name)
}
// ------------------------------------------------------------------------------------------------
-void FillMaterial(aiMaterial* mat,const IFC::IfcSurfaceStyle* surf,ConversionData& conv)
-{
+static void FillMaterial(aiMaterial* mat,const IFC::IfcSurfaceStyle* surf,ConversionData& conv) {
aiString name;
name.Set((surf->Name? surf->Name.Get() : "IfcSurfaceStyle_Unnamed"));
mat->AddProperty(&name,AI_MATKEY_NAME);
@@ -134,8 +132,7 @@ void FillMaterial(aiMaterial* mat,const IFC::IfcSurfaceStyle* surf,ConversionDat
}
// ------------------------------------------------------------------------------------------------
-unsigned int ProcessMaterials(uint64_t id, unsigned int prevMatId, ConversionData& conv, bool forceDefaultMat)
-{
+unsigned int ProcessMaterials(uint64_t id, unsigned int prevMatId, ConversionData& conv, bool forceDefaultMat) {
STEP::DB::RefMapRange range = conv.db.GetRefs().equal_range(id);
for(;range.first != range.second; ++range.first) {
if(const IFC::IfcStyledItem* const styled = conv.db.GetObject((*range.first).second)->ToPtr()) {
@@ -162,31 +159,33 @@ unsigned int ProcessMaterials(uint64_t id, unsigned int prevMatId, ConversionDat
unsigned int matindex = static_cast(conv.materials.size() - 1);
conv.cached_materials[surf] = matindex;
return matindex;
+ }
+ }
}
}
}
- }
- }
// no local material defined. If there's global one, use that instead
- if( prevMatId != std::numeric_limits::max() )
+ if ( prevMatId != std::numeric_limits::max() ) {
return prevMatId;
+ }
// we're still here - create an default material if required, or simply fail otherwise
- if( !forceDefaultMat )
+ if ( !forceDefaultMat ) {
return std::numeric_limits::max();
+ }
aiString name;
name.Set("");
// ConvertColorToString( color, name);
// look if there's already a default material with this base color
- for( size_t a = 0; a < conv.materials.size(); ++a )
- {
+ for( size_t a = 0; a < conv.materials.size(); ++a ) {
aiString mname;
conv.materials[a]->Get(AI_MATKEY_NAME, mname);
- if( name == mname )
- return (unsigned int)a;
+ if ( name == mname ) {
+ return ( unsigned int )a;
+ }
}
// we're here, yet - no default material with suitable color available. Generate one
@@ -203,4 +202,4 @@ unsigned int ProcessMaterials(uint64_t id, unsigned int prevMatId, ConversionDat
} // ! IFC
} // ! Assimp
-#endif
+#endif // ASSIMP_BUILD_NO_IFC_IMPORTER
diff --git a/code/IFCProfile.cpp b/code/IFCProfile.cpp
index 866b874c9..e94d98a04 100644
--- a/code/IFCProfile.cpp
+++ b/code/IFCProfile.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IFCUtil.cpp b/code/IFCUtil.cpp
index d7e4d5d54..f5bd56a00 100644
--- a/code/IFCUtil.cpp
+++ b/code/IFCUtil.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IFCUtil.h b/code/IFCUtil.h
index 43d20a434..f90f421d6 100644
--- a/code/IFCUtil.h
+++ b/code/IFCUtil.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IOStreamBuffer.h b/code/IOStreamBuffer.h
index 5208d020c..d8c7d00ab 100644
--- a/code/IOStreamBuffer.h
+++ b/code/IOStreamBuffer.h
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp
index e552601b8..0a1edf253 100644
--- a/code/IRRLoader.cpp
+++ b/code/IRRLoader.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.
diff --git a/code/IRRLoader.h b/code/IRRLoader.h
index fab2391d6..b8f0df918 100644
--- a/code/IRRLoader.h
+++ b/code/IRRLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IRRMeshLoader.cpp b/code/IRRMeshLoader.cpp
index 88439459a..a63a2a134 100644
--- a/code/IRRMeshLoader.cpp
+++ b/code/IRRMeshLoader.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.
diff --git a/code/IRRMeshLoader.h b/code/IRRMeshLoader.h
index 6c208224c..312dbbfe0 100644
--- a/code/IRRMeshLoader.h
+++ b/code/IRRMeshLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/IRRShared.cpp b/code/IRRShared.cpp
index e38ad1378..bfe408629 100644
--- a/code/IRRShared.cpp
+++ b/code/IRRShared.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.
diff --git a/code/Importer.cpp b/code/Importer.cpp
index 094774544..eb0119693 100644
--- a/code/Importer.cpp
+++ b/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.
diff --git a/code/Importer.h b/code/Importer.h
index 6beca45ba..e0fb57f5b 100644
--- a/code/Importer.h
+++ b/code/Importer.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp
index f77193c2f..7b965c26a 100644
--- a/code/ImporterRegistry.cpp
+++ b/code/ImporterRegistry.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.
diff --git a/code/ImproveCacheLocality.cpp b/code/ImproveCacheLocality.cpp
index 9fd76508b..7f0727e8b 100644
--- a/code/ImproveCacheLocality.cpp
+++ b/code/ImproveCacheLocality.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.
diff --git a/code/ImproveCacheLocality.h b/code/ImproveCacheLocality.h
index d43f37f50..d91388c41 100644
--- a/code/ImproveCacheLocality.h
+++ b/code/ImproveCacheLocality.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/JoinVerticesProcess.cpp b/code/JoinVerticesProcess.cpp
index 9cd34e1d0..17b0ab07f 100644
--- a/code/JoinVerticesProcess.cpp
+++ b/code/JoinVerticesProcess.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.
diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h
index b1a9aa910..a3204782a 100644
--- a/code/JoinVerticesProcess.h
+++ b/code/JoinVerticesProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LWOAnimation.cpp b/code/LWOAnimation.cpp
index 10bc54b16..cbd12fe1a 100644
--- a/code/LWOAnimation.cpp
+++ b/code/LWOAnimation.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LWOAnimation.h b/code/LWOAnimation.h
index 257abecdd..11f71bd93 100644
--- a/code/LWOAnimation.h
+++ b/code/LWOAnimation.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LWOBLoader.cpp b/code/LWOBLoader.cpp
index 639675294..6a07f81a7 100644
--- a/code/LWOBLoader.cpp
+++ b/code/LWOBLoader.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.
diff --git a/code/LWOFileData.h b/code/LWOFileData.h
index d67cf7ec8..7fa9a216d 100644
--- a/code/LWOFileData.h
+++ b/code/LWOFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LWOLoader.cpp b/code/LWOLoader.cpp
index 5d8b84aab..feb8ee8df 100644
--- a/code/LWOLoader.cpp
+++ b/code/LWOLoader.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.
diff --git a/code/LWOLoader.h b/code/LWOLoader.h
index 9907d691d..b92e5aab4 100644
--- a/code/LWOLoader.h
+++ b/code/LWOLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LWOMaterial.cpp b/code/LWOMaterial.cpp
index 42a6f8c5e..e2ba894af 100644
--- a/code/LWOMaterial.cpp
+++ b/code/LWOMaterial.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.
diff --git a/code/LWSLoader.cpp b/code/LWSLoader.cpp
index 52d0c522c..aa05d63c9 100644
--- a/code/LWSLoader.cpp
+++ b/code/LWSLoader.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.
diff --git a/code/LWSLoader.h b/code/LWSLoader.h
index 9547b67bb..28b4495df 100644
--- a/code/LWSLoader.h
+++ b/code/LWSLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LimitBoneWeightsProcess.cpp b/code/LimitBoneWeightsProcess.cpp
index e35fe1462..0bb4a4be3 100644
--- a/code/LimitBoneWeightsProcess.cpp
+++ b/code/LimitBoneWeightsProcess.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LimitBoneWeightsProcess.h b/code/LimitBoneWeightsProcess.h
index f6907cf26..3826dbe58 100644
--- a/code/LimitBoneWeightsProcess.h
+++ b/code/LimitBoneWeightsProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LineSplitter.h b/code/LineSplitter.h
index 0fa47380e..10ca1d35a 100644
--- a/code/LineSplitter.h
+++ b/code/LineSplitter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/LogAux.h b/code/LogAux.h
index f754903c6..432da5cd5 100644
--- a/code/LogAux.h
+++ b/code/LogAux.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD2FileData.h b/code/MD2FileData.h
index b56f6c76b..f65193264 100644
--- a/code/MD2FileData.h
+++ b/code/MD2FileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD2Loader.cpp b/code/MD2Loader.cpp
index ffcda3916..cb494d5b2 100644
--- a/code/MD2Loader.cpp
+++ b/code/MD2Loader.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.
diff --git a/code/MD2Loader.h b/code/MD2Loader.h
index 126c16359..a7566dc64 100644
--- a/code/MD2Loader.h
+++ b/code/MD2Loader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD2NormalTable.h b/code/MD2NormalTable.h
index 5b1344bd6..98fbc1d7a 100644
--- a/code/MD2NormalTable.h
+++ b/code/MD2NormalTable.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD3FileData.h b/code/MD3FileData.h
index 3a59d0d1d..262d75322 100644
--- a/code/MD3FileData.h
+++ b/code/MD3FileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp
index f469a4c95..8047b82ba 100644
--- a/code/MD3Loader.cpp
+++ b/code/MD3Loader.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.
diff --git a/code/MD3Loader.h b/code/MD3Loader.h
index 6b8143a97..ff5b56a52 100644
--- a/code/MD3Loader.h
+++ b/code/MD3Loader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD5Loader.cpp b/code/MD5Loader.cpp
index d2477a2c5..172c98a30 100644
--- a/code/MD5Loader.cpp
+++ b/code/MD5Loader.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.
diff --git a/code/MD5Loader.h b/code/MD5Loader.h
index 9dfc08226..afb07a62d 100644
--- a/code/MD5Loader.h
+++ b/code/MD5Loader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MD5Parser.cpp b/code/MD5Parser.cpp
index 9379deab1..8076e5bc4 100644
--- a/code/MD5Parser.cpp
+++ b/code/MD5Parser.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.
diff --git a/code/MD5Parser.h b/code/MD5Parser.h
index 78ade8430..bafcaf962 100644
--- a/code/MD5Parser.h
+++ b/code/MD5Parser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MDCFileData.h b/code/MDCFileData.h
index c98828c28..2ce96db5a 100644
--- a/code/MDCFileData.h
+++ b/code/MDCFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MDCLoader.cpp b/code/MDCLoader.cpp
index db109bf83..21aca53ff 100644
--- a/code/MDCLoader.cpp
+++ b/code/MDCLoader.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.
diff --git a/code/MDCLoader.h b/code/MDCLoader.h
index fcfbc642d..5f3b365fd 100644
--- a/code/MDCLoader.h
+++ b/code/MDCLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MDLDefaultColorMap.h b/code/MDLDefaultColorMap.h
index 6db696af0..800c717c5 100644
--- a/code/MDLDefaultColorMap.h
+++ b/code/MDLDefaultColorMap.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MDLFileData.h b/code/MDLFileData.h
index 536bf082a..6ba5b5aa2 100644
--- a/code/MDLFileData.h
+++ b/code/MDLFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp
index 4aeff43e5..ad63dd40b 100644
--- a/code/MDLLoader.cpp
+++ b/code/MDLLoader.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.
diff --git a/code/MDLLoader.h b/code/MDLLoader.h
index 62e451cbe..8709426e6 100644
--- a/code/MDLLoader.h
+++ b/code/MDLLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MDLMaterialLoader.cpp b/code/MDLMaterialLoader.cpp
index 64cebc7d5..77ce3b33f 100644
--- a/code/MDLMaterialLoader.cpp
+++ b/code/MDLMaterialLoader.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.
diff --git a/code/MS3DLoader.cpp b/code/MS3DLoader.cpp
index 07a3d9b17..64ec1e076 100644
--- a/code/MS3DLoader.cpp
+++ b/code/MS3DLoader.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.
diff --git a/code/MS3DLoader.h b/code/MS3DLoader.h
index 22d12e3cf..b4b19b3ad 100644
--- a/code/MS3DLoader.h
+++ b/code/MS3DLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MakeVerboseFormat.cpp b/code/MakeVerboseFormat.cpp
index be68bf3d6..ee82caafe 100644
--- a/code/MakeVerboseFormat.cpp
+++ b/code/MakeVerboseFormat.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.
diff --git a/code/MakeVerboseFormat.h b/code/MakeVerboseFormat.h
index 1b32cf19e..9832a3f65 100644
--- a/code/MakeVerboseFormat.h
+++ b/code/MakeVerboseFormat.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp
index 5fcf28a4f..be73ff897 100644
--- a/code/MaterialSystem.cpp
+++ b/code/MaterialSystem.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MaterialSystem.h b/code/MaterialSystem.h
index 6726e0518..b083a5bb8 100644
--- a/code/MaterialSystem.h
+++ b/code/MaterialSystem.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/MemoryIOWrapper.h b/code/MemoryIOWrapper.h
index d6aaafae0..9bd245337 100644
--- a/code/MemoryIOWrapper.h
+++ b/code/MemoryIOWrapper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/NDOLoader.cpp b/code/NDOLoader.cpp
index 2ce3983dc..2586bac3e 100644
--- a/code/NDOLoader.cpp
+++ b/code/NDOLoader.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.
diff --git a/code/NFFLoader.cpp b/code/NFFLoader.cpp
index 24ca24cce..fa005ede4 100644
--- a/code/NFFLoader.cpp
+++ b/code/NFFLoader.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.
diff --git a/code/NFFLoader.h b/code/NFFLoader.h
index 2b5232645..0640d4405 100644
--- a/code/NFFLoader.h
+++ b/code/NFFLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OFFLoader.cpp b/code/OFFLoader.cpp
index fee36b03a..2723beb0e 100644
--- a/code/OFFLoader.cpp
+++ b/code/OFFLoader.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.
diff --git a/code/OFFLoader.h b/code/OFFLoader.h
index f01dc6244..29a4927bd 100644
--- a/code/OFFLoader.h
+++ b/code/OFFLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp
index d10dfcd45..564de1c12 100644
--- a/code/ObjExporter.cpp
+++ b/code/ObjExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjExporter.h b/code/ObjExporter.h
index 8e92a7db5..e31bf07b7 100644
--- a/code/ObjExporter.h
+++ b/code/ObjExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjFileData.h b/code/ObjFileData.h
index 1c6f80ce1..2658f8a2a 100644
--- a/code/ObjFileData.h
+++ b/code/ObjFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp
index 1b9b92f62..9f3bdef97 100644
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.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.
@@ -614,9 +615,12 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
mat->AddProperty( &pCurrentMaterial->ior, 1, AI_MATKEY_REFRACTI );
// Adding textures
+ const int uvwIndex = 0;
+
if ( 0 != pCurrentMaterial->texture.length )
{
mat->AddProperty( &pCurrentMaterial->texture, AI_MATKEY_TEXTURE_DIFFUSE(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_DIFFUSE(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureDiffuseType])
{
addTextureMappingModeProperty(mat, aiTextureType_DIFFUSE);
@@ -626,6 +630,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
if ( 0 != pCurrentMaterial->textureAmbient.length )
{
mat->AddProperty( &pCurrentMaterial->textureAmbient, AI_MATKEY_TEXTURE_AMBIENT(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_AMBIENT(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureAmbientType])
{
addTextureMappingModeProperty(mat, aiTextureType_AMBIENT);
@@ -633,11 +638,15 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
}
if ( 0 != pCurrentMaterial->textureEmissive.length )
+ {
mat->AddProperty( &pCurrentMaterial->textureEmissive, AI_MATKEY_TEXTURE_EMISSIVE(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_EMISSIVE(0) );
+ }
if ( 0 != pCurrentMaterial->textureSpecular.length )
{
mat->AddProperty( &pCurrentMaterial->textureSpecular, AI_MATKEY_TEXTURE_SPECULAR(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_SPECULAR(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureSpecularType])
{
addTextureMappingModeProperty(mat, aiTextureType_SPECULAR);
@@ -647,6 +656,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
if ( 0 != pCurrentMaterial->textureBump.length )
{
mat->AddProperty( &pCurrentMaterial->textureBump, AI_MATKEY_TEXTURE_HEIGHT(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_HEIGHT(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureBumpType])
{
addTextureMappingModeProperty(mat, aiTextureType_HEIGHT);
@@ -656,6 +666,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
if ( 0 != pCurrentMaterial->textureNormal.length )
{
mat->AddProperty( &pCurrentMaterial->textureNormal, AI_MATKEY_TEXTURE_NORMALS(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_NORMALS(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureNormalType])
{
addTextureMappingModeProperty(mat, aiTextureType_NORMALS);
@@ -672,6 +683,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
for( unsigned i = 0; i < count; i++ )
{
mat->AddProperty(&pCurrentMaterial->textureReflection[i], AI_MATKEY_TEXTURE_REFLECTION(i));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_REFLECTION(i) );
if(pCurrentMaterial->clamp[type])
addTextureMappingModeProperty(mat, aiTextureType_REFLECTION, 1, i);
@@ -681,6 +693,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
if ( 0 != pCurrentMaterial->textureDisp.length )
{
mat->AddProperty( &pCurrentMaterial->textureDisp, AI_MATKEY_TEXTURE_DISPLACEMENT(0) );
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_DISPLACEMENT(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureDispType])
{
addTextureMappingModeProperty(mat, aiTextureType_DISPLACEMENT);
@@ -690,6 +703,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
if ( 0 != pCurrentMaterial->textureOpacity.length )
{
mat->AddProperty( &pCurrentMaterial->textureOpacity, AI_MATKEY_TEXTURE_OPACITY(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_OPACITY(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureOpacityType])
{
addTextureMappingModeProperty(mat, aiTextureType_OPACITY);
@@ -699,6 +713,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
if ( 0 != pCurrentMaterial->textureSpecularity.length )
{
mat->AddProperty( &pCurrentMaterial->textureSpecularity, AI_MATKEY_TEXTURE_SHININESS(0));
+ mat->AddProperty( &uvwIndex, 1, AI_MATKEY_UVWSRC_SHININESS(0) );
if (pCurrentMaterial->clamp[ObjFile::Material::TextureSpecularityType])
{
addTextureMappingModeProperty(mat, aiTextureType_SHININESS);
diff --git a/code/ObjFileImporter.h b/code/ObjFileImporter.h
index bd3f42f27..302cf951a 100644
--- a/code/ObjFileImporter.h
+++ b/code/ObjFileImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp
index 4759f10e2..69f35a67d 100644
--- a/code/ObjFileMtlImporter.cpp
+++ b/code/ObjFileMtlImporter.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.
diff --git a/code/ObjFileMtlImporter.h b/code/ObjFileMtlImporter.h
index 54e4b7cef..416992ef2 100644
--- a/code/ObjFileMtlImporter.h
+++ b/code/ObjFileMtlImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp
index 41ae447ba..5b175432b 100644
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.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.
@@ -97,7 +98,27 @@ ObjFileParser::~ObjFileParser() {
ObjFile::Model *ObjFileParser::GetModel() const {
return m_pModel;
}
-
+void ignoreNewLines(IOStreamBuffer &streamBuffer, std::vector &buffer)
+{
+ auto curPosition = buffer.begin();
+ do
+ {
+ while (*curPosition!='\n'&&*curPosition!='\\')
+ {
+ ++curPosition;
+ }
+ if (*curPosition=='\\')
+ {
+ std::vector tempBuf;
+ do
+ {
+ streamBuffer.getNextLine(tempBuf);
+ } while (tempBuf[0]=='\n');
+ *curPosition = ' ';
+ std::copy(tempBuf.cbegin(), tempBuf.cend(), ++curPosition);
+ }
+ } while (*curPosition!='\n');
+}
// -------------------------------------------------------------------
// File parsing method.
void ObjFileParser::parseFile( IOStreamBuffer &streamBuffer ) {
@@ -123,7 +144,7 @@ void ObjFileParser::parseFile( IOStreamBuffer &streamBuffer ) {
progressCounter++;
m_progress->UpdateFileRead( progressOffset + processed * 2, progressTotal );
}
-
+ ignoreNewLines(streamBuffer, buffer);
// parse line
switch (*m_DataIt) {
case 'v': // Parse a vertex texture coordinate
diff --git a/code/ObjFileParser.h b/code/ObjFileParser.h
index 55be305bb..9d0b34b1d 100644
--- a/code/ObjFileParser.h
+++ b/code/ObjFileParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ObjTools.h b/code/ObjTools.h
index 8dee62f18..c45b94aba 100644
--- a/code/ObjTools.h
+++ b/code/ObjTools.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreBinarySerializer.cpp b/code/OgreBinarySerializer.cpp
index 59bd0d92d..95aec221f 100644
--- a/code/OgreBinarySerializer.cpp
+++ b/code/OgreBinarySerializer.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreBinarySerializer.h b/code/OgreBinarySerializer.h
index 067e36a63..c48e33dd6 100644
--- a/code/OgreBinarySerializer.h
+++ b/code/OgreBinarySerializer.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreImporter.cpp b/code/OgreImporter.cpp
index 744be0965..4dc802574 100644
--- a/code/OgreImporter.cpp
+++ b/code/OgreImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreImporter.h b/code/OgreImporter.h
index 8b2179502..2b3009096 100644
--- a/code/OgreImporter.h
+++ b/code/OgreImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreMaterial.cpp b/code/OgreMaterial.cpp
index bdcd0285a..dfb77ffef 100644
--- a/code/OgreMaterial.cpp
+++ b/code/OgreMaterial.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreParsingUtils.h b/code/OgreParsingUtils.h
index def3cf733..d1895374f 100644
--- a/code/OgreParsingUtils.h
+++ b/code/OgreParsingUtils.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreStructs.cpp b/code/OgreStructs.cpp
index d9cd547d6..09597950a 100644
--- a/code/OgreStructs.cpp
+++ b/code/OgreStructs.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreStructs.h b/code/OgreStructs.h
index c4e86a805..04383bc4e 100644
--- a/code/OgreStructs.h
+++ b/code/OgreStructs.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreXmlSerializer.cpp b/code/OgreXmlSerializer.cpp
index 16767252d..b5d20cdf6 100644
--- a/code/OgreXmlSerializer.cpp
+++ b/code/OgreXmlSerializer.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OgreXmlSerializer.h b/code/OgreXmlSerializer.h
index 47b4cafc0..01b9a7b23 100644
--- a/code/OgreXmlSerializer.h
+++ b/code/OgreXmlSerializer.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OpenGEXExporter.cpp b/code/OpenGEXExporter.cpp
index cf06c9f39..ea3c770ec 100644
--- a/code/OpenGEXExporter.cpp
+++ b/code/OpenGEXExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OpenGEXExporter.h b/code/OpenGEXExporter.h
index f9757f41c..9df9d853e 100644
--- a/code/OpenGEXExporter.h
+++ b/code/OpenGEXExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OpenGEXImporter.cpp b/code/OpenGEXImporter.cpp
index 5df6d1646..91b8cd809 100644
--- a/code/OpenGEXImporter.cpp
+++ b/code/OpenGEXImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -52,8 +53,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include
-static const std::string OpenGexExt = "ogex";
-
static const aiImporterDesc desc = {
"Open Game Engine Exchange",
"",
@@ -64,7 +63,7 @@ static const aiImporterDesc desc = {
0,
0,
0,
- OpenGexExt.c_str()
+ "ogex"
};
namespace Grammar {
@@ -289,7 +288,7 @@ OpenGEXImporter::~OpenGEXImporter() {
bool OpenGEXImporter::CanRead( const std::string &file, IOSystem *pIOHandler, bool checkSig ) const {
bool canRead( false );
if( !checkSig ) {
- canRead = SimpleExtensionCheck( file, OpenGexExt.c_str() );
+ canRead = SimpleExtensionCheck( file, "ogex" );
} else {
static const char *token[] = { "Metric", "GeometryNode", "VertexArray (attrib", "IndexArray" };
canRead = BaseImporter::SearchFileHeaderForToken( pIOHandler, file, token, 4 );
diff --git a/code/OpenGEXImporter.h b/code/OpenGEXImporter.h
index d33b0a804..58cb0460f 100644
--- a/code/OpenGEXImporter.h
+++ b/code/OpenGEXImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OpenGEXStructs.h b/code/OpenGEXStructs.h
index 910b03f60..6144a10c5 100644
--- a/code/OpenGEXStructs.h
+++ b/code/OpenGEXStructs.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OptimizeGraph.cpp b/code/OptimizeGraph.cpp
index 4d033ee31..8b3df0820 100644
--- a/code/OptimizeGraph.cpp
+++ b/code/OptimizeGraph.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.
diff --git a/code/OptimizeGraph.h b/code/OptimizeGraph.h
index 7b3a1d0de..22d53afff 100644
--- a/code/OptimizeGraph.h
+++ b/code/OptimizeGraph.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp
index 2bb9c5717..efbd51bd0 100644
--- a/code/OptimizeMeshes.cpp
+++ b/code/OptimizeMeshes.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.
diff --git a/code/OptimizeMeshes.h b/code/OptimizeMeshes.h
index fc8b6a10b..bcefe9247 100644
--- a/code/OptimizeMeshes.h
+++ b/code/OptimizeMeshes.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ParsingUtils.h b/code/ParsingUtils.h
index 2371ee606..7da664374 100644
--- a/code/ParsingUtils.h
+++ b/code/ParsingUtils.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/PlyExporter.cpp b/code/PlyExporter.cpp
index 1d14c9219..2844cbd39 100644
--- a/code/PlyExporter.cpp
+++ b/code/PlyExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/PlyExporter.h b/code/PlyExporter.h
index be4fa466f..ce242692c 100644
--- a/code/PlyExporter.h
+++ b/code/PlyExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp
index 5dc83e7c6..7cfa06727 100644
--- a/code/PlyLoader.cpp
+++ b/code/PlyLoader.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.
diff --git a/code/PlyLoader.h b/code/PlyLoader.h
index 9fbcb67e1..6c3825aa4 100644
--- a/code/PlyLoader.h
+++ b/code/PlyLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/PlyParser.cpp b/code/PlyParser.cpp
index 9bb033842..c97ea509f 100644
--- a/code/PlyParser.cpp
+++ b/code/PlyParser.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.
diff --git a/code/PlyParser.h b/code/PlyParser.h
index 30791e22b..930536e2d 100644
--- a/code/PlyParser.h
+++ b/code/PlyParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/PolyTools.h b/code/PolyTools.h
index 80e1dd173..1089327ae 100644
--- a/code/PolyTools.h
+++ b/code/PolyTools.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/PostStepRegistry.cpp b/code/PostStepRegistry.cpp
index 31518c132..c80c373e5 100644
--- a/code/PostStepRegistry.cpp
+++ b/code/PostStepRegistry.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.
diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp
index bcb3913c3..26b8aee34 100644
--- a/code/PretransformVertices.cpp
+++ b/code/PretransformVertices.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.
diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h
index 28bd95a67..65b4938b0 100644
--- a/code/PretransformVertices.h
+++ b/code/PretransformVertices.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ProcessHelper.cpp b/code/ProcessHelper.cpp
index 501d44484..c255979bd 100644
--- a/code/ProcessHelper.cpp
+++ b/code/ProcessHelper.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h
index c70e23f5f..a49115936 100644
--- a/code/ProcessHelper.h
+++ b/code/ProcessHelper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Profiler.h b/code/Profiler.h
index 9354339a2..40d436b52 100644
--- a/code/Profiler.h
+++ b/code/Profiler.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPFileData.h b/code/Q3BSPFileData.h
index ab46db24f..b836795f8 100644
--- a/code/Q3BSPFileData.h
+++ b/code/Q3BSPFileData.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp
index 287f08cf7..9d6d8e870 100644
--- a/code/Q3BSPFileImporter.cpp
+++ b/code/Q3BSPFileImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPFileImporter.h b/code/Q3BSPFileImporter.h
index bac370411..cf53d4db0 100644
--- a/code/Q3BSPFileImporter.h
+++ b/code/Q3BSPFileImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPFileParser.cpp b/code/Q3BSPFileParser.cpp
index b32f15000..69721fc2d 100644
--- a/code/Q3BSPFileParser.cpp
+++ b/code/Q3BSPFileParser.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPFileParser.h b/code/Q3BSPFileParser.h
index 8363d31c0..1ee6d4aef 100644
--- a/code/Q3BSPFileParser.h
+++ b/code/Q3BSPFileParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp
index 16455c10a..86f399659 100644
--- a/code/Q3BSPZipArchive.cpp
+++ b/code/Q3BSPZipArchive.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3BSPZipArchive.h b/code/Q3BSPZipArchive.h
index 4dcd7a849..280c44fc0 100644
--- a/code/Q3BSPZipArchive.h
+++ b/code/Q3BSPZipArchive.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Q3DLoader.cpp b/code/Q3DLoader.cpp
index 0debb2d05..5aa639d09 100644
--- a/code/Q3DLoader.cpp
+++ b/code/Q3DLoader.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.
diff --git a/code/Q3DLoader.h b/code/Q3DLoader.h
index fb1dd1818..97184a5ff 100644
--- a/code/Q3DLoader.h
+++ b/code/Q3DLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/RawLoader.cpp b/code/RawLoader.cpp
index ae10ba8b4..e14b5140d 100644
--- a/code/RawLoader.cpp
+++ b/code/RawLoader.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.
diff --git a/code/RawLoader.h b/code/RawLoader.h
index 984141a04..0a1a35815 100644
--- a/code/RawLoader.h
+++ b/code/RawLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/RemoveComments.cpp b/code/RemoveComments.cpp
index 8290d2217..37d74124d 100644
--- a/code/RemoveComments.cpp
+++ b/code/RemoveComments.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index 35f7774a3..0a00a8f0f 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/RemoveRedundantMaterials.cpp b/code/RemoveRedundantMaterials.cpp
index a9954b946..154bf63ca 100644
--- a/code/RemoveRedundantMaterials.cpp
+++ b/code/RemoveRedundantMaterials.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.
diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h
index 60efad9a4..cb4ec02bb 100644
--- a/code/RemoveRedundantMaterials.h
+++ b/code/RemoveRedundantMaterials.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/RemoveVCProcess.cpp b/code/RemoveVCProcess.cpp
index 473460452..6b46044b1 100644
--- a/code/RemoveVCProcess.cpp
+++ b/code/RemoveVCProcess.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.
diff --git a/code/RemoveVCProcess.h b/code/RemoveVCProcess.h
index a9173a815..5735bf419 100644
--- a/code/RemoveVCProcess.h
+++ b/code/RemoveVCProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SGSpatialSort.cpp b/code/SGSpatialSort.cpp
index 84061888e..fe8bc3f35 100644
--- a/code/SGSpatialSort.cpp
+++ b/code/SGSpatialSort.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.
diff --git a/code/SGSpatialSort.h b/code/SGSpatialSort.h
index 59a5c37d6..e7cd38724 100644
--- a/code/SGSpatialSort.h
+++ b/code/SGSpatialSort.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SIBImporter.cpp b/code/SIBImporter.cpp
index 0a4df61a3..bf5d2bfd3 100644
--- a/code/SIBImporter.cpp
+++ b/code/SIBImporter.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.
diff --git a/code/SIBImporter.h b/code/SIBImporter.h
index bd71104c6..e7e2ec0b9 100644
--- a/code/SIBImporter.h
+++ b/code/SIBImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SMDLoader.cpp b/code/SMDLoader.cpp
index 37968d030..1e9f86bea 100644
--- a/code/SMDLoader.cpp
+++ b/code/SMDLoader.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.
diff --git a/code/SMDLoader.h b/code/SMDLoader.h
index f45c49a7e..c50b327e3 100644
--- a/code/SMDLoader.h
+++ b/code/SMDLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STEPFile.h b/code/STEPFile.h
index 9a830c068..529d4edbd 100644
--- a/code/STEPFile.h
+++ b/code/STEPFile.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -438,13 +439,17 @@ namespace STEP {
// ------------------------------------------------------------------------------
/** Base class for all concrete object instances */
// ------------------------------------------------------------------------------
- class Object
- {
+ class Object {
public:
-
- virtual ~Object() {}
Object(const char* classname = "unknown")
- : classname(classname) {}
+ : id( 0 )
+ , classname(classname) {
+ // empty
+ }
+
+ virtual ~Object() {
+ // empty
+ }
public:
@@ -459,7 +464,6 @@ namespace STEP {
return dynamic_cast(*this);
}
-
template
const T* ToPtr() const {
return dynamic_cast(this);
@@ -471,7 +475,6 @@ namespace STEP {
}
public:
-
uint64_t GetID() const {
return id;
}
@@ -489,7 +492,6 @@ namespace STEP {
const char* const classname;
};
-
template
size_t GenericFill(const STEP::DB& db, const EXPRESS::LIST& params, T* in);
// (intentionally undefined)
diff --git a/code/STEPFileEncoding.cpp b/code/STEPFileEncoding.cpp
index aff0b618d..0bf868d1c 100644
--- a/code/STEPFileEncoding.cpp
+++ b/code/STEPFileEncoding.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STEPFileEncoding.h b/code/STEPFileEncoding.h
index 3aec83056..56615c8f6 100644
--- a/code/STEPFileEncoding.h
+++ b/code/STEPFileEncoding.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STEPFileReader.cpp b/code/STEPFileReader.cpp
index afaa53a45..d014c1a5d 100644
--- a/code/STEPFileReader.cpp
+++ b/code/STEPFileReader.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STEPFileReader.h b/code/STEPFileReader.h
index c5bc88a5e..fb8c86f59 100644
--- a/code/STEPFileReader.h
+++ b/code/STEPFileReader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STLExporter.cpp b/code/STLExporter.cpp
index 3905cbcaf..629296724 100644
--- a/code/STLExporter.cpp
+++ b/code/STLExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STLExporter.h b/code/STLExporter.h
index 44b12344f..7fb6a3e75 100644
--- a/code/STLExporter.h
+++ b/code/STLExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp
index 61d8d33b5..5c592aaf5 100644
--- a/code/STLLoader.cpp
+++ b/code/STLLoader.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.
diff --git a/code/STLLoader.h b/code/STLLoader.h
index a0d82dbe8..87ed3288d 100644
--- a/code/STLLoader.h
+++ b/code/STLLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp
index a4f832e8f..a879f3123 100644
--- a/code/SceneCombiner.cpp
+++ b/code/SceneCombiner.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h
index 64c1ea48e..af008b134 100644
--- a/code/SceneCombiner.h
+++ b/code/SceneCombiner.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ScenePreprocessor.cpp b/code/ScenePreprocessor.cpp
index 327da0b35..0a6366b7d 100644
--- a/code/ScenePreprocessor.cpp
+++ b/code/ScenePreprocessor.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ScenePreprocessor.h b/code/ScenePreprocessor.h
index 9c4b422a2..3311036c3 100644
--- a/code/ScenePreprocessor.h
+++ b/code/ScenePreprocessor.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ScenePrivate.h b/code/ScenePrivate.h
index dd4d0a5e1..90d34bade 100644
--- a/code/ScenePrivate.h
+++ b/code/ScenePrivate.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp
index c01b575da..e9f427113 100644
--- a/code/SkeletonMeshBuilder.cpp
+++ b/code/SkeletonMeshBuilder.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SkeletonMeshBuilder.h b/code/SkeletonMeshBuilder.h
index 3c518e8cd..7a7e7b8ff 100644
--- a/code/SkeletonMeshBuilder.h
+++ b/code/SkeletonMeshBuilder.h
@@ -4,7 +4,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SmoothingGroups.h b/code/SmoothingGroups.h
index 75c59d1cb..7a7e2e429 100644
--- a/code/SmoothingGroups.h
+++ b/code/SmoothingGroups.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SortByPTypeProcess.cpp b/code/SortByPTypeProcess.cpp
index 74867184a..e4b314e02 100644
--- a/code/SortByPTypeProcess.cpp
+++ b/code/SortByPTypeProcess.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.
diff --git a/code/SortByPTypeProcess.h b/code/SortByPTypeProcess.h
index f96985cb3..0be7925ff 100644
--- a/code/SortByPTypeProcess.h
+++ b/code/SortByPTypeProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SpatialSort.cpp b/code/SpatialSort.cpp
index 3825dc33a..fa78d8bb6 100644
--- a/code/SpatialSort.cpp
+++ b/code/SpatialSort.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.
@@ -269,7 +270,7 @@ void SpatialSort::FindIdenticalPositions( const aiVector3D& pPosition,
// clear the array in this strange fashion because a simple clear() would also deallocate
// the array which we want to avoid
- poResults.erase( poResults.begin(), poResults.end());
+ poResults.resize( 0 );
// do a binary search for the minimal distance to start the iteration there
unsigned int index = (unsigned int)mPositions.size() / 2;
diff --git a/code/SpatialSort.h b/code/SpatialSort.h
index 367e0f6a6..36b7a2767 100644
--- a/code/SpatialSort.h
+++ b/code/SpatialSort.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SplitByBoneCountProcess.cpp b/code/SplitByBoneCountProcess.cpp
index 4d01bf0ee..a73dfe81e 100644
--- a/code/SplitByBoneCountProcess.cpp
+++ b/code/SplitByBoneCountProcess.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SplitByBoneCountProcess.h b/code/SplitByBoneCountProcess.h
index 816d18357..434ef9866 100644
--- a/code/SplitByBoneCountProcess.h
+++ b/code/SplitByBoneCountProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SplitLargeMeshes.cpp b/code/SplitLargeMeshes.cpp
index 5e21ec6b8..2066f7989 100644
--- a/code/SplitLargeMeshes.cpp
+++ b/code/SplitLargeMeshes.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h
index 9be27a8f1..7556e9fe8 100644
--- a/code/SplitLargeMeshes.h
+++ b/code/SplitLargeMeshes.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/StandardShapes.cpp b/code/StandardShapes.cpp
index 26c84217a..4346a8d76 100644
--- a/code/StandardShapes.cpp
+++ b/code/StandardShapes.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/StandardShapes.h b/code/StandardShapes.h
index faa250a2e..a31de566c 100644
--- a/code/StandardShapes.h
+++ b/code/StandardShapes.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/StdOStreamLogStream.h b/code/StdOStreamLogStream.h
index 249e30458..d9993b246 100644
--- a/code/StdOStreamLogStream.h
+++ b/code/StdOStreamLogStream.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/StepExporter.cpp b/code/StepExporter.cpp
index aa7086cee..ae5c12a4c 100644
--- a/code/StepExporter.cpp
+++ b/code/StepExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/StepExporter.h b/code/StepExporter.h
index b51280c6c..e5cdda7a1 100644
--- a/code/StepExporter.h
+++ b/code/StepExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/StreamReader.h b/code/StreamReader.h
index 698ba2b39..494aed146 100644
--- a/code/StreamReader.h
+++ b/code/StreamReader.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/StreamWriter.h b/code/StreamWriter.h
index 12239bf7f..26873fb5b 100644
--- a/code/StreamWriter.h
+++ b/code/StreamWriter.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/StringComparison.h b/code/StringComparison.h
index d3130e1cb..ed5f4bd6a 100644
--- a/code/StringComparison.h
+++ b/code/StringComparison.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/StringUtils.h b/code/StringUtils.h
index 434ab4520..b2190c5a9 100644
--- a/code/StringUtils.h
+++ b/code/StringUtils.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Subdivision.cpp b/code/Subdivision.cpp
index 7bc30c53a..ef5840dac 100644
--- a/code/Subdivision.cpp
+++ b/code/Subdivision.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Subdivision.h b/code/Subdivision.h
index 658640f55..b8ce228d2 100644
--- a/code/Subdivision.h
+++ b/code/Subdivision.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TargetAnimation.cpp b/code/TargetAnimation.cpp
index ecf6f0dcf..ab6b3d12f 100644
--- a/code/TargetAnimation.cpp
+++ b/code/TargetAnimation.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TargetAnimation.h b/code/TargetAnimation.h
index 79cef599e..21b66e591 100644
--- a/code/TargetAnimation.h
+++ b/code/TargetAnimation.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TerragenLoader.cpp b/code/TerragenLoader.cpp
index dcb19b9ca..ecf33aae9 100644
--- a/code/TerragenLoader.cpp
+++ b/code/TerragenLoader.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.
diff --git a/code/TerragenLoader.h b/code/TerragenLoader.h
index c216a2186..a95bd6bff 100644
--- a/code/TerragenLoader.h
+++ b/code/TerragenLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TextureTransform.cpp b/code/TextureTransform.cpp
index 948ec013b..76f0ce58c 100644
--- a/code/TextureTransform.cpp
+++ b/code/TextureTransform.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TextureTransform.h b/code/TextureTransform.h
index ccad3bdd9..7f1e4572f 100644
--- a/code/TextureTransform.h
+++ b/code/TextureTransform.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TinyFormatter.h b/code/TinyFormatter.h
index 1182e3a5a..1612282fb 100644
--- a/code/TinyFormatter.h
+++ b/code/TinyFormatter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/TriangulateProcess.cpp b/code/TriangulateProcess.cpp
index 883a45e3d..e2d77a80f 100644
--- a/code/TriangulateProcess.cpp
+++ b/code/TriangulateProcess.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.
diff --git a/code/TriangulateProcess.h b/code/TriangulateProcess.h
index 97b5004e1..6775eca7c 100644
--- a/code/TriangulateProcess.h
+++ b/code/TriangulateProcess.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/UnrealLoader.cpp b/code/UnrealLoader.cpp
index 59be4bed1..c8382cb01 100644
--- a/code/UnrealLoader.cpp
+++ b/code/UnrealLoader.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.
diff --git a/code/UnrealLoader.h b/code/UnrealLoader.h
index 93648ca82..a2ceb3d54 100644
--- a/code/UnrealLoader.h
+++ b/code/UnrealLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/ValidateDataStructure.cpp b/code/ValidateDataStructure.cpp
index 44e361f71..a536058bc 100644
--- a/code/ValidateDataStructure.cpp
+++ b/code/ValidateDataStructure.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.
diff --git a/code/ValidateDataStructure.h b/code/ValidateDataStructure.h
index 87f158b37..6daf9b87d 100644
--- a/code/ValidateDataStructure.h
+++ b/code/ValidateDataStructure.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Vertex.h b/code/Vertex.h
index 88840eab7..1f1685ae9 100644
--- a/code/Vertex.h
+++ b/code/Vertex.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/VertexTriangleAdjacency.cpp b/code/VertexTriangleAdjacency.cpp
index 6de55ab34..09c0a51a7 100644
--- a/code/VertexTriangleAdjacency.cpp
+++ b/code/VertexTriangleAdjacency.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.
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index 218607508..ed7b83a6b 100644
--- a/code/VertexTriangleAdjacency.h
+++ b/code/VertexTriangleAdjacency.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/Win32DebugLogStream.h b/code/Win32DebugLogStream.h
index de8606ebc..0833712f9 100644
--- a/code/Win32DebugLogStream.h
+++ b/code/Win32DebugLogStream.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/X3DImporter.cpp b/code/X3DImporter.cpp
index 2bd9d7544..34e90f3ef 100644
--- a/code/X3DImporter.cpp
+++ b/code/X3DImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -73,24 +74,29 @@ const aiImporterDesc X3DImporter::Description = {
"x3d"
};
-void X3DImporter::Clear()
-{
+X3DImporter::X3DImporter()
+: NodeElement_Cur( nullptr )
+, mReader( nullptr ) {
+ // empty
+}
+
+X3DImporter::~X3DImporter() {
+ delete mReader;
+ // Clear() is accounting if data already is deleted. So, just check again if all data is deleted.
+ Clear();
+}
+
+void X3DImporter::Clear() {
NodeElement_Cur = nullptr;
// Delete all elements
- if(NodeElement_List.size())
- {
- for(std::list::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); it++) delete *it;
-
+ if(NodeElement_List.size()) {
+ for ( std::list::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); it++ ) {
+ delete *it;
+ }
NodeElement_List.clear();
}
}
-X3DImporter::~X3DImporter()
-{
- delete mReader;
- // Clear() is accounting if data already is deleted. So, just check again if all data is deleted.
- Clear();
-}
/*********************************************************************************************************************************************/
/************************************************************ Functions: find set ************************************************************/
diff --git a/code/X3DImporter.hpp b/code/X3DImporter.hpp
index 2978643ad..494a44f77 100644
--- a/code/X3DImporter.hpp
+++ b/code/X3DImporter.hpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -56,8 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h"
#include "irrXMLWrapper.h"
-namespace Assimp
-{
+namespace Assimp {
/// \class X3DImporter
/// Class that holding scene graph which include: groups, geometry, metadata etc.
@@ -199,9 +199,7 @@ public:
/***********************************************/
/// Default constructor.
- X3DImporter()
- : NodeElement_Cur( nullptr ), mReader( nullptr )
- {}
+ X3DImporter();
/// Default destructor.
~X3DImporter();
@@ -211,7 +209,7 @@ public:
/***********************************************/
/// Parse X3D file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
- /// Also exception can be throwed if trouble will found.
+ /// Also exception can be thrown if trouble will found.
/// \param [in] pFile - name of file to be parsed.
/// \param [in] pIOHandler - pointer to IO helper object.
void ParseFile( const std::string& pFile, IOSystem* pIOHandler );
diff --git a/code/X3DImporter_Geometry2D.cpp b/code/X3DImporter_Geometry2D.cpp
index bfa1834ec..895ba8798 100644
--- a/code/X3DImporter_Geometry2D.cpp
+++ b/code/X3DImporter_Geometry2D.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Geometry3D.cpp b/code/X3DImporter_Geometry3D.cpp
index 614f202cc..10dde6501 100644
--- a/code/X3DImporter_Geometry3D.cpp
+++ b/code/X3DImporter_Geometry3D.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Group.cpp b/code/X3DImporter_Group.cpp
index e476ba58b..e7df97b4b 100644
--- a/code/X3DImporter_Group.cpp
+++ b/code/X3DImporter_Group.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Light.cpp b/code/X3DImporter_Light.cpp
index 54f56e76e..ff450f7a9 100644
--- a/code/X3DImporter_Light.cpp
+++ b/code/X3DImporter_Light.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Macro.hpp b/code/X3DImporter_Macro.hpp
index 445edfe91..6281efcd5 100644
--- a/code/X3DImporter_Macro.hpp
+++ b/code/X3DImporter_Macro.hpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Metadata.cpp b/code/X3DImporter_Metadata.cpp
index 1f57d9f63..febc9cc2f 100644
--- a/code/X3DImporter_Metadata.cpp
+++ b/code/X3DImporter_Metadata.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Networking.cpp b/code/X3DImporter_Networking.cpp
index d862cd7ef..69987e0ff 100644
--- a/code/X3DImporter_Networking.cpp
+++ b/code/X3DImporter_Networking.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Node.hpp b/code/X3DImporter_Node.hpp
index 5d258dfef..7061d06bc 100644
--- a/code/X3DImporter_Node.hpp
+++ b/code/X3DImporter_Node.hpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -466,42 +467,29 @@ public:
/// \class CX3DImporter_NodeElement_Geometry3D
/// Three-dimensional body.
-class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement
-{
- /***********************************************/
- /****************** Variables ******************/
- /***********************************************/
-
+class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement {
public:
+ std::list Vertices; ///< Vertices list.
+ size_t NumIndices;///< Number of indices in one face.
+ bool Solid; ///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
- std::list Vertices;///< Vertices list.
- size_t NumIndices;///< Number of indices in one face.
- bool Solid;///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
-
- /***********************************************/
- /****************** Functions ******************/
- /***********************************************/
-
-private:
-
- /// \fn CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode)
- /// Disabled copy constructor.
- CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode);
-
- /// \fn CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode)
- /// Disabled assign operator.
- CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode);
-
-public:
-
- /// \fn CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
/// Constructor.
/// \param [in] pParent - pointer to parent node.
/// \param [in] pType - type of geometry object.
CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
- : CX3DImporter_NodeElement(pType, pParent), Solid(true)
- {}
+ : CX3DImporter_NodeElement(pType, pParent)
+ , Vertices()
+ , NumIndices( 0 )
+ , Solid(true) {
+ // empty
+ }
+private:
+ /// Disabled copy constructor.
+ CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode);
+
+ /// Disabled assign operator.
+ CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode);
};// class CX3DImporter_NodeElement_Geometry3D
/// \class CX3DImporter_NodeElement_ElevationGrid
@@ -687,45 +675,35 @@ struct CX3DImporter_NodeElement_Appearance : public CX3DImporter_NodeElement
/// \class CX3DImporter_NodeElement_Material
/// Material.
-class CX3DImporter_NodeElement_Material : public CX3DImporter_NodeElement
-{
- /***********************************************/
- /****************** Variables ******************/
- /***********************************************/
-
+class CX3DImporter_NodeElement_Material : public CX3DImporter_NodeElement {
public:
+ float AmbientIntensity;///< Specifies how much ambient light from light sources this surface shall reflect.
+ aiColor3D DiffuseColor; ///< Reflects all X3D light sources depending on the angle of the surface with respect to the light source.
+ aiColor3D EmissiveColor; ///< Models "glowing" objects. This can be useful for displaying pre-lit models.
+ float Shininess; ///< Lower shininess values produce soft glows, while higher values result in sharper, smaller highlights.
+ aiColor3D SpecularColor; ///< The specularColor and shininess fields determine the specular highlights.
+ float Transparency; ///< Specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque.
- float AmbientIntensity;///< Specifies how much ambient light from light sources this surface shall reflect.
- aiColor3D DiffuseColor;///< Reflects all X3D light sources depending on the angle of the surface with respect to the light source.
- aiColor3D EmissiveColor;///< Models "glowing" objects. This can be useful for displaying pre-lit models.
- float Shininess;///< Lower shininess values produce soft glows, while higher values result in sharper, smaller highlights.
- aiColor3D SpecularColor;///< The specularColor and shininess fields determine the specular highlights.
- float Transparency;///< Specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque.
-
- /***********************************************/
- /****************** Functions ******************/
- /***********************************************/
-
-private:
-
- /// \fn CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode)
- /// Disabled copy constructor.
- CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode);
-
- /// \fn CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode)
- /// Disabled assign operator.
- CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode);
-
-public:
-
- /// \fn CX3DImporter_NodeElement_Material(const EType pType, CX3DImporter_NodeElement* pParent)
/// Constructor.
/// \param [in] pParent - pointer to parent node.
/// \param [in] pType - type of geometry object.
CX3DImporter_NodeElement_Material(CX3DImporter_NodeElement* pParent)
- : CX3DImporter_NodeElement(ENET_Material, pParent)
- {}
+ : CX3DImporter_NodeElement(ENET_Material, pParent)
+ , AmbientIntensity( 0.0f )
+ , DiffuseColor()
+ , EmissiveColor()
+ , Shininess( 0.0f )
+ , SpecularColor()
+ , Transparency( 1.0f ) {
+ // empty
+ }
+private:
+ /// Disabled copy constructor.
+ CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode);
+
+ /// Disabled assign operator.
+ CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode);
};// class CX3DImporter_NodeElement_Material
/// \struct CX3DImporter_NodeElement_ImageTexture
diff --git a/code/X3DImporter_Postprocess.cpp b/code/X3DImporter_Postprocess.cpp
index 6ae47b736..996340fa1 100644
--- a/code/X3DImporter_Postprocess.cpp
+++ b/code/X3DImporter_Postprocess.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -627,10 +628,10 @@ void X3DImporter::Postprocess_BuildNode(const CX3DImporter_NodeElement& pNodeEle
}
else
{
- for(size_t i = 0; i < (size_t)tne_group.Choice; i++) chit_begin++;// forward iterator to choosen node.
+ for(size_t i = 0; i < (size_t)tne_group.Choice; i++) chit_begin++;// forward iterator to chosen node.
chit_end = chit_begin;
- chit_end++;// point end iterator to next element after choosen.
+ chit_end++;// point end iterator to next element after chosen node.
}
}// if(tne_group.UseChoice)
}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Group)
diff --git a/code/X3DImporter_Rendering.cpp b/code/X3DImporter_Rendering.cpp
index 29dc28765..a950d3f64 100644
--- a/code/X3DImporter_Rendering.cpp
+++ b/code/X3DImporter_Rendering.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Shape.cpp b/code/X3DImporter_Shape.cpp
index 7b3c7da77..55ce7fa99 100644
--- a/code/X3DImporter_Shape.cpp
+++ b/code/X3DImporter_Shape.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/X3DImporter_Texturing.cpp b/code/X3DImporter_Texturing.cpp
index 8372a231b..40ea47797 100644
--- a/code/X3DImporter_Texturing.cpp
+++ b/code/X3DImporter_Texturing.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XFileExporter.cpp b/code/XFileExporter.cpp
index 30a0a21f8..df22f0f45 100644
--- a/code/XFileExporter.cpp
+++ b/code/XFileExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XFileExporter.h b/code/XFileExporter.h
index 389c7010c..8d3478276 100644
--- a/code/XFileExporter.h
+++ b/code/XFileExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XFileHelper.h b/code/XFileHelper.h
index 49a41d153..e7c02c7c6 100644
--- a/code/XFileHelper.h
+++ b/code/XFileHelper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XFileImporter.cpp b/code/XFileImporter.cpp
index 436195c2c..f2b1dde7e 100644
--- a/code/XFileImporter.cpp
+++ b/code/XFileImporter.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.
diff --git a/code/XFileImporter.h b/code/XFileImporter.h
index 1de56cbc5..528dcb851 100644
--- a/code/XFileImporter.h
+++ b/code/XFileImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp
index 83d017d92..f6030a0e0 100644
--- a/code/XFileParser.cpp
+++ b/code/XFileParser.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.
diff --git a/code/XFileParser.h b/code/XFileParser.h
index b0c874627..ec823bac0 100644
--- a/code/XFileParser.h
+++ b/code/XFileParser.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XGLLoader.cpp b/code/XGLLoader.cpp
index 6c9db1f89..bafcda3f2 100644
--- a/code/XGLLoader.cpp
+++ b/code/XGLLoader.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.
diff --git a/code/XGLLoader.h b/code/XGLLoader.h
index a7f0d7208..97ae5f8a3 100644
--- a/code/XGLLoader.h
+++ b/code/XGLLoader.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/XMLTools.h b/code/XMLTools.h
index 7339a2fc8..5d31f885e 100644
--- a/code/XMLTools.h
+++ b/code/XMLTools.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/glTFAsset.h b/code/glTFAsset.h
index 10453efa6..8e45fec13 100644
--- a/code/glTFAsset.h
+++ b/code/glTFAsset.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -210,6 +211,7 @@ namespace glTF
ComponentType_UNSIGNED_BYTE = 5121,
ComponentType_SHORT = 5122,
ComponentType_UNSIGNED_SHORT = 5123,
+ ComponentType_UNSIGNED_INT = 5125,
ComponentType_FLOAT = 5126
};
@@ -220,13 +222,15 @@ namespace glTF
case ComponentType_UNSIGNED_SHORT:
return 2;
+ case ComponentType_UNSIGNED_INT:
case ComponentType_FLOAT:
return 4;
- //case Accessor::ComponentType_BYTE:
- //case Accessor::ComponentType_UNSIGNED_BYTE:
- default:
+ case ComponentType_BYTE:
+ case ComponentType_UNSIGNED_BYTE:
return 1;
+ default:
+ throw DeadlyImportError("GLTF: Unsupported Component Type "+t);
}
}
diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl
index 4ec8c2ffe..fe29dde70 100644
--- a/code/glTFAsset.inl
+++ b/code/glTFAsset.inl
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/glTFAssetWriter.h b/code/glTFAssetWriter.h
index 4d2d3c919..ccfb9986d 100644
--- a/code/glTFAssetWriter.h
+++ b/code/glTFAssetWriter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/glTFAssetWriter.inl b/code/glTFAssetWriter.inl
index 1e545b497..d3a553c27 100644
--- a/code/glTFAssetWriter.inl
+++ b/code/glTFAssetWriter.inl
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/glTFExporter.cpp b/code/glTFExporter.cpp
index 203a46040..b419a3123 100644
--- a/code/glTFExporter.cpp
+++ b/code/glTFExporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -511,7 +512,7 @@ void glTFExporter::ExportMeshes()
// Variables needed for compression. END.
std::string fname = std::string(mFilename);
- std::string bufferIdPrefix = fname.substr(0, fname.find("."));
+ std::string bufferIdPrefix = fname.substr(0, fname.rfind(".gltf"));
std::string bufferId = mAsset->FindUniqueID("", bufferIdPrefix.c_str());
Ref b = mAsset->GetBodyBuffer();
@@ -582,7 +583,7 @@ void glTFExporter::ExportMeshes()
if (v) p.attributes.position.push_back(v);
/******************** Normals ********************/
- if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
+ if(comp_allow && (aim->mNormals != 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
Ref n = ExportData(*mAsset, meshId, b, aim->mNumVertices, aim->mNormals, AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
if (n) p.attributes.normal.push_back(n);
diff --git a/code/glTFExporter.h b/code/glTFExporter.h
index 49df9193e..835b67dc9 100644
--- a/code/glTFExporter.h
+++ b/code/glTFExporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/glTFImporter.cpp b/code/glTFImporter.cpp
index 02c60ee5e..0ded26294 100644
--- a/code/glTFImporter.cpp
+++ b/code/glTFImporter.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/glTFImporter.h b/code/glTFImporter.h
index 7edcc83f2..46f450f86 100644
--- a/code/glTFImporter.h
+++ b/code/glTFImporter.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h
index 5b47faefe..d7c76bf87 100644
--- a/code/irrXMLWrapper.h
+++ b/code/irrXMLWrapper.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -42,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define INCLUDED_AI_IRRXML_WRAPPER
// some long includes ....
-#include "./../contrib/irrXML/irrXML.h"
+#include
#include "./../include/assimp/IOStream.hpp"
#include "BaseImporter.h"
#include
diff --git a/code/qnan.h b/code/qnan.h
index 80d6229f9..fcff16b74 100644
--- a/code/qnan.h
+++ b/code/qnan.h
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
diff --git a/code/scene.cpp b/code/scene.cpp
index fe95b3ae4..467a2895d 100644
--- a/code/scene.cpp
+++ b/code/scene.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.
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
new file mode 100644
index 000000000..362f1653d
--- /dev/null
+++ b/contrib/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Compile internal irrXML only if system is not requested
+if( NOT SYSTEM_IRRXML )
+ add_subdirectory(irrXML)
+endif( NOT SYSTEM_IRRXML )
diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt
new file mode 100644
index 000000000..82ede3a04
--- /dev/null
+++ b/contrib/irrXML/CMakeLists.txt
@@ -0,0 +1,13 @@
+set( IrrXML_SRCS
+ CXMLReaderImpl.h
+ heapsort.h
+ irrArray.h
+ irrString.h
+ irrTypes.h
+ irrXML.cpp
+ irrXML.h
+)
+
+add_library(IrrXML STATIC ${IrrXML_SRCS})
+set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )
+set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 000000000..f7ce7b726
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,42 @@
+find_package( Doxygen REQUIRED )
+
+set( HTML_OUTPUT "AssimpDoc_Html" CACHE STRING "Output directory for generated HTML documentation. Defaults to AssimpDoc_Html." )
+
+# Enable Microsoft CHM help style only on Windows
+set( MICROSOFT_HELP_WORKSHOP "NO")
+if( MSVC )
+ set( MICROSOFT_HELP_WORKSHOP "YES" )
+endif( MSVC )
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ @ONLY
+)
+
+add_custom_target(
+ docs ALL
+ DEPENDS docs.done
+)
+
+add_custom_command(
+ OUTPUT docs.done
+ COMMAND ${DOXYGEN_EXECUTABLE}
+ COMMAND ${CMAKE_COMMAND} -E touch docs.done
+ COMMENT "Generating assimp documentation"
+ VERBATIM
+ )
+
+if( DEFINED CMAKE_INSTALL_DOCDIR )
+ install(
+ DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${HTML_OUTPUT}
+ DESTINATION ${CMAKE_INSTALL_DOCDIR}
+ )
+ install(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.svg
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/dragonsplash.png
+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/${HTML_OUTPUT}
+ )
+endif( DEFINED CMAKE_INSTALL_DOCDIR )
+
diff --git a/doc/Doxyfile b/doc/Doxyfile.in
similarity index 98%
rename from doc/Doxyfile
rename to doc/Doxyfile.in
index 64dd5d2cc..ebb6b72b8 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile.in
@@ -140,7 +140,8 @@ FULL_PATH_NAMES = NO
# relative paths, which will be relative from the directory where doxygen is
# started.
-STRIP_FROM_PATH =
+STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@ \
+ @PROJECT_BINARY_DIR@
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells
@@ -339,22 +340,6 @@ INLINE_SIMPLE_STRUCTS = NO
TYPEDEF_HIDES_STRUCT = YES
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE = 0
-
# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
# their name and scope. Since this can be an expensive process and often the
@@ -677,9 +662,12 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../include/ \
- ../doc/dox.h \
- ../code/BaseImporter.h
+INPUT = @doxy_main_page@ \
+ @PROJECT_SOURCE_DIR@ \
+ @PROJECT_BINARY_DIR@ \
+ @PROJECT_SOURCE_DIR@/include/ \
+ @PROJECT_SOURCE_DIR@/doc/dox.h \
+ @PROJECT_SOURCE_DIR@/code/BaseImporter.h
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -919,7 +907,7 @@ GENERATE_HTML = YES
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
-HTML_OUTPUT = AssimpDoc_Html
+HTML_OUTPUT = @HTML_OUTPUT@
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
@@ -953,7 +941,7 @@ HTML_FOOTER =
# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
# tag will in the future become obsolete.
-HTML_STYLESHEET = style.css
+# HTML_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/style.css
# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
# user-defined cascading style sheet that is included after the standard
@@ -1064,7 +1052,7 @@ DOCSET_PUBLISHER_NAME = Publisher
# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
# of the generated HTML documentation.
-GENERATE_HTMLHELP = YES
+GENERATE_HTMLHELP = @MICROSOFT_HELP_WORKSHOP@
# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
# be used to specify the file name of the resulting .chm file. You
@@ -1504,18 +1492,6 @@ GENERATE_XML = NO
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
# dump the program listings (including syntax highlighting
# and cross-referencing information) to the XML output. Note that
diff --git a/doc/architecture/Assimp_Arch_Import.class.violet.html b/doc/architecture/Assimp_Arch_Import.class.violet.html
index a7ed8c6ce..264468f98 100644
--- a/doc/architecture/Assimp_Arch_Import.class.violet.html
+++ b/doc/architecture/Assimp_Arch_Import.class.violet.html
@@ -20,8 +20,8 @@
-
-
+
+
1
255
@@ -37,620 +37,318 @@
- Assimpo::Exporter
+ Importer
- aiScene* mScene;
-IOSystem* mIOHandler;
-struct ExportFormatEntry {
- aiExportFormatDesc mDescription;
- fpExportFunc mExportFunction;
-};
-
+
- const aiExportDataBlob* ExportToBlob( const aiScene* pScene, ... );
-const aiExportDataBlob* ExportToBlob( const aiScene* pScene, ...);
-aiReturn Export( const aiScene* pScene, ... );
-aiReturn Export( const aiScene* pScene, ...);
-
-
+ RegisterLoader()
+UnregisterLoader()
+ReadFile()
-
-
- 1
-
- 255
- 255
- 255
- 255
-
-
- 0
- 0
- 0
- 255
-
-
-
- IOSystem
-
-
-
-
-
- bool Exists( const std::string& pFile) const;
-bool Exists( const char* pFile) const;
-virtual char getOsSeparator() const;
-
-virtual IOStream* Open(const char* pFile,
- const char* pMode = "rb");
-IOStream* Open(const std::string& pFile, const std::string& pMode = std::string("rb"));
-void Close( IOStream* pFile);
-
-
-
-
-
-
-
-
+
+
1
-
- ObjExporter
+
+ IOSystem
-
- File contains function pointer:
-ExportSceneObj
+
+
-
+
+
+
+
+
+ 1
+
+
+
+
+ BaseImporter
+
+
+
+
+
+ CanRead()
+InternRead()
+
+
+
+
+
+
+ 1
+
+
+
+
+ ObjImporter
+
+
+
+
+
+ CanRead()
+InternRead()
+
+
+
+
+
+
+ 1
+
+
+
+
+ glTFImporter
+
+
+
+
+
+ CanRead()
+InternRead()
+
+
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
+
+
+
+
+
+
-
+
1
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
1
-
-
-
-
-
-
-
+
+
+
+
+
+
+
1
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
-
-
-
-
- 1
-
+
+
+
+
+
]]>
-
+