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

- unify naming of all header files. Obviously, this is a breaking change that affects all users. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
aramis_acg 2012-02-03 17:04:06 +00:00
parent f07901df9d
commit 6fa251c2f2
138 changed files with 333 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/3DSLoader.h
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_3DSIMPORTER_H_INC #define AI_3DSIMPORTER_H_INC
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiNode; struct aiNode;
#include "3DSHelper.h" #include "3DSHelper.h"

2
code/ACLoader.h
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp { namespace Assimp {

2
code/ASELoader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_ASELOADER_H_INCLUDED #define AI_ASELOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiNode; struct aiNode;
#include "ASEParser.h" #include "ASEParser.h"

6
code/ASEParser.h
View File

@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <list> #include <list>
// public ASSIMP headers // public ASSIMP headers
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
// for some helper routines like IsSpace() // for some helper routines like IsSpace()
#include "ParsingUtils.h" #include "ParsingUtils.h"

2
code/Assimp.cpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "AssimpPCH.h" #include "AssimpPCH.h"
#include "../include/assimp/assimp.h" #include "../include/assimp/cimport.h"
#include "GenericProperty.h" #include "GenericProperty.h"
#include "CInterfaceIOWrapper.h" #include "CInterfaceIOWrapper.h"

2
code/AssimpPCH.cpp
View File

@ -2,7 +2,7 @@
// Actually just a dummy, used by the compiler to build the precompiled header. // Actually just a dummy, used by the compiler to build the precompiled header.
#include "AssimpPCH.h" #include "AssimpPCH.h"
#include "./../include/assimp/aiVersion.h" #include "./../include/assimp/version.h"
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
// Legal information string - dont't remove this. // Legal information string - dont't remove this.

20
code/AssimpPCH.h
View File

@ -48,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ASSIMP_INTERNAL_BUILD #define ASSIMP_INTERNAL_BUILD
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
/* General compile config taken from aiDefines.h. It is important that the user compiles /* General compile config taken from defs.h. It is important that the user compiles
* using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ, * using exactly the same settings in defs.h. Settings in AssimpPCH.h may differ,
* they won't affect the public API. * they won't affect the public API.
*/ */
#include "../include/assimp/aiDefines.h" #include "../include/assimp/defs.h"
// Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw // Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
#if defined( _MSC_VER) && (_MSC_VER < 1600) #if defined( _MSC_VER) && (_MSC_VER < 1600)
@ -132,13 +132,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
// Public ASSIMP headers // Public ASSIMP headers
#include "../include/assimp/DefaultLogger.h" #include "../include/assimp/DefaultLogger.hpp"
#include "../include/assimp/IOStream.h" #include "../include/assimp/IOStream.hpp"
#include "../include/assimp/IOSystem.h" #include "../include/assimp/IOSystem.hpp"
#include "../include/assimp/aiScene.h" #include "../include/assimp/scene.h"
#include "../include/assimp/aiPostProcess.h" #include "../include/assimp/postprocess.h"
#include "../include/assimp/assimp.hpp" #include "../include/assimp/Importer.hpp"
#include "../include/assimp/export.hpp" #include "../include/assimp/Exporter.hpp"
// Internal utility headers // Internal utility headers
#include "BaseImporter.h" #include "BaseImporter.h"

6
code/B3DImporter.h
View File

@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_B3DIMPORTER_H_INC #ifndef AI_B3DIMPORTER_H_INC
#define AI_B3DIMPORTER_H_INC #define AI_B3DIMPORTER_H_INC
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiMaterial.h" #include "../include/assimp/material.h"
#include <string> #include <string>
#include <vector> #include <vector>

2
code/BaseImporter.h
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string> #include <string>
#include <map> #include <map>
#include <vector> #include <vector>
#include "./../include/assimp/aiTypes.h" #include "./../include/assimp/types.h"
struct aiScene; struct aiScene;

2
code/BaseProcess.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <map> #include <map>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "GenericProperty.h" #include "GenericProperty.h"
struct aiScene; struct aiScene;

4
code/ByteSwap.h
View File

@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_BYTESWAP_H_INC #ifndef AI_BYTESWAP_H_INC
#define AI_BYTESWAP_H_INC #define AI_BYTESWAP_H_INC
#include "../include/assimp/aiAssert.h" #include "../include/assimp/assert.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400
#include <stdlib.h> #include <stdlib.h>

2
code/CInterfaceIOWrapper.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_CIOSYSTEM_H_INCLUDED #ifndef AI_CIOSYSTEM_H_INCLUDED
#define AI_CIOSYSTEM_H_INCLUDED #define AI_CIOSYSTEM_H_INCLUDED
#include "../include/assimp/aiFileIO.h" #include "../include/assimp/cfileio.h"
namespace Assimp { namespace Assimp {

86
code/CMakeLists.txt
View File

@ -18,44 +18,44 @@ SET( COMPILER_HEADERS
SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS}) SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
SET( PUBLIC_HEADERS SET( PUBLIC_HEADERS
${HEADER_PATH}/aiAnim.h ${HEADER_PATH}/anim.h
${HEADER_PATH}/aiAssert.h ${HEADER_PATH}/assert.h
${HEADER_PATH}/aiCamera.h ${HEADER_PATH}/camera.h
${HEADER_PATH}/aiColor4D.h ${HEADER_PATH}/color4.h
${HEADER_PATH}/aiColor4D.inl ${HEADER_PATH}/color4.inl
${HEADER_PATH}/aiConfig.h ${HEADER_PATH}/config.h
${HEADER_PATH}/aiDefines.h ${HEADER_PATH}/defs.h
${HEADER_PATH}/aiFileIO.h ${HEADER_PATH}/cfileio.h
${HEADER_PATH}/aiLight.h ${HEADER_PATH}/light.h
${HEADER_PATH}/aiMaterial.h ${HEADER_PATH}/material.h
${HEADER_PATH}/aiMaterial.inl ${HEADER_PATH}/material.inl
${HEADER_PATH}/aiMatrix3x3.h ${HEADER_PATH}/matrix3x3.h
${HEADER_PATH}/aiMatrix3x3.inl ${HEADER_PATH}/matrix3x3.inl
${HEADER_PATH}/aiMatrix4x4.h ${HEADER_PATH}/matrix4x4.h
${HEADER_PATH}/aiMatrix4x4.inl ${HEADER_PATH}/matrix4x4.inl
${HEADER_PATH}/aiMesh.h ${HEADER_PATH}/mesh.h
${HEADER_PATH}/aiPostProcess.h ${HEADER_PATH}/postprocess.h
${HEADER_PATH}/aiQuaternion.h ${HEADER_PATH}/quaternion.h
${HEADER_PATH}/aiQuaternion.inl ${HEADER_PATH}/quaternion.inl
${HEADER_PATH}/aiScene.h ${HEADER_PATH}/scene.h
${HEADER_PATH}/aiTexture.h ${HEADER_PATH}/texture.h
${HEADER_PATH}/aiTypes.h ${HEADER_PATH}/types.h
${HEADER_PATH}/aiVector2D.h ${HEADER_PATH}/vector2.h
${HEADER_PATH}/aiVector2D.inl ${HEADER_PATH}/vector2.inl
${HEADER_PATH}/aiVector3D.h ${HEADER_PATH}/vector3.h
${HEADER_PATH}/aiVector3D.inl ${HEADER_PATH}/vector3.inl
${HEADER_PATH}/aiVersion.h ${HEADER_PATH}/version.h
${HEADER_PATH}/assimp.h ${HEADER_PATH}/cimport.h
${HEADER_PATH}/assimp.hpp ${HEADER_PATH}/Importer.hpp
${HEADER_PATH}/DefaultLogger.h ${HEADER_PATH}/DefaultLogger.hpp
${HEADER_PATH}/ProgressHandler.h ${HEADER_PATH}/ProgressHandler.hpp
${HEADER_PATH}/IOStream.h ${HEADER_PATH}/IOStream.hpp
${HEADER_PATH}/IOSystem.h ${HEADER_PATH}/IOSystem.hpp
${HEADER_PATH}/Logger.h ${HEADER_PATH}/Logger.hpp
${HEADER_PATH}/LogStream.h ${HEADER_PATH}/LogStream.hpp
${HEADER_PATH}/NullLogger.h ${HEADER_PATH}/NullLogger.hpp
${HEADER_PATH}/export.h ${HEADER_PATH}/cexport.h
${HEADER_PATH}/export.hpp ${HEADER_PATH}/Exporter.hpp
) )
SET( Core_SRCS SET( Core_SRCS
@ -79,11 +79,11 @@ SET( Boost_SRCS
SOURCE_GROUP(Boost FILES ${Boost_SRCS}) SOURCE_GROUP(Boost FILES ${Boost_SRCS})
SET( Logging_SRCS SET( Logging_SRCS
${HEADER_PATH}/DefaultLogger.h ${HEADER_PATH}/DefaultLogger.hpp
${HEADER_PATH}/IOStream.h ${HEADER_PATH}/IOStream.hpp
${HEADER_PATH}/LogStream.h ${HEADER_PATH}/LogStream.hpp
${HEADER_PATH}/Logger.h ${HEADER_PATH}/Logger.hpp
${HEADER_PATH}/NullLogger.h ${HEADER_PATH}/NullLogger.hpp
Win32DebugLogStream.h Win32DebugLogStream.h
DefaultLogger.cpp DefaultLogger.cpp
FileLogStream.h FileLogStream.h

2
code/ColladaExporter.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_COLLADAEXPORTER_H_INC #ifndef AI_COLLADAEXPORTER_H_INC
#define AI_COLLADAEXPORTER_H_INC #define AI_COLLADAEXPORTER_H_INC
#include "../include/assimp/aiAssert.h" #include "../include/assimp/assert.h"
#include <sstream> #include <sstream>
struct aiScene; struct aiScene;

2
code/ColladaLoader.cpp
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "AssimpPCH.h" #include "AssimpPCH.h"
#ifndef ASSIMP_BUILD_NO_DAE_IMPORTER #ifndef ASSIMP_BUILD_NO_DAE_IMPORTER
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
#include "ColladaLoader.h" #include "ColladaLoader.h"
#include "ColladaParser.h" #include "ColladaParser.h"

2
code/ComputeUVMappingProcess.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_COMPUTEUVMAPPING_H_INC #define AI_COMPUTEUVMAPPING_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class ComputeUVMappingTest; class ComputeUVMappingTest;
namespace Assimp namespace Assimp

2
code/ConvertToLHProcess.h
View File

@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_CONVERTTOLHPROCESS_H_INC #ifndef AI_CONVERTTOLHPROCESS_H_INC
#define AI_CONVERTTOLHPROCESS_H_INC #define AI_CONVERTTOLHPROCESS_H_INC
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "BaseProcess.h" #include "BaseProcess.h"
struct aiMesh; struct aiMesh;

4
code/DeboneProcess.h
View File

@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <utility> #include <utility>
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiScene.h" #include "../include/assimp/scene.h"
class DeboneTest; class DeboneTest;

2
code/DefaultIOStream.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_DEFAULTIOSTREAM_H_INC #define AI_DEFAULTIOSTREAM_H_INC
#include <stdio.h> #include <stdio.h>
#include "../include/assimp/IOStream.h" #include "../include/assimp/IOStream.hpp"
namespace Assimp { namespace Assimp {

2
code/DefaultIOSystem.h
View File

@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_DEFAULTIOSYSTEM_H_INC #ifndef AI_DEFAULTIOSYSTEM_H_INC
#define AI_DEFAULTIOSYSTEM_H_INC #define AI_DEFAULTIOSYSTEM_H_INC
#include "../include/assimp/IOSystem.h" #include "../include/assimp/IOSystem.hpp"
namespace Assimp { namespace Assimp {

4
code/DefaultProgressHandler.h
View File

@ -38,13 +38,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------- ----------------------------------------------------------------------
*/ */
/** @file ProgressHandler.h /** @file ProgressHandler.hpp
* @brief Abstract base class 'ProgressHandler'. * @brief Abstract base class 'ProgressHandler'.
*/ */
#ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H #ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
#define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H #define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
#include "../include/assimp/ProgressHandler.h" #include "../include/assimp/ProgressHandler.hpp"
namespace Assimp { namespace Assimp {
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------

4
code/FileLogStream.h
View File

@ -1,8 +1,8 @@
#ifndef ASSIMP_FILELOGSTREAM_H_INC #ifndef ASSIMP_FILELOGSTREAM_H_INC
#define ASSIMP_FILELOGSTREAM_H_INC #define ASSIMP_FILELOGSTREAM_H_INC
#include "../include/assimp/LogStream.h" #include "../include/assimp/LogStream.hpp"
#include "../include/assimp/IOStream.h" #include "../include/assimp/IOStream.hpp"
namespace Assimp { namespace Assimp {

2
code/FileSystemFilter.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_FILESYSTEMFILTER_H_INC #ifndef AI_FILESYSTEMFILTER_H_INC
#define AI_FILESYSTEMFILTER_H_INC #define AI_FILESYSTEMFILTER_H_INC
#include "../include/assimp/IOSystem.h" #include "../include/assimp/IOSystem.hpp"
#include "fast_atof.h" #include "fast_atof.h"
#include "ParsingUtils.h" #include "ParsingUtils.h"
namespace Assimp { namespace Assimp {

2
code/FindDegenerates.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_FINDDEGENERATESPROCESS_H_INC #define AI_FINDDEGENERATESPROCESS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class FindDegeneratesProcessTest; class FindDegeneratesProcessTest;
namespace Assimp { namespace Assimp {

2
code/FindInvalidDataProcess.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_FINDINVALIDDATA_H_INC #define AI_FINDINVALIDDATA_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiMesh; struct aiMesh;
class FindInvalidDataProcessTest; class FindInvalidDataProcessTest;

2
code/GenFaceNormalsProcess.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_GENFACENORMALPROCESS_H_INC #define AI_GENFACENORMALPROCESS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
namespace Assimp namespace Assimp
{ {

2
code/GenVertexNormalsProcess.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_GENVERTEXNORMALPROCESS_H_INC #define AI_GENVERTEXNORMALPROCESS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class GenNormalsTest; class GenNormalsTest;

2
code/GenericProperty.h
View File

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_GENERIC_PROPERTY_H_INCLUDED #ifndef AI_GENERIC_PROPERTY_H_INCLUDED
#define AI_GENERIC_PROPERTY_H_INCLUDED #define AI_GENERIC_PROPERTY_H_INCLUDED
#include "./../include/assimp/assimp.hpp" #include "./../include/assimp/Importer.hpp"
#include "Hash.h" #include "Hash.h"
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------

6
code/HMPLoader.h
View File

@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_HMPLOADER_H_INCLUDED #define AI_HMPLOADER_H_INCLUDED
// public ASSIMP headers // public ASSIMP headers
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiTexture.h" #include "../include/assimp/texture.h"
#include "../include/assimp/aiMaterial.h" #include "../include/assimp/material.h"
// internal headers // internal headers
#include "BaseImporter.h" #include "BaseImporter.h"

2
code/Importer.cpp
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "AssimpPCH.h" #include "AssimpPCH.h"
#include "../include/assimp/aiVersion.h" #include "../include/assimp/version.h"
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
/* Uncomment this line to prevent Assimp from catching unknown exceptions. /* Uncomment this line to prevent Assimp from catching unknown exceptions.

2
code/ImproveCacheLocality.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_IMPROVECACHELOCALITY_H_INC #define AI_IMPROVECACHELOCALITY_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiMesh; struct aiMesh;

2
code/JoinVerticesProcess.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_JOINVERTICESPROCESS_H_INC #define AI_JOINVERTICESPROCESS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp namespace Assimp
{ {

2
code/LWOFileData.h
View File

@ -52,7 +52,7 @@ The chunks are taken from the official LightWave SDK headers.
#include <list> #include <list>
// public ASSIMP headers // public ASSIMP headers
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
// internal headers // internal headers
#include "IFF.h" #include "IFF.h"

4
code/LWOLoader.h
View File

@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_LWOLOADER_H_INCLUDED #ifndef AI_LWOLOADER_H_INCLUDED
#define AI_LWOLOADER_H_INCLUDED #define AI_LWOLOADER_H_INCLUDED
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/DefaultLogger.h" #include "../include/assimp/DefaultLogger.hpp"
#include "LWOFileData.h" #include "LWOFileData.h"
#include "BaseImporter.h" #include "BaseImporter.h"

6
code/MD2FileData.h
View File

@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MD2FILEHELPER_H_INC #ifndef AI_MD2FILEHELPER_H_INC
#define AI_MD2FILEHELPER_H_INC #define AI_MD2FILEHELPER_H_INC
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
#include "./../include/assimp/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"

2
code/MD2Loader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_MD2LOADER_H_INCLUDED #define AI_MD2LOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiNode; struct aiNode;
#include "MD2FileData.h" #include "MD2FileData.h"

6
code/MD3FileData.h
View File

@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
#include "./../include/assimp/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"

2
code/MD3Loader.h
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h" #include "BaseImporter.h"
#include "ByteSwap.h" #include "ByteSwap.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "MD3FileData.h" #include "MD3FileData.h"
namespace Assimp { namespace Assimp {

2
code/MD5Loader.h
View File

@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h" #include "BaseImporter.h"
#include "MD5Parser.h" #include "MD5Parser.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp { namespace Assimp {

2
code/MD5Parser.h
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MD5PARSER_H_INCLUDED #ifndef AI_MD5PARSER_H_INCLUDED
#define AI_MD5PARSER_H_INCLUDED #define AI_MD5PARSER_H_INCLUDED
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "ParsingUtils.h" #include "ParsingUtils.h"
struct aiFace; struct aiFace;

6
code/MDCFileData.h
View File

@ -49,9 +49,9 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
#ifndef AI_MDCFILEHELPER_H_INC #ifndef AI_MDCFILEHELPER_H_INC
#define AI_MDCFILEHELPER_H_INC #define AI_MDCFILEHELPER_H_INC
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
#include "./../include/assimp/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"

2
code/MDCLoader.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MDCLOADER_H_INCLUDED #ifndef AI_MDCLOADER_H_INCLUDED
#define AI_MDCLOADER_H_INCLUDED #define AI_MDCLOADER_H_INCLUDED
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "BaseImporter.h" #include "BaseImporter.h"
#include "MDCFileData.h" #include "MDCFileData.h"

2
code/NFFLoader.h
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseImporter.h" #include "BaseImporter.h"
#include <vector> #include <vector>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp { namespace Assimp {

2
code/OFFLoader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_OFFLOADER_H_INCLUDED #define AI_OFFLOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include <vector> #include <vector>
namespace Assimp { namespace Assimp {

2
code/ObjExporter.cpp
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
#include "ObjExporter.h" #include "ObjExporter.h"
#include "../include/assimp/aiVersion.h" #include "../include/assimp/version.h"
using namespace Assimp; using namespace Assimp;
namespace Assimp { namespace Assimp {

4
code/ObjFileData.h
View File

@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include <map> #include <map>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
namespace Assimp namespace Assimp
{ {

2
code/ObjFileParser.cpp
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ObjTools.h" #include "ObjTools.h"
#include "ObjFileData.h" #include "ObjFileData.h"
#include "ParsingUtils.h" #include "ParsingUtils.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "DefaultIOSystem.h" #include "DefaultIOSystem.h"
namespace Assimp namespace Assimp

2
code/OptimizeGraph.h
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseProcess.h" #include "BaseProcess.h"
#include "ProcessHelper.h" #include "ProcessHelper.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiMesh; struct aiMesh;
class OptimizeGraphProcessTest; class OptimizeGraphProcessTest;

2
code/OptimizeMeshes.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_OPTIMIZEMESHESPROCESS_H_INC #define AI_OPTIMIZEMESHESPROCESS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiMesh; struct aiMesh;
class OptimizeMeshesProcessTest; class OptimizeMeshesProcessTest;

2
code/PlyLoader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_PLYLOADER_H_INCLUDED #define AI_PLYLOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiNode; struct aiNode;

2
code/PretransformVertices.h
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_PRETRANSFORMVERTICES_H_INC #define AI_PRETRANSFORMVERTICES_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class PretransformVerticesTest; class PretransformVerticesTest;
namespace Assimp { namespace Assimp {

2
code/ProcessHelper.h
View File

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_PROCESS_HELPER_H_INCLUDED #ifndef AI_PROCESS_HELPER_H_INCLUDED
#define AI_PROCESS_HELPER_H_INCLUDED #define AI_PROCESS_HELPER_H_INCLUDED
#include "../include/assimp/aiPostProcess.h" #include "../include/assimp/postprocess.h"
#include "SpatialSort.h" #include "SpatialSort.h"
#include "BaseProcess.h" #include "BaseProcess.h"

2
code/Profiler.h
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "boost/timer.hpp" #include "boost/timer.hpp"
#include "../include/assimp/DefaultLogger.h" #include "../include/assimp/DefaultLogger.hpp"
#include "TinyFormatter.h" #include "TinyFormatter.h"
namespace Assimp { namespace Assimp {

4
code/Q3BSPFileImporter.cpp
View File

@ -53,8 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# include "../contrib/zlib/zlib.h" # include "../contrib/zlib/zlib.h"
#endif #endif
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include <vector> #include <vector>
namespace Assimp namespace Assimp

4
code/Q3BSPZipArchive.h
View File

@ -41,8 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_Q3BSP_ZIPARCHIVE_H_INC #define AI_Q3BSP_ZIPARCHIVE_H_INC
#include "../contrib/unzip/unzip.h" #include "../contrib/unzip/unzip.h"
#include "../include/assimp/IOStream.h" #include "../include/assimp/IOStream.hpp"
#include "../include/assimp/IOSystem.h" #include "../include/assimp/IOSystem.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>

2
code/Q3DLoader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_Q3DLOADER_H_INCLUDED #define AI_Q3DLOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include <vector> #include <vector>
namespace Assimp { namespace Assimp {

2
code/RawLoader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_RAWLOADER_H_INCLUDED #define AI_RAWLOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include <vector> #include <vector>
namespace Assimp { namespace Assimp {

2
code/RemoveComments.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_REMOVE_COMMENTS_H_INC #ifndef AI_REMOVE_COMMENTS_H_INC
#define AI_REMOVE_COMMENTS_H_INC #define AI_REMOVE_COMMENTS_H_INC
#include "../include/assimp/aiAssert.h" #include "../include/assimp/assert.h"
namespace Assimp { namespace Assimp {

2
code/RemoveRedundantMaterials.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_REMOVEREDUNDANTMATERIALS_H_INC #define AI_REMOVEREDUNDANTMATERIALS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class RemoveRedundantMatsTest; class RemoveRedundantMatsTest;
namespace Assimp { namespace Assimp {

2
code/RemoveVCProcess.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_REMOVEVCPROCESS_H_INCLUDED #define AI_REMOVEVCPROCESS_H_INCLUDED
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class RemoveVCProcessTest; class RemoveVCProcessTest;
namespace Assimp { namespace Assimp {

2
code/SGSpatialSort.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_D3DSSPATIALSORT_H_INC #define AI_D3DSSPATIALSORT_H_INC
#include <vector> #include <vector>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp { namespace Assimp {

8
code/SMDLoader.h
View File

@ -50,10 +50,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ParsingUtils.h" #include "ParsingUtils.h"
// public Assimp headers // public Assimp headers
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiTexture.h" #include "../include/assimp/texture.h"
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
#include "../include/assimp/aiMaterial.h" #include "../include/assimp/material.h"
struct aiNode; struct aiNode;
// STL headers // STL headers

2
code/STLExporter.cpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER) #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER)
#include "STLExporter.h" #include "STLExporter.h"
#include "../include/assimp/aiVersion.h" #include "../include/assimp/version.h"
using namespace Assimp; using namespace Assimp;
namespace Assimp { namespace Assimp {

2
code/STLLoader.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_STLLOADER_H_INCLUDED #define AI_STLLOADER_H_INCLUDED
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp { namespace Assimp {

2
code/SceneCombiner.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_SCENE_COMBINER_H_INC #ifndef AI_SCENE_COMBINER_H_INC
#define AI_SCENE_COMBINER_H_INC #define AI_SCENE_COMBINER_H_INC
#include "../include/assimp/aiAssert.h" #include "../include/assimp/assert.h"
namespace Assimp { namespace Assimp {

2
code/SkeletonMeshBuilder.cpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "AssimpPCH.h" #include "AssimpPCH.h"
#include "../include/assimp/aiScene.h" #include "../include/assimp/scene.h"
#include "SkeletonMeshBuilder.h" #include "SkeletonMeshBuilder.h"
using namespace Assimp; using namespace Assimp;

2
code/SkeletonMeshBuilder.h
View File

@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_SKELETONMESHBUILDER_H_INC #define AI_SKELETONMESHBUILDER_H_INC
#include <vector> #include <vector>
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
struct aiScene; struct aiScene;
struct aiNode; struct aiNode;

2
code/SortByPTypeProcess.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_SORTBYPTYPEPROCESS_H_INC #define AI_SORTBYPTYPEPROCESS_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
class SortByPTypeProcessTest; class SortByPTypeProcessTest;
namespace Assimp { namespace Assimp {

2
code/SpatialSort.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_SPATIALSORT_H_INC #define AI_SPATIALSORT_H_INC
#include <vector> #include <vector>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp namespace Assimp
{ {

4
code/SplitByBoneCountProcess.h
View File

@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiScene.h" #include "../include/assimp/scene.h"
namespace Assimp namespace Assimp
{ {

4
code/SplitLargeMeshes.h
View File

@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiScene.h" #include "../include/assimp/scene.h"
class SplitLargeMeshesTest; class SplitLargeMeshesTest;
namespace Assimp namespace Assimp

2
code/StdOStreamLogStream.h
View File

@ -1,7 +1,7 @@
#ifndef AI_STROSTREAMLOGSTREAM_H_INC #ifndef AI_STROSTREAMLOGSTREAM_H_INC
#define AI_STROSTREAMLOGSTREAM_H_INC #define AI_STROSTREAMLOGSTREAM_H_INC
#include "../include/assimp/LogStream.h" #include "../include/assimp/LogStream.hpp"
#include <ostream> #include <ostream>
namespace Assimp { namespace Assimp {

2
code/ValidateDataStructure.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_VALIDATEPROCESS_H_INC #ifndef AI_VALIDATEPROCESS_H_INC
#define AI_VALIDATEPROCESS_H_INC #define AI_VALIDATEPROCESS_H_INC
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "BaseProcess.h" #include "BaseProcess.h"
struct aiBone; struct aiBone;

4
code/VertexTriangleAdjacency.h
View File

@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_VTADJACENCY_H_INC #define AI_VTADJACENCY_H_INC
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiAssert.h" #include "../include/assimp/assert.h"
struct aiMesh; struct aiMesh;
namespace Assimp { namespace Assimp {

2
code/Win32DebugLogStream.h
View File

@ -3,7 +3,7 @@
#ifdef WIN32 #ifdef WIN32
#include "../include/assimp/LogStream.h" #include "../include/assimp/LogStream.hpp"
#include "windows.h" #include "windows.h"
namespace Assimp { namespace Assimp {

8
code/XFileHelper.h
View File

@ -46,10 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string> #include <string>
#include <vector> #include <vector>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
#include "../include/assimp/aiQuaternion.h" #include "../include/assimp/quaternion.h"
#include "../include/assimp/aiMesh.h" #include "../include/assimp/mesh.h"
#include "../include/assimp/aiAnim.h" #include "../include/assimp/anim.h"
namespace Assimp namespace Assimp
{ {

2
code/XFileImporter.h
View File

@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "XFileHelper.h" #include "XFileHelper.h"
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
struct aiNode; struct aiNode;

2
code/XFileParser.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string> #include <string>
#include <vector> #include <vector>
#include "../include/assimp/aiTypes.h" #include "../include/assimp/types.h"
namespace Assimp namespace Assimp
{ {

2
code/irrXMLWrapper.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// some long includes .... // some long includes ....
#include "./../contrib/irrXML/irrXML.h" #include "./../contrib/irrXML/irrXML.h"
#include "./../include/assimp/IOStream.h" #include "./../include/assimp/IOStream.hpp"
namespace Assimp { namespace Assimp {
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------

6
include/assimp/DefaultLogger.h → include/assimp/DefaultLogger.hpp
View File

@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef INCLUDED_AI_DEFAULTLOGGER #ifndef INCLUDED_AI_DEFAULTLOGGER
#define INCLUDED_AI_DEFAULTLOGGER #define INCLUDED_AI_DEFAULTLOGGER
#include "Logger.h" #include "Logger.hpp"
#include "LogStream.h" #include "LogStream.hpp"
#include "NullLogger.h" #include "NullLogger.hpp"
#include <vector> #include <vector>
namespace Assimp { namespace Assimp {

2
include/assimp/export.hpp → include/assimp/Exporter.hpp
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_EXPORT #ifndef ASSIMP_BUILD_NO_EXPORT
#include "export.h" #include "cexport.h"
namespace Assimp { namespace Assimp {
class ExporterPimpl; class ExporterPimpl;

2
include/assimp/IOStream.h → include/assimp/IOStream.hpp
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_IOSTREAM_H_INC #ifndef AI_IOSTREAM_H_INC
#define AI_IOSTREAM_H_INC #define AI_IOSTREAM_H_INC
#include "aiTypes.h" #include "types.h"
#ifndef __cplusplus #ifndef __cplusplus
# error This header requires C++ to be used. aiFileIO.h is the \ # error This header requires C++ to be used. aiFileIO.h is the \

2
include/assimp/IOSystem.h → include/assimp/IOSystem.hpp
View File

@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
corresponding C interface. corresponding C interface.
#endif #endif
#include "aiTypes.h" #include "types.h"
namespace Assimp { namespace Assimp {
class IOStream; class IOStream;

6
include/assimp/assimp.hpp → include/assimp/Importer.hpp
View File

@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif #endif
// Public ASSIMP data structures // Public ASSIMP data structures
#include "aiTypes.h" #include "types.h"
#include "aiConfig.h" #include "config.h"
#include "aiAssert.h" #include "assert.h"
namespace Assimp { namespace Assimp {
// ======================================================================= // =======================================================================

2
include/assimp/LogStream.h → include/assimp/LogStream.hpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef INCLUDED_AI_LOGSTREAM_H #ifndef INCLUDED_AI_LOGSTREAM_H
#define INCLUDED_AI_LOGSTREAM_H #define INCLUDED_AI_LOGSTREAM_H
#include "aiTypes.h" #include "types.h"
namespace Assimp { namespace Assimp {
class IOSystem; class IOSystem;

4
include/assimp/Logger.h → include/assimp/Logger.hpp
View File

@ -38,13 +38,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------- ----------------------------------------------------------------------
*/ */
/** @file Logger.h /** @file Logger.hpp
* @brief Abstract base class 'Logger', base of the logging system. * @brief Abstract base class 'Logger', base of the logging system.
*/ */
#ifndef INCLUDED_AI_LOGGER_H #ifndef INCLUDED_AI_LOGGER_H
#define INCLUDED_AI_LOGGER_H #define INCLUDED_AI_LOGGER_H
#include "aiTypes.h" #include "types.h"
namespace Assimp { namespace Assimp {
class LogStream; class LogStream;

2
include/assimp/NullLogger.h → include/assimp/NullLogger.hpp
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef INCLUDED_AI_NULLLOGGER_H #ifndef INCLUDED_AI_NULLLOGGER_H
#define INCLUDED_AI_NULLLOGGER_H #define INCLUDED_AI_NULLLOGGER_H
#include "Logger.h" #include "Logger.hpp"
namespace Assimp { namespace Assimp {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** @brief CPP-API: Empty logging implementation. /** @brief CPP-API: Empty logging implementation.

2
include/assimp/ProgressHandler.h → include/assimp/ProgressHandler.hpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef INCLUDED_AI_PROGRESSHANDLER_H #ifndef INCLUDED_AI_PROGRESSHANDLER_H
#define INCLUDED_AI_PROGRESSHANDLER_H #define INCLUDED_AI_PROGRESSHANDLER_H
#include "aiTypes.h" #include "types.h"
namespace Assimp { namespace Assimp {
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------

6
include/assimp/aiAnim.h → include/assimp/anim.h
View File

@ -39,15 +39,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
/** @file aiAnim.h /** @file anim.h
* @brief Defines the data structures in which the imported animations * @brief Defines the data structures in which the imported animations
* are returned. * are returned.
*/ */
#ifndef AI_ANIM_H_INC #ifndef AI_ANIM_H_INC
#define AI_ANIM_H_INC #define AI_ANIM_H_INC
#include "aiTypes.h" #include "types.h"
#include "aiQuaternion.h" #include "quaternion.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
include/assimp/aiAssert.h → include/assimp/assert.h
View File

@ -1,4 +1,4 @@
/** @file aiAssert.h /** @file assert.h
*/ */
#ifndef AI_DEBUG_H_INC #ifndef AI_DEBUG_H_INC
#define AI_DEBUG_H_INC #define AI_DEBUG_H_INC

4
include/assimp/aiCamera.h → include/assimp/camera.h
View File

@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
/** @file aiCamera.h /** @file camera.h
* @brief Defines the aiCamera data structure * @brief Defines the aiCamera data structure
*/ */
#ifndef AI_CAMERA_H_INC #ifndef AI_CAMERA_H_INC
#define AI_CAMERA_H_INC #define AI_CAMERA_H_INC
#include "aiTypes.h" #include "types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
include/assimp/export.h → include/assimp/cexport.h
View File

@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
/** @file export.h /** @file cexport.h
* @brief Defines the C-API for the Assimp export interface * @brief Defines the C-API for the Assimp export interface
*/ */
#ifndef AI_EXPORT_H_INC #ifndef AI_EXPORT_H_INC
@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_EXPORT #ifndef ASSIMP_BUILD_NO_EXPORT
#include "aiTypes.h" #include "types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
include/assimp/aiFileIO.h → include/assimp/cfileio.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_FILEIO_H_INC #ifndef AI_FILEIO_H_INC
#define AI_FILEIO_H_INC #define AI_FILEIO_H_INC
#include "aiTypes.h" #include "types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

8
include/assimp/assimp.h → include/assimp/cimport.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef AI_ASSIMP_H_INC #ifndef AI_ASSIMP_H_INC
#define AI_ASSIMP_H_INC #define AI_ASSIMP_H_INC
#include "aiTypes.h" #include "types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -354,7 +354,7 @@ ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
* specify them per import. * specify them per import.
* *
* @param szName Name of the configuration property to be set. All supported * @param szName Name of the configuration property to be set. All supported
* public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX). * public properties are defined in the config.h header file (#AI_CONFIG_XXX).
* @param value New value for the property * @param value New value for the property
*/ */
ASSIMP_API void aiSetImportPropertyInteger( ASSIMP_API void aiSetImportPropertyInteger(
@ -370,7 +370,7 @@ ASSIMP_API void aiSetImportPropertyInteger(
* specify them per import. * specify them per import.
* *
* @param szName Name of the configuration property to be set. All supported * @param szName Name of the configuration property to be set. All supported
* public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX). * public properties are defined in the config.h header file (#AI_CONFIG_XXX).
* @param value New value for the property * @param value New value for the property
*/ */
ASSIMP_API void aiSetImportPropertyFloat( ASSIMP_API void aiSetImportPropertyFloat(
@ -387,7 +387,7 @@ ASSIMP_API void aiSetImportPropertyFloat(
* *
* @param property store to modify. Use #aiCreatePropertyStore to obtain a store. * @param property store to modify. Use #aiCreatePropertyStore to obtain a store.
* @param szName Name of the configuration property to be set. All supported * @param szName Name of the configuration property to be set. All supported
* public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX). * public properties are defined in the config.h header file (#AI_CONFIG_XXX).
* @param value New value for the property * @param value New value for the property
*/ */
ASSIMP_API void aiSetImportPropertyString( ASSIMP_API void aiSetImportPropertyString(

0
include/assimp/aiColor4D.h → include/assimp/color4.h
View File

2
include/assimp/aiColor4D.inl → include/assimp/color4.inl
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_COLOR4D_INL_INC #define AI_COLOR4D_INL_INC
#ifdef __cplusplus #ifdef __cplusplus
#include "aiColor4D.h" #include "color4.h"
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
template <typename TReal> template <typename TReal>

2
include/assimp/aiConfig.h → include/assimp/config.h
View File

@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
/** @file aiConfig.h /** @file config.h
* @brief Defines constants for configurable properties for the library * @brief Defines constants for configurable properties for the library
* *
* Typically these properties are set via * Typically these properties are set via

0
include/assimp/aiDefines.h → include/assimp/defs.h
View File

4
include/assimp/aiLight.h → include/assimp/light.h
View File

@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
/** @file aiLight.h /** @file light.h
* @brief Defines the aiLight data structure * @brief Defines the aiLight data structure
*/ */
#ifndef __AI_LIGHT_H_INC__ #ifndef __AI_LIGHT_H_INC__
#define __AI_LIGHT_H_INC__ #define __AI_LIGHT_H_INC__
#include "aiTypes.h" #include "types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
include/assimp/aiMaterial.h → include/assimp/material.h
View File

@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
/** @file aiMaterial.h /** @file material.h
* @brief Defines the material system of the library * @brief Defines the material system of the library
*/ */
#ifndef AI_MATERIAL_H_INC #ifndef AI_MATERIAL_H_INC
#define AI_MATERIAL_H_INC #define AI_MATERIAL_H_INC
#include "aiTypes.h" #include "types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -1485,7 +1485,7 @@ C_ENUM aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
#ifdef __cplusplus #ifdef __cplusplus
} }
#include "aiMaterial.inl" #include "material.inl"
#endif //!__cplusplus #endif //!__cplusplus
#endif //!!AI_MATERIAL_H_INC #endif //!!AI_MATERIAL_H_INC

Some files were not shown because too many files have changed in this diff Show More