From 7207e5117cb3883206fd5b2d432ffc80fce9baaa Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 6 Jun 2016 22:04:29 +0200 Subject: [PATCH] Use new include bracktes. --- code/3DSConverter.cpp | 4 +-- code/3DSExporter.cpp | 6 ++--- code/3DSLoader.cpp | 6 ++--- code/3DSLoader.h | 2 +- code/ACLoader.cpp | 14 +++++------ code/ACLoader.h | 2 +- code/ASELoader.cpp | 10 ++++---- code/ASELoader.h | 2 +- code/ASEParser.cpp | 2 +- code/ASEParser.h | 6 ++--- code/AssbinExporter.cpp | 8 +++--- code/AssbinLoader.cpp | 8 +++--- code/AssbinLoader.h | 2 +- code/AssimpCExport.cpp | 2 +- code/AssxmlExporter.cpp | 8 +++--- code/B3DImporter.cpp | 8 +++--- code/B3DImporter.h | 6 ++--- code/BVHLoader.cpp | 6 ++--- code/BaseImporter.cpp | 6 ++--- code/BaseImporter.h | 4 +-- code/BaseProcess.cpp | 4 +-- code/BaseProcess.h | 2 +- code/Bitmap.cpp | 4 +-- code/BlenderDNA.h | 2 +- code/BlenderLoader.cpp | 2 +- code/BlenderModifier.cpp | 2 +- code/ByteSwapper.h | 4 +-- code/CInterfaceIOWrapper.h | 6 ++--- code/COBLoader.cpp | 6 ++--- code/CSMLoader.cpp | 10 ++++---- code/ColladaExporter.cpp | 6 ++--- code/ColladaExporter.h | 10 ++++---- code/ColladaHelper.h | 6 ++--- code/ColladaLoader.cpp | 8 +++--- code/ColladaParser.h | 2 +- code/ComputeUVMappingProcess.h | 9 +++---- code/ConvertToLHProcess.cpp | 6 ++--- code/ConvertToLHProcess.h | 2 +- code/D3MFImporter.cpp | 12 ++++----- code/D3MFOpcPackage.cpp | 20 ++++++--------- code/D3MFOpcPackage.h | 2 +- code/DXFHelper.h | 2 +- code/DXFLoader.cpp | 4 +-- code/DeboneProcess.h | 4 +-- code/DefaultIOStream.cpp | 2 +- code/DefaultIOStream.h | 4 +-- code/DefaultIOSystem.cpp | 4 +-- code/DefaultIOSystem.h | 2 +- code/DefaultLogger.cpp | 6 ++--- code/DefaultProgressHandler.h | 3 ++- code/Exporter.cpp | 8 +++--- code/FBXBinaryTokenizer.cpp | 2 +- code/FBXConverter.cpp | 2 +- code/FBXDocument.h | 2 +- code/FBXImporter.cpp | 2 +- code/FBXTokenizer.h | 2 +- code/FileLogStream.h | 4 +-- code/FindDegenerates.h | 2 +- code/FindInvalidDataProcess.h | 4 +-- code/FixNormalsStep.cpp | 6 ++--- code/GenFaceNormalsProcess.cpp | 6 ++--- code/GenFaceNormalsProcess.h | 2 +- code/GenVertexNormalsProcess.h | 2 +- code/GenericProperty.h | 4 +-- code/HMPLoader.cpp | 6 ++--- code/HMPLoader.h | 6 ++--- code/IFCLoader.cpp | 6 ++--- code/IFCMaterial.cpp | 2 +- code/IFCUtil.h | 5 ++-- code/IRRLoader.cpp | 12 ++++----- code/IRRLoader.h | 2 +- code/IRRMeshLoader.cpp | 10 ++++---- code/IRRShared.cpp | 4 +-- code/Importer.cpp | 2 +- code/Importer.h | 2 +- code/ImproveCacheLocality.cpp | 6 ++--- code/ImproveCacheLocality.h | 2 +- code/JoinVerticesProcess.h | 3 ++- code/LWOAnimation.h | 2 +- code/LWOFileData.h | 2 +- code/LWOLoader.cpp | 2 +- code/LWOLoader.h | 6 ++--- code/LWSLoader.cpp | 6 ++--- code/LimitBoneWeightsProcess.cpp | 6 ++--- code/LogAux.h | 2 +- code/MD2FileData.h | 10 ++++---- code/MD2Loader.cpp | 11 +++------ code/MD2Loader.h | 7 +++--- code/MD3FileData.h | 8 +++--- code/MD3Loader.cpp | 8 +++--- code/MD3Loader.h | 2 +- code/MD5Loader.cpp | 10 +++----- code/MD5Loader.h | 3 ++- code/MD5Parser.cpp | 4 +-- code/MD5Parser.h | 2 +- code/MDCFileData.h | 10 ++++---- code/MDCLoader.cpp | 8 +++--- code/MDCLoader.h | 5 ++-- code/MDLLoader.cpp | 13 +++++----- code/MDLMaterialLoader.cpp | 8 +++--- code/MS3DLoader.cpp | 6 ++--- code/MakeVerboseFormat.cpp | 4 +-- code/MaterialSystem.cpp | 6 ++--- code/MemoryIOWrapper.h | 6 ++--- code/NDOLoader.cpp | 6 ++--- code/NDOLoader.h | 2 +- code/NFFLoader.cpp | 8 +++--- code/NFFLoader.h | 4 +-- code/OFFLoader.cpp | 6 ++--- code/OFFLoader.h | 2 +- code/ObjFileImporter.h | 2 +- code/OgreBinarySerializer.cpp | 2 +- code/OgreImporter.cpp | 2 +- code/OgreImporter.h | 2 +- code/OgreMaterial.cpp | 6 ++--- code/OgreStructs.cpp | 4 +-- code/OgreStructs.h | 2 +- code/OgreXmlSerializer.cpp | 2 +- code/OpenGEXExporter.h | 2 +- code/OptimizeGraph.h | 2 +- code/OptimizeMeshes.h | 2 +- code/ParsingUtils.h | 2 +- code/PlyExporter.cpp | 8 +++--- code/PlyLoader.cpp | 4 +-- code/PlyLoader.h | 2 +- code/PlyParser.cpp | 2 +- code/PolyTools.h | 4 +-- code/PretransformVertices.h | 2 +- code/ProcessHelper.h | 12 ++++----- code/Profiler.h | 2 +- code/Q3BSPFileImporter.cpp | 8 +++--- code/Q3BSPFileParser.cpp | 6 ++--- code/Q3BSPZipArchive.cpp | 3 +-- code/Q3BSPZipArchive.h | 6 ++--- code/Q3DLoader.cpp | 6 ++--- code/Q3DLoader.h | 2 +- code/RawLoader.cpp | 6 ++--- code/RawLoader.h | 2 +- code/RemoveComments.h | 4 +-- code/RemoveRedundantMaterials.h | 2 +- code/RemoveVCProcess.cpp | 8 +++--- code/RemoveVCProcess.h | 2 +- code/SGSpatialSort.h | 4 +-- code/SIBImporter.cpp | 6 ++--- code/SIBImporter.h | 2 +- code/SMDLoader.cpp | 9 +++---- code/SMDLoader.h | 10 ++++---- code/STEPFile.h | 2 +- code/STLExporter.cpp | 8 +++--- code/STLLoader.cpp | 7 +++--- code/STLLoader.h | 2 +- code/SceneCombiner.cpp | 4 +-- code/SceneCombiner.h | 5 ++-- code/ScenePreprocessor.cpp | 6 ++--- code/ScenePreprocessor.h | 2 +- code/ScenePrivate.h | 6 ++--- code/SkeletonMeshBuilder.cpp | 2 +- code/SkeletonMeshBuilder.h | 2 +- code/SmoothingGroups.h | 2 +- code/SortByPTypeProcess.h | 2 +- code/SpatialSort.cpp | 2 +- code/SpatialSort.h | 2 +- code/SplitByBoneCountProcess.cpp | 4 +-- code/SplitByBoneCountProcess.h | 4 +-- code/SplitLargeMeshes.h | 5 ++-- code/StandardShapes.cpp | 2 +- code/StandardShapes.h | 2 +- code/StdOStreamLogStream.h | 42 +++++++++++++++++++++++++++++++- code/StepExporter.cpp | 6 ++--- code/StepExporter.h | 6 ++--- code/StreamReader.h | 2 +- code/StreamWriter.h | 2 +- code/StringComparison.h | 2 +- code/TargetAnimation.cpp | 2 +- code/TargetAnimation.h | 2 +- code/TerragenLoader.cpp | 9 ++++--- code/TextureTransform.h | 2 +- code/ValidateDataStructure.h | 4 +-- code/Vertex.h | 6 ++--- code/VertexTriangleAdjacency.cpp | 2 +- code/VertexTriangleAdjacency.h | 4 +-- code/Win32DebugLogStream.h | 2 +- code/XFileExporter.cpp | 8 +++--- code/XFileExporter.h | 6 ++--- code/XFileHelper.h | 8 +++--- code/XFileImporter.cpp | 10 ++++---- code/XFileImporter.h | 2 +- code/XFileParser.cpp | 2 +- code/XFileParser.h | 2 +- code/XGLLoader.cpp | 11 +++------ code/XGLLoader.h | 8 +++--- code/fast_atof.h | 2 +- code/qnan.h | 2 +- 193 files changed, 483 insertions(+), 463 deletions(-) diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp index 419b71b29..cb6fd9077 100644 --- a/code/3DSConverter.cpp +++ b/code/3DSConverter.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "3DSLoader.h" #include "TargetAnimation.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include #include "StringComparison.h" #include #include diff --git a/code/3DSExporter.cpp b/code/3DSExporter.cpp index 5450c1baf..5bb79408f 100644 --- a/code/3DSExporter.cpp +++ b/code/3DSExporter.cpp @@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SceneCombiner.h" #include "SplitLargeMeshes.h" #include "StringComparison.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include #include using namespace Assimp; diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp index 7c28f1f81..a2b73b2cb 100644 --- a/code/3DSLoader.cpp +++ b/code/3DSLoader.cpp @@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "3DSLoader.h" #include "Macros.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include #include "StringComparison.h" using namespace Assimp; diff --git a/code/3DSLoader.h b/code/3DSLoader.h index 134f4012b..437ec94b4 100644 --- a/code/3DSLoader.h +++ b/code/3DSLoader.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_3DSIMPORTER_H_INC #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER diff --git a/code/ACLoader.cpp b/code/ACLoader.cpp index fbe8cb009..c040d6bbd 100644 --- a/code/ACLoader.cpp +++ b/code/ACLoader.cpp @@ -53,13 +53,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Subdivision.h" #include "Importer.h" #include "BaseImporter.h" -#include "../include/assimp/Importer.hpp" -#include "../include/assimp/light.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/material.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/config.h" -#include "../include/assimp/IOSystem.hpp" +#include +#include +#include +#include +#include +#include +#include #include using namespace Assimp; diff --git a/code/ACLoader.h b/code/ACLoader.h index 7ea336666..52563adad 100644 --- a/code/ACLoader.h +++ b/code/ACLoader.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include struct aiNode; struct aiMesh; diff --git a/code/ASELoader.cpp b/code/ASELoader.cpp index 63aff6335..39a33e9fd 100644 --- a/code/ASELoader.cpp +++ b/code/ASELoader.cpp @@ -50,12 +50,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StringComparison.h" #include "SkeletonMeshBuilder.h" #include "TargetAnimation.h" -#include "../include/assimp/Importer.hpp" -#include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include +#include +#include // utilities #include "fast_atof.h" diff --git a/code/ASELoader.h b/code/ASELoader.h index e0cd55d49..b775fc6bb 100644 --- a/code/ASELoader.h +++ b/code/ASELoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_ASELOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include struct aiNode; #include "ASEParser.h" diff --git a/code/ASEParser.cpp b/code/ASEParser.cpp index 37b7ea0cd..204f8bf62 100644 --- a/code/ASEParser.cpp +++ b/code/ASEParser.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ASELoader.h" #include "MaterialSystem.h" #include "fast_atof.h" -#include "../include/assimp/DefaultLogger.hpp" +#include using namespace Assimp; using namespace Assimp::ASE; diff --git a/code/ASEParser.h b/code/ASEParser.h index 0a8931472..667c7c5a0 100644 --- a/code/ASEParser.h +++ b/code/ASEParser.h @@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_ASEFILEHELPER_H_INC // public ASSIMP headers -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include // for some helper routines like IsSpace() #include "ParsingUtils.h" diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp index 7df58cd2d..9240d3739 100644 --- a/code/AssbinExporter.cpp +++ b/code/AssbinExporter.cpp @@ -41,10 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ASSBIN exporter main code */ #include "assbin_chunks.h" -#include "../include/assimp/version.h" -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include +#include #include "ProcessHelper.h" #include "Exceptional.h" diff --git a/code/AssbinLoader.cpp b/code/AssbinLoader.cpp index 2e8e06f8a..c4261c4cb 100644 --- a/code/AssbinLoader.cpp +++ b/code/AssbinLoader.cpp @@ -51,14 +51,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AssbinLoader.h" #include "assbin_chunks.h" #include "MemoryIOWrapper.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" -#include "../include/assimp/scene.h" +#include +#include +#include #ifdef ASSIMP_BUILD_NO_OWN_ZLIB # include #else -# include "../contrib/zlib/zlib.h" +# include #endif using namespace Assimp; diff --git a/code/AssbinLoader.h b/code/AssbinLoader.h index 10d4f0901..e8c8dd0cb 100644 --- a/code/AssbinLoader.h +++ b/code/AssbinLoader.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_ASSBINIMPORTER_H_INC #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include struct aiMesh; struct aiNode; diff --git a/code/AssimpCExport.cpp b/code/AssimpCExport.cpp index c8c8fc107..c5f26fc47 100644 --- a/code/AssimpCExport.cpp +++ b/code/AssimpCExport.cpp @@ -47,7 +47,7 @@ Assimp C export interface. See Exporter.cpp for some notes. #include "CInterfaceIOWrapper.h" #include "SceneCombiner.h" #include "ScenePrivate.h" -#include "../include/assimp/Exporter.hpp" +#include using namespace Assimp; diff --git a/code/AssxmlExporter.cpp b/code/AssxmlExporter.cpp index 8ddbf8abc..f55f0174b 100644 --- a/code/AssxmlExporter.cpp +++ b/code/AssxmlExporter.cpp @@ -43,14 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "./../include/assimp/version.h" #include "ProcessHelper.h" -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include #ifdef ASSIMP_BUILD_NO_OWN_ZLIB # include #else -# include "../contrib/zlib/zlib.h" +# include #endif #include diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp index a8214814d..1b9ba1433 100644 --- a/code/B3DImporter.cpp +++ b/code/B3DImporter.cpp @@ -52,10 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ConvertToLHProcess.h" #include "StringUtils.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/anim.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include +#include using namespace Assimp; diff --git a/code/B3DImporter.h b/code/B3DImporter.h index 964ea46d6..92ddc0272 100644 --- a/code/B3DImporter.h +++ b/code/B3DImporter.h @@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_B3DIMPORTER_H_INC #define AI_B3DIMPORTER_H_INC -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/material.h" +#include +#include +#include #include "BaseImporter.h" #include diff --git a/code/BVHLoader.cpp b/code/BVHLoader.cpp index 6cca1f04a..ca6c5d36c 100644 --- a/code/BVHLoader.cpp +++ b/code/BVHLoader.cpp @@ -46,11 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BVHLoader.h" #include "fast_atof.h" #include "SkeletonMeshBuilder.h" -#include "../include/assimp/Importer.hpp" +#include #include #include "TinyFormatter.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" +#include +#include using namespace Assimp; using namespace Assimp::Formatter; diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp index a7e134c54..aa615e592 100644 --- a/code/BaseImporter.cpp +++ b/code/BaseImporter.cpp @@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FileSystemFilter.h" #include "Importer.h" #include "ByteSwapper.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/Importer.hpp" -#include "../include/assimp/postprocess.h" +#include +#include +#include #include #include #include diff --git a/code/BaseImporter.h b/code/BaseImporter.h index 167a03610..5c9ddfa5e 100644 --- a/code/BaseImporter.h +++ b/code/BaseImporter.h @@ -48,8 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "../include/assimp/types.h" -#include "../include/assimp/ProgressHandler.hpp" +#include +#include struct aiScene; diff --git a/code/BaseProcess.cpp b/code/BaseProcess.cpp index f0fb55e2b..580f89cdb 100644 --- a/code/BaseProcess.cpp +++ b/code/BaseProcess.cpp @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseImporter.h" #include "BaseProcess.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include #include "Importer.h" using namespace Assimp; diff --git a/code/BaseProcess.h b/code/BaseProcess.h index ec4ba3e4f..148f07284 100644 --- a/code/BaseProcess.h +++ b/code/BaseProcess.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "../include/assimp/types.h" +#include #include "GenericProperty.h" struct aiScene; diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp index 7611a45e8..ae6d62083 100644 --- a/code/Bitmap.cpp +++ b/code/Bitmap.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Bitmap.h" -#include "../include/assimp/texture.h" -#include "../include/assimp/IOStream.hpp" +#include +#include #include "ByteSwapper.h" namespace Assimp { diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h index 4257d9ca5..801d68fce 100644 --- a/code/BlenderDNA.h +++ b/code/BlenderDNA.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseImporter.h" #include "TinyFormatter.h" #include "StreamReader.h" -#include "../include/assimp/DefaultLogger.hpp" +#include #include #include diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp index e09bdbc5f..5bc358716 100644 --- a/code/BlenderLoader.cpp +++ b/code/BlenderLoader.cpp @@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BlenderModifier.h" #include "BlenderBMesh.h" #include "StringUtils.h" -#include "../include/assimp/scene.h" +#include #include "StringComparison.h" #include "StreamReader.h" diff --git a/code/BlenderModifier.cpp b/code/BlenderModifier.cpp index 84a727041..24aed25d0 100644 --- a/code/BlenderModifier.cpp +++ b/code/BlenderModifier.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BlenderModifier.h" #include "SceneCombiner.h" #include "Subdivision.h" -#include "../include/assimp/scene.h" +#include #include #include diff --git a/code/ByteSwapper.h b/code/ByteSwapper.h index db499552b..37538e7cb 100644 --- a/code/ByteSwapper.h +++ b/code/ByteSwapper.h @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_BYTESWAPPER_H_INC #define AI_BYTESWAPPER_H_INC -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/types.h" +#include +#include #include #if _MSC_VER >= 1400 diff --git a/code/CInterfaceIOWrapper.h b/code/CInterfaceIOWrapper.h index 9032b8391..beffd8678 100644 --- a/code/CInterfaceIOWrapper.h +++ b/code/CInterfaceIOWrapper.h @@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_CIOSYSTEM_H_INCLUDED #define AI_CIOSYSTEM_H_INCLUDED -#include "../include/assimp/cfileio.h" -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" +#include +#include +#include namespace Assimp { diff --git a/code/COBLoader.cpp b/code/COBLoader.cpp index e6fe76891..4f0ad3980 100644 --- a/code/COBLoader.cpp +++ b/code/COBLoader.cpp @@ -54,9 +54,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "LineSplitter.h" #include "TinyFormatter.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include using namespace Assimp; diff --git a/code/CSMLoader.cpp b/code/CSMLoader.cpp index 6a32141c7..925abf4bd 100644 --- a/code/CSMLoader.cpp +++ b/code/CSMLoader.cpp @@ -51,12 +51,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SkeletonMeshBuilder.h" #include "ParsingUtils.h" #include "fast_atof.h" -#include "../include/assimp/Importer.hpp" +#include #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/anim.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include +#include using namespace Assimp; diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp index a2d419af2..aa58b1e07 100644 --- a/code/ColladaExporter.cpp +++ b/code/ColladaExporter.cpp @@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SceneCombiner.h" #include "DefaultIOSystem.h" #include "XMLTools.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/Exporter.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include #include "Exceptional.h" diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h index 52a160224..84225c405 100644 --- a/code/ColladaExporter.h +++ b/code/ColladaExporter.h @@ -44,11 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_COLLADAEXPORTER_H_INC #define AI_COLLADAEXPORTER_H_INC -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/material.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/light.h" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include +#include +#include #include #include #include diff --git a/code/ColladaHelper.h b/code/ColladaHelper.h index 0a635a559..5a516429c 100644 --- a/code/ColladaHelper.h +++ b/code/ColladaHelper.h @@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "../include/assimp/light.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/material.h" +#include +#include +#include struct aiMaterial; diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index 7d8b29fbf..6cc0f858a 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -44,9 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER -#include "../include/assimp/anim.h" -#include "../include/assimp/scene.h" #include "ColladaLoader.h" +#include +#include +#include +#include #include "ColladaParser.h" #include "fast_atof.h" @@ -56,8 +58,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "time.h" #include "math.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/Importer.hpp" #include #include "Defines.h" diff --git a/code/ColladaParser.h b/code/ColladaParser.h index bbfad6d93..9193e2027 100644 --- a/code/ColladaParser.h +++ b/code/ColladaParser.h @@ -47,7 +47,7 @@ #include "irrXMLWrapper.h" #include "ColladaHelper.h" -#include "../include/assimp/ai_assert.h" +#include #include "TinyFormatter.h" #include diff --git a/code/ComputeUVMappingProcess.h b/code/ComputeUVMappingProcess.h index fd138ef86..db4287863 100644 --- a/code/ComputeUVMappingProcess.h +++ b/code/ComputeUVMappingProcess.h @@ -44,14 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_COMPUTEUVMAPPING_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/material.h" -#include "../include/assimp/types.h" +#include +#include +#include class ComputeUVMappingTest; -namespace Assimp - { +namespace Assimp { // --------------------------------------------------------------------------- /** ComputeUVMappingProcess - converts special mappings, such as spherical, diff --git a/code/ConvertToLHProcess.cpp b/code/ConvertToLHProcess.cpp index 05f8acd14..017282796 100644 --- a/code/ConvertToLHProcess.cpp +++ b/code/ConvertToLHProcess.cpp @@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ConvertToLHProcess.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include using namespace Assimp; diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h index 8c34056f7..0c5f91c96 100644 --- a/code/ConvertToLHProcess.h +++ b/code/ConvertToLHProcess.h @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_CONVERTTOLHPROCESS_H_INC #define AI_CONVERTTOLHPROCESS_H_INC -#include "../include/assimp/types.h" +#include #include "BaseProcess.h" struct aiMesh; diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp index f664e972d..1ca4bc74c 100644 --- a/code/D3MFImporter.cpp +++ b/code/D3MFImporter.cpp @@ -40,11 +40,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "D3MFImporter.h" -#include "../include/assimp/scene.h" -#include "../contrib/unzip/unzip.h" -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include +#include +#include #include "irrXMLWrapper.h" #include "StringComparison.h" @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/ai_assert.h" +#include #include "D3MFOpcPackage.h" diff --git a/code/D3MFOpcPackage.cpp b/code/D3MFOpcPackage.cpp index ae8dbccad..7cc1dd50b 100644 --- a/code/D3MFOpcPackage.cpp +++ b/code/D3MFOpcPackage.cpp @@ -40,6 +40,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "D3MFOpcPackage.h" +#include "Exceptional.h" + +#include +#include +#include +#include +#include #include #include @@ -48,19 +55,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include - -#include "../contrib/unzip/unzip.h" -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" - - -#include "../include/assimp/ai_assert.h" - -#include "Exceptional.h" - - - #ifndef ASSIMP_BUILD_NO_3MF_IMPORTER namespace Assimp { diff --git a/code/D3MFOpcPackage.h b/code/D3MFOpcPackage.h index 08e657e6e..dd8a40aab 100644 --- a/code/D3MFOpcPackage.h +++ b/code/D3MFOpcPackage.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/IOSystem.hpp" +#include #include "irrXMLWrapper.h" namespace Assimp { diff --git a/code/DXFHelper.h b/code/DXFHelper.h index 853e9a201..1947469a8 100644 --- a/code/DXFHelper.h +++ b/code/DXFHelper.h @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StreamReader.h" #include "fast_atof.h" #include -#include "../include/assimp/DefaultLogger.hpp" +#include namespace Assimp { namespace DXF { diff --git a/code/DXFLoader.cpp b/code/DXFLoader.cpp index 63759465d..3e69eff1e 100644 --- a/code/DXFLoader.cpp +++ b/code/DXFLoader.cpp @@ -52,8 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "fast_atof.h" #include "DXFHelper.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" +#include +#include #include using namespace Assimp; diff --git a/code/DeboneProcess.h b/code/DeboneProcess.h index 82f533841..5920473e2 100644 --- a/code/DeboneProcess.h +++ b/code/DeboneProcess.h @@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "BaseProcess.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/scene.h" +#include +#include class DeboneTest; diff --git a/code/DefaultIOStream.cpp b/code/DefaultIOStream.cpp index 31116e697..f1809d894 100644 --- a/code/DefaultIOStream.cpp +++ b/code/DefaultIOStream.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/assimp/ai_assert.h" +#include #include "DefaultIOStream.h" #include #include diff --git a/code/DefaultIOStream.h b/code/DefaultIOStream.h index c83f958d4..510fc1d05 100644 --- a/code/DefaultIOStream.h +++ b/code/DefaultIOStream.h @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_DEFAULTIOSTREAM_H_INC #include -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/importerdesc.h" +#include +#include #include "Defines.h" namespace Assimp { diff --git a/code/DefaultIOSystem.cpp b/code/DefaultIOSystem.cpp index ef142b178..8c44c8bd0 100644 --- a/code/DefaultIOSystem.cpp +++ b/code/DefaultIOSystem.cpp @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "DefaultIOStream.h" #include "StringComparison.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/ai_assert.h" +#include +#include #include diff --git a/code/DefaultIOSystem.h b/code/DefaultIOSystem.h index 32d191c2d..49960a847 100644 --- a/code/DefaultIOSystem.h +++ b/code/DefaultIOSystem.h @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_DEFAULTIOSYSTEM_H_INC #define AI_DEFAULTIOSYSTEM_H_INC -#include "../include/assimp/IOSystem.hpp" +#include namespace Assimp { diff --git a/code/DefaultLogger.cpp b/code/DefaultLogger.cpp index 9a7a81105..5364bd8bc 100644 --- a/code/DefaultLogger.cpp +++ b/code/DefaultLogger.cpp @@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StdOStreamLogStream.h" #include "FileLogStream.h" #include "StringUtils.h" -#include "../include/assimp/NullLogger.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/ai_assert.h" +#include +#include +#include #include #include diff --git a/code/DefaultProgressHandler.h b/code/DefaultProgressHandler.h index 8c0abfbfc..b729e4bfa 100644 --- a/code/DefaultProgressHandler.h +++ b/code/DefaultProgressHandler.h @@ -44,7 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H #define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H -#include "../include/assimp/ProgressHandler.hpp" +#include + namespace Assimp { // ------------------------------------------------------------------------------------ diff --git a/code/Exporter.cpp b/code/Exporter.cpp index b4a4ae2de..af2267a62 100644 --- a/code/Exporter.cpp +++ b/code/Exporter.cpp @@ -64,10 +64,10 @@ Here we implement only the C++ interface (Assimp::Exporter). #include "Exceptional.h" #include "ScenePrivate.h" #include -#include "../include/assimp/Exporter.hpp" -#include "../include/assimp/mesh.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/scene.h" +#include +#include +#include +#include #include namespace Assimp { diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp index aaa63d4aa..551b174ed 100644 --- a/code/FBXBinaryTokenizer.cpp +++ b/code/FBXBinaryTokenizer.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXTokenizer.h" #include "FBXUtil.h" -#include "../include/assimp/defs.h" +#include #include #include "Exceptional.h" #include "ByteSwapper.h" diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp index a1633b900..692cda836 100644 --- a/code/FBXConverter.cpp +++ b/code/FBXConverter.cpp @@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXImporter.h" #include "StringComparison.h" -#include "../include/assimp/scene.h" +#include #include #include diff --git a/code/FBXDocument.h b/code/FBXDocument.h index 7f19bd295..62d463bab 100644 --- a/code/FBXDocument.h +++ b/code/FBXDocument.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/mesh.h" +#include #include "FBXProperties.h" #include "FBXParser.h" diff --git a/code/FBXImporter.cpp b/code/FBXImporter.cpp index 9d6c4c021..b319da8b6 100644 --- a/code/FBXImporter.cpp +++ b/code/FBXImporter.cpp @@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StreamReader.h" #include "MemoryIOWrapper.h" -#include "../include/assimp/Importer.hpp" +#include namespace Assimp { template<> const std::string LogFunctions::log_prefix = "FBX: "; diff --git a/code/FBXTokenizer.h b/code/FBXTokenizer.h index 47fa7370e..f9f1fb871 100644 --- a/code/FBXTokenizer.h +++ b/code/FBXTokenizer.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "FBXCompileConfig.h" -#include "../include/assimp/ai_assert.h" +#include #include #include diff --git a/code/FileLogStream.h b/code/FileLogStream.h index 6a59af76b..574a63ed6 100644 --- a/code/FileLogStream.h +++ b/code/FileLogStream.h @@ -1,8 +1,8 @@ #ifndef ASSIMP_FILELOGSTREAM_H_INC #define ASSIMP_FILELOGSTREAM_H_INC -#include "../include/assimp/LogStream.hpp" -#include "../include/assimp/IOStream.hpp" +#include +#include #include "DefaultIOSystem.h" namespace Assimp { diff --git a/code/FindDegenerates.h b/code/FindDegenerates.h index 5dffd8a5e..7b945ea3a 100644 --- a/code/FindDegenerates.h +++ b/code/FindDegenerates.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_FINDDEGENERATESPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include class FindDegeneratesProcessTest; namespace Assimp { diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h index 6fdd000ed..371569380 100644 --- a/code/FindInvalidDataProcess.h +++ b/code/FindInvalidDataProcess.h @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_FINDINVALIDDATA_H_INC #include "BaseProcess.h" -#include "../include/assimp/types.h" -#include "../include/assimp/anim.h" +#include +#include struct aiMesh; class FindInvalidDataProcessTest; diff --git a/code/FixNormalsStep.cpp b/code/FixNormalsStep.cpp index 5360e5b83..9249b13e9 100644 --- a/code/FixNormalsStep.cpp +++ b/code/FixNormalsStep.cpp @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "FixNormalsStep.h" #include "StringUtils.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/scene.h" +#include +#include +#include #include diff --git a/code/GenFaceNormalsProcess.cpp b/code/GenFaceNormalsProcess.cpp index d0155e0e2..9218d9db8 100644 --- a/code/GenFaceNormalsProcess.cpp +++ b/code/GenFaceNormalsProcess.cpp @@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "GenFaceNormalsProcess.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include #include "Exceptional.h" #include "qnan.h" diff --git a/code/GenFaceNormalsProcess.h b/code/GenFaceNormalsProcess.h index d1c367e1e..f56570078 100644 --- a/code/GenFaceNormalsProcess.h +++ b/code/GenFaceNormalsProcess.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_GENFACENORMALPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include namespace Assimp { diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h index a639b6ce1..5d8b61ead 100644 --- a/code/GenVertexNormalsProcess.h +++ b/code/GenVertexNormalsProcess.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_GENVERTEXNORMALPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include class GenNormalsTest; diff --git a/code/GenericProperty.h b/code/GenericProperty.h index 5d9dff3f3..507bfb693 100644 --- a/code/GenericProperty.h +++ b/code/GenericProperty.h @@ -41,8 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_GENERIC_PROPERTY_H_INCLUDED #define AI_GENERIC_PROPERTY_H_INCLUDED -#include "./../include/assimp/Importer.hpp" -#include "./../include/assimp/ai_assert.h" +#include +#include #include "Hash.h" #include diff --git a/code/HMPLoader.cpp b/code/HMPLoader.cpp index 7e879a543..560852691 100644 --- a/code/HMPLoader.cpp +++ b/code/HMPLoader.cpp @@ -48,9 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "HMPLoader.h" #include "MD2FileData.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include using namespace Assimp; diff --git a/code/HMPLoader.h b/code/HMPLoader.h index 9d5c77831..4dd0d9840 100644 --- a/code/HMPLoader.h +++ b/code/HMPLoader.h @@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_HMPLOADER_H_INCLUDED // public ASSIMP headers -#include "../include/assimp/types.h" -#include "../include/assimp/texture.h" -#include "../include/assimp/material.h" +#include +#include +#include // internal headers #include "BaseImporter.h" diff --git a/code/IFCLoader.cpp b/code/IFCLoader.cpp index bd0ec700f..34977f5b0 100644 --- a/code/IFCLoader.cpp +++ b/code/IFCLoader.cpp @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #ifndef ASSIMP_BUILD_NO_COMPRESSED_IFC -# include "../contrib/unzip/unzip.h" +# include #endif #include "IFCLoader.h" @@ -60,8 +60,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StreamReader.h" #include "MemoryIOWrapper.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/Importer.hpp" +#include +#include namespace Assimp { diff --git a/code/IFCMaterial.cpp b/code/IFCMaterial.cpp index 161c414c6..7525db089 100644 --- a/code/IFCMaterial.cpp +++ b/code/IFCMaterial.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER #include "IFCUtil.h" #include -#include "../include/assimp/material.h" +#include namespace Assimp { namespace IFC { diff --git a/code/IFCUtil.h b/code/IFCUtil.h index 9b0634cf6..43d20a434 100644 --- a/code/IFCUtil.h +++ b/code/IFCUtil.h @@ -48,9 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "IFCReaderGen.h" #include "IFCLoader.h" #include "STEPFile.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/material.h" - +#include +#include struct aiNode; diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp index cc0d2c5f4..2d702523d 100644 --- a/code/IRRLoader.cpp +++ b/code/IRRLoader.cpp @@ -59,12 +59,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // We need MathFunctions.h to compute the lcm/gcd of a number #include "MathFunctions.h" #include -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/mesh.h" -#include "../include/assimp/material.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/postprocess.h" +#include +#include +#include +#include +#include +#include using namespace Assimp; diff --git a/code/IRRLoader.h b/code/IRRLoader.h index e3ad849d3..129e0cc03 100644 --- a/code/IRRLoader.h +++ b/code/IRRLoader.h @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SceneCombiner.h" #include "Importer.h" #include "StringUtils.h" -#include "../include/assimp/anim.h" +#include namespace Assimp { diff --git a/code/IRRMeshLoader.cpp b/code/IRRMeshLoader.cpp index e92e5ebdf..0a2a54e84 100644 --- a/code/IRRMeshLoader.cpp +++ b/code/IRRMeshLoader.cpp @@ -49,11 +49,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ParsingUtils.h" #include "fast_atof.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/mesh.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/material.h" -#include "../include/assimp/scene.h" +#include +#include +#include +#include +#include #include "Macros.h" diff --git a/code/IRRShared.cpp b/code/IRRShared.cpp index 9feec3354..e38ad1378 100644 --- a/code/IRRShared.cpp +++ b/code/IRRShared.cpp @@ -51,8 +51,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "IRRShared.h" #include "ParsingUtils.h" #include "fast_atof.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/material.h" +#include +#include using namespace Assimp; diff --git a/code/Importer.cpp b/code/Importer.cpp index a9e95cb27..3599138eb 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Implementation of the CPP-API class #Importer */ -#include "../include/assimp/version.h" +#include // ------------------------------------------------------------------------------------------------ /* Uncomment this line to prevent Assimp from catching unknown exceptions. diff --git a/code/Importer.h b/code/Importer.h index bb1050c56..750b9bbbd 100644 --- a/code/Importer.h +++ b/code/Importer.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "../include/assimp/matrix4x4.h" +#include struct aiScene; diff --git a/code/ImproveCacheLocality.cpp b/code/ImproveCacheLocality.cpp index 46c2bf06f..9fd76508b 100644 --- a/code/ImproveCacheLocality.cpp +++ b/code/ImproveCacheLocality.cpp @@ -52,9 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ImproveCacheLocality.h" #include "VertexTriangleAdjacency.h" #include "StringUtils.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include #include #include diff --git a/code/ImproveCacheLocality.h b/code/ImproveCacheLocality.h index 5523ab2bb..d43f37f50 100644 --- a/code/ImproveCacheLocality.h +++ b/code/ImproveCacheLocality.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_IMPROVECACHELOCALITY_H_INC #include "BaseProcess.h" -#include "../include/assimp/types.h" +#include struct aiMesh; diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h index cad66ac9b..af92040d2 100644 --- a/code/JoinVerticesProcess.h +++ b/code/JoinVerticesProcess.h @@ -44,7 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_JOINVERTICESPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/types.h" +#include + struct aiMesh; namespace Assimp diff --git a/code/LWOAnimation.h b/code/LWOAnimation.h index 34dc5e480..257abecdd 100644 --- a/code/LWOAnimation.h +++ b/code/LWOAnimation.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_LWO_ANIMATION_INCLUDED #define AI_LWO_ANIMATION_INCLUDED -#include "../include/assimp/anim.h" +#include #include #include diff --git a/code/LWOFileData.h b/code/LWOFileData.h index 9f69bdd5f..d67cf7ec8 100644 --- a/code/LWOFileData.h +++ b/code/LWOFileData.h @@ -52,7 +52,7 @@ The chunks are taken from the official LightWave SDK headers. #include // public ASSIMP headers -#include "../include/assimp/mesh.h" +#include // internal headers #include "IFF.h" diff --git a/code/LWOLoader.cpp b/code/LWOLoader.cpp index a8e97e7b1..222ec8e2c 100644 --- a/code/LWOLoader.cpp +++ b/code/LWOLoader.cpp @@ -53,8 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ByteSwapper.h" #include "ProcessHelper.h" #include "ConvertToLHProcess.h" +#include #include -#include "../include/assimp/IOSystem.hpp" #include #include diff --git a/code/LWOLoader.h b/code/LWOLoader.h index b0bcc35dc..09d66cf24 100644 --- a/code/LWOLoader.h +++ b/code/LWOLoader.h @@ -42,9 +42,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_LWOLOADER_H_INCLUDED #define AI_LWOLOADER_H_INCLUDED -#include "../include/assimp/types.h" -#include "../include/assimp/material.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include #include "LWOFileData.h" #include "BaseImporter.h" diff --git a/code/LWSLoader.cpp b/code/LWSLoader.cpp index 4e8cb8172..a81c15a6e 100644 --- a/code/LWSLoader.cpp +++ b/code/LWSLoader.cpp @@ -55,9 +55,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SkeletonMeshBuilder.h" #include "ConvertToLHProcess.h" #include "Importer.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/IOSystem.hpp" +#include +#include +#include #include diff --git a/code/LimitBoneWeightsProcess.cpp b/code/LimitBoneWeightsProcess.cpp index 23990272f..e7fd9ab60 100644 --- a/code/LimitBoneWeightsProcess.cpp +++ b/code/LimitBoneWeightsProcess.cpp @@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "LimitBoneWeightsProcess.h" #include "StringUtils.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include #include using namespace Assimp; diff --git a/code/LogAux.h b/code/LogAux.h index 4b0c59cd1..f754903c6 100644 --- a/code/LogAux.h +++ b/code/LogAux.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "TinyFormatter.h" #include "Exceptional.h" -#include "../include/assimp/DefaultLogger.hpp" +#include namespace Assimp { diff --git a/code/MD2FileData.h b/code/MD2FileData.h index 4bb5db4ca..f7a494335 100644 --- a/code/MD2FileData.h +++ b/code/MD2FileData.h @@ -45,12 +45,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MD2FILEHELPER_H_INC #define AI_MD2FILEHELPER_H_INC -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include #include -#include "./../include/assimp/Compiler/pushpack1.h" +#include namespace Assimp { namespace MD2 { @@ -147,7 +147,7 @@ struct Skin char name[AI_MD2_MAXQPATH]; /* texture file name */ } PACK_STRUCT; -#include "./../include/assimp/Compiler/poppack1.h" +#include // --------------------------------------------------------------------------- diff --git a/code/MD2Loader.cpp b/code/MD2Loader.cpp index bb171a1bd..b4c124774 100644 --- a/code/MD2Loader.cpp +++ b/code/MD2Loader.cpp @@ -46,18 +46,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MD2Loader.h" #include "ByteSwapper.h" #include "MD2NormalTable.h" // shouldn't be included by other units -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/Importer.hpp" +#include +#include +#include +#include #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" - - using namespace Assimp; using namespace Assimp::MD2; - // helper macro to determine the size of an array #if (!defined ARRAYSIZE) # define ARRAYSIZE(_array) (int(sizeof(_array) / sizeof(_array[0]))) diff --git a/code/MD2Loader.h b/code/MD2Loader.h index 05acc3ae0..126c16359 100644 --- a/code/MD2Loader.h +++ b/code/MD2Loader.h @@ -45,14 +45,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_MD2LOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #include "ByteSwapper.h" - #include "MD2FileData.h" + struct aiNode; -namespace Assimp { - +namespace Assimp { using namespace MD2; diff --git a/code/MD3FileData.h b/code/MD3FileData.h index 57dbf990b..88a40f230 100644 --- a/code/MD3FileData.h +++ b/code/MD3FileData.h @@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include -#include "./../include/assimp/Compiler/pushpack1.h" +#include namespace Assimp { namespace MD3 { diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp index 81ab37f70..8294da489 100644 --- a/code/MD3Loader.cpp +++ b/code/MD3Loader.cpp @@ -57,11 +57,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "RemoveComments.h" #include "ParsingUtils.h" #include "Importer.h" -#include "../include/assimp/DefaultLogger.hpp" +#include #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/material.h" -#include "../include/assimp/scene.h" +#include +#include +#include #include diff --git a/code/MD3Loader.h b/code/MD3Loader.h index e5e7dcc07..6b8143a97 100644 --- a/code/MD3Loader.h +++ b/code/MD3Loader.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ByteSwapper.h" #include "MD3FileData.h" #include "StringComparison.h" -#include "../include/assimp/types.h" +#include #include diff --git a/code/MD5Loader.cpp b/code/MD5Loader.cpp index 4c26a9ea2..7927c9ab1 100644 --- a/code/MD5Loader.cpp +++ b/code/MD5Loader.cpp @@ -52,13 +52,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StringComparison.h" #include "fast_atof.h" #include "SkeletonMeshBuilder.h" -#include "../include/assimp/Importer.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include +#include #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" - - using namespace Assimp; diff --git a/code/MD5Loader.h b/code/MD5Loader.h index 9683f6751..9dfc08226 100644 --- a/code/MD5Loader.h +++ b/code/MD5Loader.h @@ -49,7 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseImporter.h" #include "MD5Parser.h" -#include "../include/assimp/types.h" +#include + struct aiNode; struct aiNodeAnim; diff --git a/code/MD5Parser.cpp b/code/MD5Parser.cpp index 8badb84cc..df666751b 100644 --- a/code/MD5Parser.cpp +++ b/code/MD5Parser.cpp @@ -50,8 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "fast_atof.h" #include "ParsingUtils.h" #include "StringComparison.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/mesh.h" +#include +#include diff --git a/code/MD5Parser.h b/code/MD5Parser.h index 5d5e608bb..78ade8430 100644 --- a/code/MD5Parser.h +++ b/code/MD5Parser.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MD5PARSER_H_INCLUDED #define AI_MD5PARSER_H_INCLUDED -#include "../include/assimp/types.h" +#include #include "ParsingUtils.h" #include #include diff --git a/code/MDCFileData.h b/code/MDCFileData.h index da6735a3e..c98828c28 100644 --- a/code/MDCFileData.h +++ b/code/MDCFileData.h @@ -49,11 +49,11 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf #ifndef AI_MDCFILEHELPER_H_INC #define AI_MDCFILEHELPER_H_INC -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include -#include "./../include/assimp/Compiler/pushpack1.h" +#include #include namespace Assimp { @@ -202,7 +202,7 @@ struct Shader } PACK_STRUCT; -#include "./../include/assimp/Compiler/poppack1.h" +#include // --------------------------------------------------------------------------- diff --git a/code/MDCLoader.cpp b/code/MDCLoader.cpp index 3d988fe25..661447acf 100644 --- a/code/MDCLoader.cpp +++ b/code/MDCLoader.cpp @@ -48,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MDCLoader.h" #include "MD3FileData.h" #include "MDCNormalTable.h" // shouldn't be included by other units -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/Importer.hpp" +#include +#include +#include +#include #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" using namespace Assimp; diff --git a/code/MDCLoader.h b/code/MDCLoader.h index 3cadc4ae4..fcfbc642d 100644 --- a/code/MDCLoader.h +++ b/code/MDCLoader.h @@ -44,13 +44,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MDCLOADER_H_INCLUDED #define AI_MDCLOADER_H_INCLUDED -#include "../include/assimp/types.h" +#include #include "BaseImporter.h" #include "MDCFileData.h" #include "ByteSwapper.h" -namespace Assimp { +namespace Assimp { + using namespace MDC; // --------------------------------------------------------------------------- diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index a7165828e..ba5c4c32c 100644 --- a/code/MDLLoader.cpp +++ b/code/MDLLoader.cpp @@ -49,16 +49,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_MDL_IMPORTER #include "MDLLoader.h" +#include "Macros.h" +#include "qnan.h" #include "MDLDefaultColorMap.h" #include "MD2FileData.h" #include "StringUtils.h" -#include "../include/assimp/Importer.hpp" +#include +#include +#include +#include + #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "Macros.h" -#include "qnan.h" using namespace Assimp; diff --git a/code/MDLMaterialLoader.cpp b/code/MDLMaterialLoader.cpp index 2499eae64..d1502d6fb 100644 --- a/code/MDLMaterialLoader.cpp +++ b/code/MDLMaterialLoader.cpp @@ -48,10 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MDLLoader.h" #include "MDLDefaultColorMap.h" #include "StringUtils.h" -#include "../include/assimp/texture.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include +#include #include "qnan.h" #include "Defines.h" diff --git a/code/MS3DLoader.cpp b/code/MS3DLoader.cpp index 6a0d21be8..ef16a756a 100644 --- a/code/MS3DLoader.cpp +++ b/code/MS3DLoader.cpp @@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "MS3DLoader.h" #include "StreamReader.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/IOSystem.hpp" +#include +#include +#include using namespace Assimp; diff --git a/code/MakeVerboseFormat.cpp b/code/MakeVerboseFormat.cpp index 451a61635..d51642cf6 100644 --- a/code/MakeVerboseFormat.cpp +++ b/code/MakeVerboseFormat.cpp @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MakeVerboseFormat.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include using namespace Assimp; diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp index 02f971737..94ca4364e 100644 --- a/code/MaterialSystem.cpp +++ b/code/MaterialSystem.cpp @@ -48,9 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "fast_atof.h" #include "ParsingUtils.h" #include "MaterialSystem.h" -#include "../include/assimp/types.h" -#include "../include/assimp/material.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include #include "Macros.h" using namespace Assimp; diff --git a/code/MemoryIOWrapper.h b/code/MemoryIOWrapper.h index acd6d8633..d6aaafae0 100644 --- a/code/MemoryIOWrapper.h +++ b/code/MemoryIOWrapper.h @@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MEMORYIOSTREAM_H_INC #define AI_MEMORYIOSTREAM_H_INC -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/ai_assert.h" +#include +#include +#include #include namespace Assimp { diff --git a/code/NDOLoader.cpp b/code/NDOLoader.cpp index 699e97051..f04eb5345 100644 --- a/code/NDOLoader.cpp +++ b/code/NDOLoader.cpp @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_NDO_IMPORTER #include "NDOLoader.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include #include "StreamReader.h" using namespace Assimp; diff --git a/code/NDOLoader.h b/code/NDOLoader.h index 1a6e333f1..4fd315691 100644 --- a/code/NDOLoader.h +++ b/code/NDOLoader.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_NDO_LOADER_H #define INCLUDED_AI_NDO_LOADER_H -#include "../include/assimp/vector3.h" +#include #include "BaseImporter.h" #include #include diff --git a/code/NFFLoader.cpp b/code/NFFLoader.cpp index 09536acdb..8bec63ea3 100644 --- a/code/NFFLoader.cpp +++ b/code/NFFLoader.cpp @@ -48,13 +48,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "NFFLoader.h" #include "ParsingUtils.h" #include "StandardShapes.h" +#include "qnan.h" #include "fast_atof.h" #include "RemoveComments.h" +#include +#include +#include #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" -#include "qnan.h" using namespace Assimp; diff --git a/code/NFFLoader.h b/code/NFFLoader.h index 5339cbe78..2b5232645 100644 --- a/code/NFFLoader.h +++ b/code/NFFLoader.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_NFFLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" -#include "../include/assimp/material.h" +#include +#include #include diff --git a/code/OFFLoader.cpp b/code/OFFLoader.cpp index be5b383b6..fd0542fdf 100644 --- a/code/OFFLoader.cpp +++ b/code/OFFLoader.cpp @@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ParsingUtils.h" #include "fast_atof.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include using namespace Assimp; diff --git a/code/OFFLoader.h b/code/OFFLoader.h index a4f38c3ae..f01dc6244 100644 --- a/code/OFFLoader.h +++ b/code/OFFLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_OFFLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #include namespace Assimp { diff --git a/code/ObjFileImporter.h b/code/ObjFileImporter.h index 37420406c..b03d00b9b 100644 --- a/code/ObjFileImporter.h +++ b/code/ObjFileImporter.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define OBJ_FILE_IMPORTER_H_INC #include "BaseImporter.h" -#include "../include/assimp/material.h" +#include #include struct aiMesh; diff --git a/code/OgreBinarySerializer.cpp b/code/OgreBinarySerializer.cpp index d823d37fa..ce17cea6a 100644 --- a/code/OgreBinarySerializer.cpp +++ b/code/OgreBinarySerializer.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OgreParsingUtils.h" #include "TinyFormatter.h" -#include "../include/assimp/DefaultLogger.hpp" +#include #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER diff --git a/code/OgreImporter.cpp b/code/OgreImporter.cpp index 36d03e677..504f6a96f 100644 --- a/code/OgreImporter.cpp +++ b/code/OgreImporter.cpp @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OgreImporter.h" #include "OgreBinarySerializer.h" #include "OgreXmlSerializer.h" -#include "../include/assimp/Importer.hpp" +#include #include static const aiImporterDesc desc = { diff --git a/code/OgreImporter.h b/code/OgreImporter.h index 60140f673..8b2179502 100644 --- a/code/OgreImporter.h +++ b/code/OgreImporter.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OgreStructs.h" #include "OgreParsingUtils.h" -#include "../include/assimp/material.h" +#include namespace Assimp { diff --git a/code/OgreMaterial.cpp b/code/OgreMaterial.cpp index 98becbb6d..f9da9d584 100644 --- a/code/OgreMaterial.cpp +++ b/code/OgreMaterial.cpp @@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OgreImporter.h" #include "TinyFormatter.h" -#include "../include/assimp/material.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include #include "fast_atof.h" #include diff --git a/code/OgreStructs.cpp b/code/OgreStructs.cpp index 593f0b90e..e2e8c8103 100644 --- a/code/OgreStructs.cpp +++ b/code/OgreStructs.cpp @@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OgreStructs.h" #include "TinyFormatter.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include #include "Exceptional.h" diff --git a/code/OgreStructs.h b/code/OgreStructs.h index 430ba672d..c4e86a805 100644 --- a/code/OgreStructs.h +++ b/code/OgreStructs.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MemoryIOWrapper.h" #include -#include "../include/assimp/mesh.h" +#include #include #include #include diff --git a/code/OgreXmlSerializer.cpp b/code/OgreXmlSerializer.cpp index b011b842f..494d8e00c 100644 --- a/code/OgreXmlSerializer.cpp +++ b/code/OgreXmlSerializer.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OgreParsingUtils.h" #include "TinyFormatter.h" -#include "../include/assimp/DefaultLogger.hpp" +#include #include #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER diff --git a/code/OpenGEXExporter.h b/code/OpenGEXExporter.h index ac9d9c860..f9757f41c 100644 --- a/code/OpenGEXExporter.h +++ b/code/OpenGEXExporter.h @@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_OPENGEX_EXPORTER_H #define AI_OPENGEX_EXPORTER_H -#include "../include/assimp/types.h" +#include #ifndef ASSIMP_BUILD_NO_OPENGEX_EXPORTER diff --git a/code/OptimizeGraph.h b/code/OptimizeGraph.h index 7ac9b00e8..7b3a1d0de 100644 --- a/code/OptimizeGraph.h +++ b/code/OptimizeGraph.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseProcess.h" #include "ProcessHelper.h" -#include "../include/assimp/types.h" +#include #include struct aiMesh; diff --git a/code/OptimizeMeshes.h b/code/OptimizeMeshes.h index ac7801c0a..fc8b6a10b 100644 --- a/code/OptimizeMeshes.h +++ b/code/OptimizeMeshes.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_OPTIMIZEMESHESPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/types.h" +#include #include struct aiMesh; diff --git a/code/ParsingUtils.h b/code/ParsingUtils.h index 07f2c1846..2371ee606 100644 --- a/code/ParsingUtils.h +++ b/code/ParsingUtils.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StringComparison.h" #include "StringUtils.h" -#include "../include/assimp/defs.h" +#include namespace Assimp { diff --git a/code/PlyExporter.cpp b/code/PlyExporter.cpp index c788e19ce..b882521f6 100644 --- a/code/PlyExporter.cpp +++ b/code/PlyExporter.cpp @@ -46,10 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "Exceptional.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/version.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include +#include #include "qnan.h" diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index c1de333e0..d4dc2f864 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "PlyLoader.h" #include "Macros.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" +#include +#include using namespace Assimp; diff --git a/code/PlyLoader.h b/code/PlyLoader.h index d83e70be3..71b483c57 100644 --- a/code/PlyLoader.h +++ b/code/PlyLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_PLYLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #include "PlyParser.h" #include diff --git a/code/PlyParser.cpp b/code/PlyParser.cpp index 9ea727915..06e4038f4 100644 --- a/code/PlyParser.cpp +++ b/code/PlyParser.cpp @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "PlyLoader.h" #include "fast_atof.h" -#include "../include/assimp/DefaultLogger.hpp" +#include #include "ByteSwapper.h" diff --git a/code/PolyTools.h b/code/PolyTools.h index d2539d65d..80e1dd173 100644 --- a/code/PolyTools.h +++ b/code/PolyTools.h @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_POLYTOOLS_H_INCLUDED #define AI_POLYTOOLS_H_INCLUDED -#include "../include/assimp/material.h" -#include "../include/assimp/ai_assert.h" +#include +#include namespace Assimp { diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h index 307c9017e..28bd95a67 100644 --- a/code/PretransformVertices.h +++ b/code/PretransformVertices.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_PRETRANSFORMVERTICES_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include #include #include diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h index 2a7577610..3f50a46c6 100644 --- a/code/ProcessHelper.h +++ b/code/ProcessHelper.h @@ -41,12 +41,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_PROCESS_HELPER_H_INCLUDED #define AI_PROCESS_HELPER_H_INCLUDED -#include "../include/assimp/postprocess.h" -#include "../include/assimp/anim.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/material.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include +#include +#include +#include #include "SpatialSort.h" #include "BaseProcess.h" diff --git a/code/Profiler.h b/code/Profiler.h index 543642c74..9354339a2 100644 --- a/code/Profiler.h +++ b/code/Profiler.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define INCLUDED_PROFILER_H #include -#include "../include/assimp/DefaultLogger.hpp" +#include #include "TinyFormatter.h" #include diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index bfdafcc96..47001d06f 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -53,10 +53,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # include "../contrib/zlib/zlib.h" #endif -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/ai_assert.h" +#include +#include +#include +#include #include #include #include "StringComparison.h" diff --git a/code/Q3BSPFileParser.cpp b/code/Q3BSPFileParser.cpp index e3220f619..db2247b8a 100644 --- a/code/Q3BSPFileParser.cpp +++ b/code/Q3BSPFileParser.cpp @@ -46,11 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Q3BSPFileData.h" #include "Q3BSPZipArchive.h" #include -#include "../include/assimp/ai_assert.h" +#include - -namespace Assimp -{ +namespace Assimp { using namespace Q3BSP; diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp index 0222042db..59e437836 100644 --- a/code/Q3BSPZipArchive.cpp +++ b/code/Q3BSPZipArchive.cpp @@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "../include/assimp/ai_assert.h" - +#include namespace Assimp { namespace Q3BSP { diff --git a/code/Q3BSPZipArchive.h b/code/Q3BSPZipArchive.h index 3b9bc2b3f..e46a11b4c 100644 --- a/code/Q3BSPZipArchive.h +++ b/code/Q3BSPZipArchive.h @@ -40,9 +40,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_Q3BSP_ZIPARCHIVE_H_INC #define AI_Q3BSP_ZIPARCHIVE_H_INC -#include "../contrib/unzip/unzip.h" -#include "../include/assimp/IOStream.hpp" -#include "../include/assimp/IOSystem.hpp" +#include +#include +#include #include #include #include diff --git a/code/Q3DLoader.cpp b/code/Q3DLoader.cpp index cb73c3fe4..d9dc29672 100644 --- a/code/Q3DLoader.cpp +++ b/code/Q3DLoader.cpp @@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Q3DLoader.h" #include "StreamReader.h" #include "fast_atof.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include using namespace Assimp; diff --git a/code/Q3DLoader.h b/code/Q3DLoader.h index 89f4279fa..fb1dd1818 100644 --- a/code/Q3DLoader.h +++ b/code/Q3DLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_Q3DLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #include #include diff --git a/code/RawLoader.cpp b/code/RawLoader.cpp index 582323cfd..57e0fc119 100644 --- a/code/RawLoader.cpp +++ b/code/RawLoader.cpp @@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ParsingUtils.h" #include "fast_atof.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include using namespace Assimp; diff --git a/code/RawLoader.h b/code/RawLoader.h index 436966cd9..984141a04 100644 --- a/code/RawLoader.h +++ b/code/RawLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_RAWLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #include namespace Assimp { diff --git a/code/RemoveComments.h b/code/RemoveComments.h index 55eab9943..856ed74bf 100644 --- a/code/RemoveComments.h +++ b/code/RemoveComments.h @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_REMOVE_COMMENTS_H_INC #define AI_REMOVE_COMMENTS_H_INC -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/defs.h" +#include +#include namespace Assimp { diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h index fe9f564d0..60efad9a4 100644 --- a/code/RemoveRedundantMaterials.h +++ b/code/RemoveRedundantMaterials.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_REMOVEREDUNDANTMATERIALS_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include class RemoveRedundantMatsTest; namespace Assimp { diff --git a/code/RemoveVCProcess.cpp b/code/RemoveVCProcess.cpp index 17ad5ff33..473460452 100644 --- a/code/RemoveVCProcess.cpp +++ b/code/RemoveVCProcess.cpp @@ -44,14 +44,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "RemoveVCProcess.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" - +#include +#include +#include using namespace Assimp; - // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer RemoveVCProcess::RemoveVCProcess() : diff --git a/code/RemoveVCProcess.h b/code/RemoveVCProcess.h index 2a434e9ab..a9173a815 100644 --- a/code/RemoveVCProcess.h +++ b/code/RemoveVCProcess.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_REMOVEVCPROCESS_H_INCLUDED #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include class RemoveVCProcessTest; diff --git a/code/SGSpatialSort.h b/code/SGSpatialSort.h index 360037067..59a5c37d6 100644 --- a/code/SGSpatialSort.h +++ b/code/SGSpatialSort.h @@ -38,12 +38,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -/** Small helper classes to optimise finding vertizes close to a given location +/** Small helper classes to optimize finding vertices close to a given location */ #ifndef AI_D3DSSPATIALSORT_H_INC #define AI_D3DSSPATIALSORT_H_INC -#include "../include/assimp/types.h" +#include #include #include diff --git a/code/SIBImporter.cpp b/code/SIBImporter.cpp index 586faf15d..b972f28d6 100644 --- a/code/SIBImporter.cpp +++ b/code/SIBImporter.cpp @@ -58,9 +58,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StreamReader.h" #include "TinyFormatter.h" #include "../contrib/ConvertUTF/ConvertUTF.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include +#include using namespace Assimp; diff --git a/code/SIBImporter.h b/code/SIBImporter.h index d31241f79..d82a40da0 100644 --- a/code/SIBImporter.h +++ b/code/SIBImporter.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SIBIMPORTER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include #include namespace Assimp { diff --git a/code/SMDLoader.cpp b/code/SMDLoader.cpp index 01a229468..7aef7bc56 100644 --- a/code/SMDLoader.cpp +++ b/code/SMDLoader.cpp @@ -50,12 +50,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SMDLoader.h" #include "fast_atof.h" #include "SkeletonMeshBuilder.h" -#include "../include/assimp/Importer.hpp" -#include "../include/assimp/IOSystem.hpp" +#include +#include +#include +#include #include -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" - using namespace Assimp; diff --git a/code/SMDLoader.h b/code/SMDLoader.h index ab6ab3d9a..0b069cc25 100644 --- a/code/SMDLoader.h +++ b/code/SMDLoader.h @@ -50,10 +50,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ParsingUtils.h" // public Assimp headers -#include "../include/assimp/types.h" -#include "../include/assimp/texture.h" -#include "../include/assimp/anim.h" -#include "../include/assimp/material.h" +#include +#include +#include +#include + struct aiNode; // STL headers @@ -61,7 +62,6 @@ struct aiNode; namespace Assimp { - namespace SMD { // --------------------------------------------------------------------------- diff --git a/code/STEPFile.h b/code/STEPFile.h index 252e75dbb..e09add1eb 100644 --- a/code/STEPFile.h +++ b/code/STEPFile.h @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "FBXDocument.h" //ObjectMap::value_type -#include "../include/assimp/DefaultLogger.hpp" +#include // #if _MSC_VER > 1500 || (defined __GNUC___) diff --git a/code/STLExporter.cpp b/code/STLExporter.cpp index 7491e6b1b..a5c5484c6 100644 --- a/code/STLExporter.cpp +++ b/code/STLExporter.cpp @@ -43,10 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER) #include "STLExporter.h" -#include "../include/assimp/version.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include +#include #include #include "Exceptional.h" #include "ByteSwapper.h" diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp index 99716688b..95fce47e2 100644 --- a/code/STLLoader.cpp +++ b/code/STLLoader.cpp @@ -49,10 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ParsingUtils.h" #include "fast_atof.h" #include -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" - +#include +#include +#include using namespace Assimp; diff --git a/code/STLLoader.h b/code/STLLoader.h index 2d310f65b..a0d82dbe8 100644 --- a/code/STLLoader.h +++ b/code/STLLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_STLLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include namespace Assimp { diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index 5a138f809..b39adbf78 100644 --- a/code/SceneCombiner.cpp +++ b/code/SceneCombiner.cpp @@ -54,8 +54,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "fast_atof.h" #include "Hash.h" #include "time.h" -#include "../include/assimp/DefaultLogger.hpp" -#include "../include/assimp/scene.h" +#include +#include #include #include "ScenePrivate.h" diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h index ddb4e8f7d..81e58aaf3 100644 --- a/code/SceneCombiner.h +++ b/code/SceneCombiner.h @@ -44,14 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_SCENE_COMBINER_H_INC #define AI_SCENE_COMBINER_H_INC -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/types.h" +#include +#include #include "Defines.h" #include #include #include #include -//#include "../include/assimp/Compiler/pstdint.h" #include diff --git a/code/ScenePreprocessor.cpp b/code/ScenePreprocessor.cpp index 7f187ad90..a38a9430e 100644 --- a/code/ScenePreprocessor.cpp +++ b/code/ScenePreprocessor.cpp @@ -39,9 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ScenePreprocessor.h" -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include using namespace Assimp; diff --git a/code/ScenePreprocessor.h b/code/ScenePreprocessor.h index 1ef2d3e3b..9c4b422a2 100644 --- a/code/ScenePreprocessor.h +++ b/code/ScenePreprocessor.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_SCENE_PREPROCESSOR_H_INC #define AI_SCENE_PREPROCESSOR_H_INC -#include "../include/assimp/defs.h" +#include #include struct aiScene; diff --git a/code/ScenePrivate.h b/code/ScenePrivate.h index 055a7e15d..dd4d0a5e1 100644 --- a/code/ScenePrivate.h +++ b/code/ScenePrivate.h @@ -43,11 +43,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_SCENEPRIVATE_H_INCLUDED #define AI_SCENEPRIVATE_H_INCLUDED -#include "../include/assimp/scene.h" +#include namespace Assimp { - class Importer; +class Importer; struct ScenePrivateData { @@ -61,7 +61,7 @@ struct ScenePrivateData { // If set, this object is owned by this private data instance. Assimp::Importer* mOrigImporter; - // List of postprocessing steps already applied to the scene. + // List of post-processing steps already applied to the scene. unsigned int mPPStepsApplied; // true if the scene is a copy made with aiCopyScene() diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp index a3ef75b65..ec7aa8985 100644 --- a/code/SkeletonMeshBuilder.cpp +++ b/code/SkeletonMeshBuilder.cpp @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Implementation of a little class to construct a dummy mesh for a skeleton */ -#include "../include/assimp/scene.h" +#include #include "SkeletonMeshBuilder.h" using namespace Assimp; diff --git a/code/SkeletonMeshBuilder.h b/code/SkeletonMeshBuilder.h index fe9651088..3c518e8cd 100644 --- a/code/SkeletonMeshBuilder.h +++ b/code/SkeletonMeshBuilder.h @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SKELETONMESHBUILDER_H_INC #include -#include "../include/assimp/mesh.h" +#include struct aiMaterial; struct aiScene; diff --git a/code/SmoothingGroups.h b/code/SmoothingGroups.h index a9921e4e2..75c59d1cb 100644 --- a/code/SmoothingGroups.h +++ b/code/SmoothingGroups.h @@ -44,7 +44,7 @@ http://www.jalix.org/ressources/graphics/3DS/_unofficials/3ds-unofficial.txt */ #ifndef AI_SMOOTHINGGROUPS_H_INC #define AI_SMOOTHINGGROUPS_H_INC -#include "../include/assimp/vector3.h" +#include #include #include diff --git a/code/SortByPTypeProcess.h b/code/SortByPTypeProcess.h index c834bfa3f..f96985cb3 100644 --- a/code/SortByPTypeProcess.h +++ b/code/SortByPTypeProcess.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SORTBYPTYPEPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include class SortByPTypeProcessTest; namespace Assimp { diff --git a/code/SpatialSort.cpp b/code/SpatialSort.cpp index c536af1b5..c4e4ef2d5 100644 --- a/code/SpatialSort.cpp +++ b/code/SpatialSort.cpp @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Implementation of the helper class to quickly find vertices close to a given position */ #include "SpatialSort.h" -#include "../include/assimp/ai_assert.h" +#include using namespace Assimp; diff --git a/code/SpatialSort.h b/code/SpatialSort.h index 983a26c4b..b594fc6d1 100644 --- a/code/SpatialSort.h +++ b/code/SpatialSort.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SPATIALSORT_H_INC #include -#include "../include/assimp/types.h" +#include namespace Assimp { diff --git a/code/SplitByBoneCountProcess.cpp b/code/SplitByBoneCountProcess.cpp index cbc60beec..58b14ff49 100644 --- a/code/SplitByBoneCountProcess.cpp +++ b/code/SplitByBoneCountProcess.cpp @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers of the post-processing framework #include "SplitByBoneCountProcess.h" -#include "../include/assimp/postprocess.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include #include #include "TinyFormatter.h" diff --git a/code/SplitByBoneCountProcess.h b/code/SplitByBoneCountProcess.h index 39f47d043..816d18357 100644 --- a/code/SplitByBoneCountProcess.h +++ b/code/SplitByBoneCountProcess.h @@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "BaseProcess.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/scene.h" +#include +#include namespace Assimp { diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h index 58575c9a7..9be27a8f1 100644 --- a/code/SplitLargeMeshes.h +++ b/code/SplitLargeMeshes.h @@ -46,10 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "BaseProcess.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/scene.h" +#include +#include class SplitLargeMeshesTest; + namespace Assimp { diff --git a/code/StandardShapes.cpp b/code/StandardShapes.cpp index 359b632bb..d547c04a7 100644 --- a/code/StandardShapes.cpp +++ b/code/StandardShapes.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StringComparison.h" #include "Defines.h" #include -#include "../include/assimp/mesh.h" +#include namespace Assimp { diff --git a/code/StandardShapes.h b/code/StandardShapes.h index e310bfd5e..ec53ca30d 100644 --- a/code/StandardShapes.h +++ b/code/StandardShapes.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_STANDARD_SHAPES_H_INC #define AI_STANDARD_SHAPES_H_INC -#include "../include/assimp/vector3.h" +#include #include struct aiMesh; diff --git a/code/StdOStreamLogStream.h b/code/StdOStreamLogStream.h index be1b2c640..20482fef7 100644 --- a/code/StdOStreamLogStream.h +++ b/code/StdOStreamLogStream.h @@ -1,7 +1,47 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2016, 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. +--------------------------------------------------------------------------- +*/ #ifndef AI_STROSTREAMLOGSTREAM_H_INC #define AI_STROSTREAMLOGSTREAM_H_INC -#include "../include/assimp/LogStream.hpp" +#include #include namespace Assimp { diff --git a/code/StepExporter.cpp b/code/StepExporter.cpp index a4ce671a7..cc0a80ac4 100644 --- a/code/StepExporter.cpp +++ b/code/StepExporter.cpp @@ -56,9 +56,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "Exceptional.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/light.h" +#include +#include +#include // #if _MSC_VER > 1500 || (defined __GNUC___) diff --git a/code/StepExporter.h b/code/StepExporter.h index 3d36635e1..b51280c6c 100644 --- a/code/StepExporter.h +++ b/code/StepExporter.h @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_STEPEXPORTER_H_INC #define AI_STEPEXPORTER_H_INC -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/matrix4x4.h" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include #include diff --git a/code/StreamReader.h b/code/StreamReader.h index b433eaa82..244ad9784 100644 --- a/code/StreamReader.h +++ b/code/StreamReader.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ByteSwapper.h" #include "Exceptional.h" #include -#include "../include/assimp/IOStream.hpp" +#include #include "Defines.h" namespace Assimp { diff --git a/code/StreamWriter.h b/code/StreamWriter.h index 61b129a63..12239bf7f 100644 --- a/code/StreamWriter.h +++ b/code/StreamWriter.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_STREAMWRITER_H_INCLUDED #include "ByteSwapper.h" -#include "../include/assimp/IOStream.hpp" +#include #include #include diff --git a/code/StringComparison.h b/code/StringComparison.h index ea4f761f1..0e1dbe4b8 100644 --- a/code/StringComparison.h +++ b/code/StringComparison.h @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_STRING_WORKERS_H #define INCLUDED_AI_STRING_WORKERS_H -#include "../include/assimp/ai_assert.h" +#include #include "StringComparison.h" #include diff --git a/code/TargetAnimation.cpp b/code/TargetAnimation.cpp index 97c757fe9..a78f66bea 100644 --- a/code/TargetAnimation.cpp +++ b/code/TargetAnimation.cpp @@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "TargetAnimation.h" #include -#include "../include/assimp/ai_assert.h" +#include using namespace Assimp; diff --git a/code/TargetAnimation.h b/code/TargetAnimation.h index b177e359b..79cef599e 100644 --- a/code/TargetAnimation.h +++ b/code/TargetAnimation.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_TARGET_ANIMATION_H_INC #define AI_TARGET_ANIMATION_H_INC -#include "../include/assimp/anim.h" +#include #include namespace Assimp { diff --git a/code/TerragenLoader.cpp b/code/TerragenLoader.cpp index b0e450d41..854959f19 100644 --- a/code/TerragenLoader.cpp +++ b/code/TerragenLoader.cpp @@ -44,12 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_TERRAGEN_IMPORTER + #include "TerragenLoader.h" -#include "../include/assimp/Importer.hpp" -#include "../include/assimp/IOSystem.hpp" #include "StreamReader.h" -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" +#include +#include +#include +#include using namespace Assimp; diff --git a/code/TextureTransform.h b/code/TextureTransform.h index e05899dde..ccad3bdd9 100644 --- a/code/TextureTransform.h +++ b/code/TextureTransform.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseImporter.h" #include "BaseProcess.h" -#include "../include/assimp/material.h" +#include #include struct aiNode; diff --git a/code/ValidateDataStructure.h b/code/ValidateDataStructure.h index 7472a2b1d..87f158b37 100644 --- a/code/ValidateDataStructure.h +++ b/code/ValidateDataStructure.h @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_VALIDATEPROCESS_H_INC #define AI_VALIDATEPROCESS_H_INC -#include "../include/assimp/types.h" -#include "../include/assimp/material.h" +#include +#include #include "BaseProcess.h" struct aiBone; diff --git a/code/Vertex.h b/code/Vertex.h index ad850455d..5e2cf6986 100644 --- a/code/Vertex.h +++ b/code/Vertex.h @@ -48,9 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_VERTEX_H_INC #define AI_VERTEX_H_INC -#include "../include/assimp/vector3.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/ai_assert.h" +#include +#include +#include #include namespace Assimp { diff --git a/code/VertexTriangleAdjacency.cpp b/code/VertexTriangleAdjacency.cpp index c0cd209eb..6de55ab34 100644 --- a/code/VertexTriangleAdjacency.cpp +++ b/code/VertexTriangleAdjacency.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "VertexTriangleAdjacency.h" -#include "../include/assimp/mesh.h" +#include using namespace Assimp; diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h index 18571590d..218607508 100644 --- a/code/VertexTriangleAdjacency.h +++ b/code/VertexTriangleAdjacency.h @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_VTADJACENCY_H_INC #include "BaseProcess.h" -#include "../include/assimp/types.h" -#include "../include/assimp/ai_assert.h" +#include +#include struct aiMesh; struct aiFace; diff --git a/code/Win32DebugLogStream.h b/code/Win32DebugLogStream.h index ef80df69d..c7bd8ca62 100644 --- a/code/Win32DebugLogStream.h +++ b/code/Win32DebugLogStream.h @@ -3,7 +3,7 @@ #ifdef WIN32 -#include "../include/assimp/LogStream.hpp" +#include #include "windows.h" namespace Assimp { diff --git a/code/XFileExporter.cpp b/code/XFileExporter.cpp index 7966ac4df..e865f2305 100644 --- a/code/XFileExporter.cpp +++ b/code/XFileExporter.cpp @@ -53,11 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "Exceptional.h" -#include "../include/assimp/IOSystem.hpp" -#include "../include/assimp/scene.h" -#include "../include/assimp/light.h" - - +#include +#include +#include using namespace Assimp; diff --git a/code/XFileExporter.h b/code/XFileExporter.h index 3389ccd00..c33de3347 100644 --- a/code/XFileExporter.h +++ b/code/XFileExporter.h @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_XFILEEXPORTER_H_INC #define AI_XFILEEXPORTER_H_INC -#include "../include/assimp/ai_assert.h" -#include "../include/assimp/matrix4x4.h" -#include "../include/assimp/Exporter.hpp" +#include +#include +#include #include struct aiScene; diff --git a/code/XFileHelper.h b/code/XFileHelper.h index b28c8ddfe..484952106 100644 --- a/code/XFileHelper.h +++ b/code/XFileHelper.h @@ -47,10 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/types.h" -#include "../include/assimp/quaternion.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include +#include #include "Defines.h" namespace Assimp diff --git a/code/XFileImporter.cpp b/code/XFileImporter.cpp index f95ba023d..9510ab3de 100644 --- a/code/XFileImporter.cpp +++ b/code/XFileImporter.cpp @@ -47,14 +47,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "XFileImporter.h" #include "XFileParser.h" -#include "ConvertToLHProcess.h" -#include "../include/assimp/IOSystem.hpp" -#include -#include "../include/assimp/scene.h" -#include "../include/assimp/DefaultLogger.hpp" #include "Defines.h" #include "TinyFormatter.h" +#include "ConvertToLHProcess.h" +#include +#include +#include #include +#include diff --git a/code/XFileImporter.h b/code/XFileImporter.h index 6066d19df..1de56cbc5 100644 --- a/code/XFileImporter.h +++ b/code/XFileImporter.h @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "XFileHelper.h" #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include struct aiNode; diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp index 800e128d3..a820955a8 100644 --- a/code/XFileParser.cpp +++ b/code/XFileParser.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "TinyFormatter.h" #include "ByteSwapper.h" #include "StringUtils.h" -#include "../include/assimp/DefaultLogger.hpp" +#include using namespace Assimp; diff --git a/code/XFileParser.h b/code/XFileParser.h index 995e5cfeb..14c5ef1cf 100644 --- a/code/XFileParser.h +++ b/code/XFileParser.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/types.h" +#include namespace Assimp { diff --git a/code/XGLLoader.cpp b/code/XGLLoader.cpp index a6a23110a..fd079ef14 100644 --- a/code/XGLLoader.cpp +++ b/code/XGLLoader.cpp @@ -50,24 +50,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StreamReader.h" #include "MemoryIOWrapper.h" -#include -#include "../include/assimp/mesh.h" -#include "../include/assimp/scene.h" +#include +#include #include - - +#include using namespace Assimp; using namespace irr; using namespace irr::io; - // zlib is needed for compressed XGL files #ifndef ASSIMP_BUILD_NO_COMPRESSED_XGL # ifdef ASSIMP_BUILD_NO_OWN_ZLIB # include # else -# include "../contrib/zlib/zlib.h" +# include # endif #endif diff --git a/code/XGLLoader.h b/code/XGLLoader.h index a27b817f5..757f9d564 100644 --- a/code/XGLLoader.h +++ b/code/XGLLoader.h @@ -47,10 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseImporter.h" #include "irrXMLWrapper.h" #include "LogAux.h" -#include "../include/assimp/material.h" -#include "../include/assimp/Importer.hpp" -#include "../include/assimp/mesh.h" -#include "../include/assimp/light.h" +#include +#include +#include +#include struct aiNode; diff --git a/code/fast_atof.h b/code/fast_atof.h index 2e2c9fc75..da6706cf1 100644 --- a/code/fast_atof.h +++ b/code/fast_atof.h @@ -26,7 +26,7 @@ #ifdef _MSC_VER # include #else -#include "../include/assimp/Compiler/pstdint.h" +#include #include #include