From 66171de915439f4f1851042a690bf4696e6b126f Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 5 Jan 2018 16:18:33 -0800 Subject: [PATCH] Successful lib build, unit testing still WIP --- code/3DSConverter.cpp | 2 +- code/3DSExporter.cpp | 2 +- code/3DSExporter.h | 2 +- code/3DSHelper.h | 8 +- code/3DSLoader.cpp | 4 +- code/3DSLoader.h | 4 +- code/ACLoader.cpp | 8 +- code/ACLoader.h | 2 +- code/AMFImporter.cpp | 2 +- code/AMFImporter.hpp | 4 +- code/AMFImporter_Postprocess.cpp | 4 +- code/ASELoader.cpp | 6 +- code/ASELoader.h | 2 +- code/ASEParser.cpp | 2 +- code/ASEParser.h | 4 +- code/AssbinExporter.cpp | 2 +- code/AssbinLoader.cpp | 2 +- code/AssbinLoader.h | 2 +- code/Assimp.cpp | 6 +- code/B3DImporter.cpp | 2 +- code/B3DImporter.h | 2 +- code/BVHLoader.cpp | 6 +- code/BVHLoader.h | 2 +- code/BaseImporter.cpp | 4 +- code/BaseProcess.cpp | 2 +- code/BaseProcess.h | 2 +- code/Bitmap.cpp | 4 +- code/BlenderBMesh.h | 2 +- code/BlenderDNA.cpp | 6 +- code/BlenderDNA.h | 4 +- code/BlenderDNA.inl | 2 +- code/BlenderLoader.cpp | 8 +- code/BlenderLoader.h | 4 +- code/BlenderModifier.cpp | 2 +- code/BlenderModifier.h | 2 +- code/BlenderTessellator.h | 2 +- code/C4DImporter.cpp | 2 +- code/C4DImporter.h | 4 +- code/CMakeLists.txt | 70 +++--- code/COBLoader.cpp | 10 +- code/COBLoader.h | 4 +- code/COBScene.h | 2 +- code/CSMLoader.cpp | 6 +- code/CSMLoader.h | 2 +- code/CalcTangentsProcess.cpp | 4 +- code/ColladaExporter.cpp | 10 +- code/ColladaExporter.h | 2 +- code/ColladaLoader.cpp | 8 +- code/ColladaLoader.h | 2 +- code/ColladaParser.cpp | 8 +- code/ColladaParser.h | 4 +- code/ComputeUVMappingProcess.cpp | 2 +- code/CreateAnimMesh.cpp | 2 +- code/D3MFExporter.cpp | 2 +- code/D3MFImporter.cpp | 6 +- code/D3MFImporter.h | 2 +- code/D3MFOpcPackage.cpp | 2 +- code/D3MFOpcPackage.h | 2 +- code/DXFHelper.h | 8 +- code/DXFLoader.cpp | 4 +- code/DXFLoader.h | 2 +- code/DefaultIOSystem.cpp | 2 +- code/DefaultLogger.cpp | 2 +- code/Exporter.cpp | 4 +- code/FBXBinaryTokenizer.cpp | 4 +- code/FBXConverter.cpp | 2 +- code/FBXImporter.cpp | 4 +- code/FBXImporter.h | 4 +- code/FBXMaterial.cpp | 2 +- code/FBXParser.cpp | 6 +- code/FBXParser.h | 4 +- code/FBXTokenizer.cpp | 4 +- code/FBXUtil.cpp | 2 +- code/FIReader.cpp | 10 +- code/FileSystemFilter.h | 4 +- code/FindDegenerates.cpp | 2 +- code/FindInvalidDataProcess.cpp | 6 +- code/FixNormalsStep.cpp | 2 +- code/GenFaceNormalsProcess.cpp | 4 +- code/GenVertexNormalsProcess.cpp | 4 +- code/HMPLoader.h | 2 +- code/IFCLoader.cpp | 2 +- code/IFCLoader.h | 4 +- code/IFF.h | 2 +- code/IRRLoader.cpp | 10 +- code/IRRLoader.h | 2 +- code/IRRMeshLoader.cpp | 6 +- code/IRRMeshLoader.h | 2 +- code/IRRShared.cpp | 4 +- code/IRRShared.h | 4 +- code/Importer.cpp | 14 +- code/ImporterRegistry.cpp | 2 +- code/ImproveCacheLocality.cpp | 2 +- code/JoinVerticesProcess.cpp | 4 +- code/LWOLoader.cpp | 6 +- code/LWOLoader.h | 2 +- code/LWOMaterial.cpp | 2 +- code/LWSLoader.cpp | 8 +- code/LWSLoader.h | 2 +- code/LimitBoneWeightsProcess.cpp | 2 +- code/MD2Loader.cpp | 2 +- code/MD2Loader.h | 4 +- code/MD3Loader.cpp | 6 +- code/MD3Loader.h | 6 +- code/MD5Loader.cpp | 8 +- code/MD5Loader.h | 2 +- code/MD5Parser.cpp | 6 +- code/MD5Parser.h | 2 +- code/MDCLoader.h | 4 +- code/MDLFileData.h | 2 +- code/MDLLoader.cpp | 6 +- code/MDLLoader.h | 2 +- code/MDLMaterialLoader.cpp | 4 +- code/MMDImporter.h | 2 +- code/MMDPmxParser.cpp | 2 +- code/MS3DLoader.cpp | 2 +- code/MS3DLoader.h | 4 +- code/MaterialSystem.cpp | 8 +- code/NDOLoader.cpp | 2 +- code/NDOLoader.h | 2 +- code/NFFLoader.cpp | 10 +- code/NFFLoader.h | 2 +- code/OFFLoader.cpp | 4 +- code/OFFLoader.h | 2 +- code/ObjExporter.cpp | 4 +- code/ObjFileImporter.cpp | 2 +- code/ObjFileImporter.h | 2 +- code/ObjFileMtlImporter.cpp | 4 +- code/ObjFileParser.cpp | 4 +- code/ObjFileParser.h | 2 +- code/ObjTools.h | 4 +- code/OgreBinarySerializer.cpp | 2 +- code/OgreBinarySerializer.h | 2 +- code/OgreImporter.h | 2 +- code/OgreMaterial.cpp | 4 +- code/OgreParsingUtils.h | 2 +- code/OgreStructs.cpp | 4 +- code/OgreStructs.h | 2 +- code/OgreXmlSerializer.cpp | 2 +- code/OgreXmlSerializer.h | 2 +- code/OpenGEXImporter.cpp | 2 +- code/OpenGEXImporter.h | 2 +- code/OptimizeGraph.cpp | 2 +- code/OptimizeMeshes.cpp | 2 +- code/PlyExporter.cpp | 4 +- code/PlyLoader.cpp | 4 +- code/PlyLoader.h | 2 +- code/PlyParser.cpp | 4 +- code/PlyParser.h | 4 +- code/PretransformVertices.cpp | 2 +- code/ProcessHelper.h | 4 +- code/Q3BSPFileImporter.cpp | 2 +- code/Q3BSPFileImporter.h | 2 +- code/Q3BSPFileParser.h | 2 +- code/Q3DLoader.cpp | 4 +- code/Q3DLoader.h | 2 +- code/RawLoader.cpp | 4 +- code/RawLoader.h | 2 +- code/RemoveComments.cpp | 4 +- code/RemoveRedundantMaterials.cpp | 2 +- code/SGSpatialSort.cpp | 2 +- code/SGSpatialSort.h | 2 +- code/SIBImporter.cpp | 6 +- code/SIBImporter.h | 2 +- code/SMDLoader.cpp | 4 +- code/SMDLoader.h | 4 +- code/STEPFile.h | 2 +- code/STEPFileEncoding.cpp | 2 +- code/STEPFileReader.cpp | 4 +- code/STLExporter.cpp | 4 +- code/STLLoader.cpp | 4 +- code/STLLoader.h | 2 +- code/SceneCombiner.cpp | 6 +- code/SkeletonMeshBuilder.cpp | 2 +- code/SortByPTypeProcess.cpp | 2 +- code/SpatialSort.cpp | 2 +- code/SplitByBoneCountProcess.cpp | 2 +- code/StandardShapes.cpp | 4 +- code/StepExporter.cpp | 8 +- code/Subdivision.cpp | 6 +- code/TerragenLoader.cpp | 2 +- code/TerragenLoader.h | 2 +- code/TextureTransform.cpp | 2 +- code/TextureTransform.h | 2 +- code/UnrealLoader.cpp | 6 +- code/UnrealLoader.h | 2 +- code/ValidateDataStructure.cpp | 4 +- code/X3DExporter.cpp | 4 +- code/X3DImporter.cpp | 4 +- code/X3DImporter.hpp | 4 +- code/X3DImporter_Geometry3D.cpp | 2 +- code/X3DImporter_Light.cpp | 2 +- code/X3DImporter_Postprocess.cpp | 4 +- code/XFileExporter.cpp | 8 +- code/XFileImporter.cpp | 2 +- code/XFileImporter.h | 2 +- code/XFileParser.cpp | 10 +- code/XGLLoader.cpp | 8 +- code/XGLLoader.h | 6 +- code/glTF2Asset.h | 4 +- code/glTF2Asset.inl | 2 +- code/glTF2Exporter.cpp | 6 +- code/glTF2Importer.cpp | 4 +- code/glTF2Importer.h | 2 +- code/glTFAsset.h | 2 +- code/glTFAsset.inl | 2 +- code/glTFExporter.cpp | 6 +- code/glTFImporter.cpp | 4 +- code/glTFImporter.h | 2 +- code/makefile.mingw | 210 +++++++++--------- contrib/irrXML/irrXML.cpp | 2 +- {code => include/assimp}/BaseImporter.h | 0 {code => include/assimp}/Bitmap.h | 3 +- {code => include/assimp}/BlobIOSystem.h | 0 {code => include/assimp}/ByteSwapper.h | 0 {code => include/assimp}/CreateAnimMesh.h | 2 +- {code => include/assimp}/Exceptional.h | 0 {code => include/assimp}/GenericProperty.h | 0 {code => include/assimp}/Hash.h | 0 {code => include/assimp}/IOStreamBuffer.h | 0 {code => include/assimp}/LineSplitter.h | 0 {code => include/assimp}/LogAux.h | 0 {code => include/assimp}/Macros.h | 0 {code => include/assimp}/MathFunctions.h | 0 {code => include/assimp}/MemoryIOWrapper.h | 0 {code => include/assimp}/ParsingUtils.h | 0 {code => include/assimp}/Profiler.h | 0 {code => include/assimp}/RemoveComments.h | 0 include/assimp/SGSpatialSort.h | 141 ++++++++++++ .../assimp}/SkeletonMeshBuilder.h | 2 +- {code => include/assimp}/SmoothingGroups.h | 0 {code => include/assimp}/SmoothingGroups.inl | 2 +- {code => include/assimp}/SpatialSort.h | 2 +- {code => include/assimp}/StandardShapes.h | 2 +- {code => include/assimp}/StreamReader.h | 0 {code => include/assimp}/StreamWriter.h | 0 {code => include/assimp}/StringComparison.h | 0 {code => include/assimp}/StringUtils.h | 0 {code => include/assimp}/Subdivision.h | 0 {code => include/assimp}/TinyFormatter.h | 0 {code => include/assimp}/Vertex.h | 0 {code => include/assimp}/XMLTools.h | 0 {code => include/assimp}/fast_atof.h | 0 {code => include/assimp}/irrXMLWrapper.h | 0 {code => include/assimp}/qnan.h | 0 245 files changed, 668 insertions(+), 520 deletions(-) rename {code => include/assimp}/BaseImporter.h (100%) rename {code => include/assimp}/Bitmap.h (98%) rename {code => include/assimp}/BlobIOSystem.h (100%) rename {code => include/assimp}/ByteSwapper.h (100%) rename {code => include/assimp}/CreateAnimMesh.h (97%) rename {code => include/assimp}/Exceptional.h (100%) rename {code => include/assimp}/GenericProperty.h (100%) rename {code => include/assimp}/Hash.h (100%) rename {code => include/assimp}/IOStreamBuffer.h (100%) rename {code => include/assimp}/LineSplitter.h (100%) rename {code => include/assimp}/LogAux.h (100%) rename {code => include/assimp}/Macros.h (100%) rename {code => include/assimp}/MathFunctions.h (100%) rename {code => include/assimp}/MemoryIOWrapper.h (100%) rename {code => include/assimp}/ParsingUtils.h (100%) rename {code => include/assimp}/Profiler.h (100%) rename {code => include/assimp}/RemoveComments.h (100%) create mode 100644 include/assimp/SGSpatialSort.h rename {code => include/assimp}/SkeletonMeshBuilder.h (99%) rename {code => include/assimp}/SmoothingGroups.h (100%) rename {code => include/assimp}/SmoothingGroups.inl (99%) rename {code => include/assimp}/SpatialSort.h (99%) rename {code => include/assimp}/StandardShapes.h (99%) rename {code => include/assimp}/StreamReader.h (100%) rename {code => include/assimp}/StreamWriter.h (100%) rename {code => include/assimp}/StringComparison.h (100%) rename {code => include/assimp}/StringUtils.h (100%) rename {code => include/assimp}/Subdivision.h (100%) rename {code => include/assimp}/TinyFormatter.h (100%) rename {code => include/assimp}/Vertex.h (100%) rename {code => include/assimp}/XMLTools.h (100%) rename {code => include/assimp}/fast_atof.h (100%) rename {code => include/assimp}/irrXMLWrapper.h (100%) rename {code => include/assimp}/qnan.h (100%) diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp index 820c28f90..af62e9f3c 100644 --- a/code/3DSConverter.cpp +++ b/code/3DSConverter.cpp @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "TargetAnimation.h" #include #include -#include "StringComparison.h" +#include #include #include diff --git a/code/3DSExporter.cpp b/code/3DSExporter.cpp index 2f561fcd6..d33025b10 100644 --- a/code/3DSExporter.cpp +++ b/code/3DSExporter.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "3DSHelper.h" #include #include "SplitLargeMeshes.h" -#include "StringComparison.h" +#include #include #include #include diff --git a/code/3DSExporter.h b/code/3DSExporter.h index fc02e2390..8ac9c8b82 100644 --- a/code/3DSExporter.h +++ b/code/3DSExporter.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "StreamWriter.h" +#include #include struct aiScene; diff --git a/code/3DSHelper.h b/code/3DSHelper.h index 9e701c3dd..4996650eb 100644 --- a/code/3DSHelper.h +++ b/code/3DSHelper.h @@ -44,10 +44,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_3DSFILEHELPER_H_INC #define AI_3DSFILEHELPER_H_INC -#include "SpatialSort.h" -#include "SmoothingGroups.h" -#include "StringUtils.h" -#include "qnan.h" +#include +#include +#include +#include #include #include #include diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp index 704884a57..26c487abf 100644 --- a/code/3DSLoader.cpp +++ b/code/3DSLoader.cpp @@ -51,12 +51,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "3DSLoader.h" -#include "Macros.h" +#include #include #include #include #include -#include "StringComparison.h" +#include using namespace Assimp; diff --git a/code/3DSLoader.h b/code/3DSLoader.h index 0e377180b..cb751d71a 100644 --- a/code/3DSLoader.h +++ b/code/3DSLoader.h @@ -46,13 +46,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_3DSIMPORTER_H_INC #define AI_3DSIMPORTER_H_INC -#include "BaseImporter.h" +#include #include #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER #include "3DSHelper.h" -#include "StreamReader.h" +#include struct aiNode; diff --git a/code/ACLoader.cpp b/code/ACLoader.cpp index a30baa75a..7c09cc0ad 100644 --- a/code/ACLoader.cpp +++ b/code/ACLoader.cpp @@ -49,11 +49,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "ACLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" -#include "Subdivision.h" +#include +#include +#include #include "Importer.h" -#include "BaseImporter.h" +#include #include #include #include diff --git a/code/ACLoader.h b/code/ACLoader.h index 4b202b77a..82b017d64 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 struct aiNode; diff --git a/code/AMFImporter.cpp b/code/AMFImporter.cpp index e9211fe53..2c0435add 100644 --- a/code/AMFImporter.cpp +++ b/code/AMFImporter.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AMFImporter.hpp" #include "AMFImporter_Macro.hpp" -#include "fast_atof.h" +#include #include // Header files, stdlib. diff --git a/code/AMFImporter.hpp b/code/AMFImporter.hpp index 47ddc073b..654ccb7a5 100644 --- a/code/AMFImporter.hpp +++ b/code/AMFImporter.hpp @@ -56,8 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "assimp/types.h" -#include "BaseImporter.h" -#include "irrXMLWrapper.h" +#include +#include // Header files, stdlib. #include diff --git a/code/AMFImporter_Postprocess.cpp b/code/AMFImporter_Postprocess.cpp index 991eb97e7..486ab464b 100644 --- a/code/AMFImporter_Postprocess.cpp +++ b/code/AMFImporter_Postprocess.cpp @@ -51,8 +51,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Header files, Assimp. #include -#include "StandardShapes.h" -#include "StringUtils.h" +#include +#include // Header files, stdlib. #include diff --git a/code/ASELoader.cpp b/code/ASELoader.cpp index 65935f48f..a8d2206cf 100644 --- a/code/ASELoader.cpp +++ b/code/ASELoader.cpp @@ -50,8 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "ASELoader.h" -#include "StringComparison.h" -#include "SkeletonMeshBuilder.h" +#include +#include #include "TargetAnimation.h" #include #include @@ -62,7 +62,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include // utilities -#include "fast_atof.h" +#include using namespace Assimp; using namespace Assimp::ASE; diff --git a/code/ASELoader.h b/code/ASELoader.h index 8a8d4faa4..d46657b8b 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. #ifndef AI_ASELOADER_H_INCLUDED #define AI_ASELOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include "ASEParser.h" diff --git a/code/ASEParser.cpp b/code/ASEParser.cpp index 7de80a2d8..fcb90b3ca 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. // internal headers #include "TextureTransform.h" #include "ASELoader.h" -#include "fast_atof.h" +#include #include using namespace Assimp; diff --git a/code/ASEParser.h b/code/ASEParser.h index db64f2a16..33d4ea53d 100644 --- a/code/ASEParser.h +++ b/code/ASEParser.h @@ -52,8 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER // for some helper routines like IsSpace() -#include "ParsingUtils.h" -#include "qnan.h" +#include +#include // ASE is quite similar to 3ds. We can reuse some structures #include "3DSLoader.h" diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp index bcac2e08f..6d6ab6b68 100644 --- a/code/AssbinExporter.cpp +++ b/code/AssbinExporter.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "ProcessHelper.h" -#include "Exceptional.h" +#include #ifdef ASSIMP_BUILD_NO_OWN_ZLIB # include diff --git a/code/AssbinLoader.cpp b/code/AssbinLoader.cpp index a7044c119..6cd94bca2 100644 --- a/code/AssbinLoader.cpp +++ b/code/AssbinLoader.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "AssbinLoader.h" #include "assbin_chunks.h" -#include "MemoryIOWrapper.h" +#include #include #include #include diff --git a/code/AssbinLoader.h b/code/AssbinLoader.h index 2eb7a6488..7cf4b0784 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. #ifndef AI_ASSBINIMPORTER_H_INC #define AI_ASSBINIMPORTER_H_INC -#include "BaseImporter.h" +#include struct aiMesh; struct aiNode; diff --git a/code/Assimp.cpp b/code/Assimp.cpp index 9269f905e..1fdcb1c7f 100644 --- a/code/Assimp.cpp +++ b/code/Assimp.cpp @@ -50,12 +50,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "GenericProperty.h" +#include #include "CInterfaceIOWrapper.h" #include "Importer.h" -#include "Exceptional.h" +#include #include "ScenePrivate.h" -#include "BaseImporter.h" +#include #include // ------------------------------------------------------------------------------------------------ diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp index aa87609d4..4f5b762a6 100644 --- a/code/B3DImporter.cpp +++ b/code/B3DImporter.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "B3DImporter.h" #include "TextureTransform.h" #include "ConvertToLHProcess.h" -#include "StringUtils.h" +#include #include #include #include diff --git a/code/B3DImporter.h b/code/B3DImporter.h index 342b88a28..8b4577cd4 100644 --- a/code/B3DImporter.h +++ b/code/B3DImporter.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "BaseImporter.h" +#include #include #include diff --git a/code/BVHLoader.cpp b/code/BVHLoader.cpp index c20cbec4e..43983a0d1 100644 --- a/code/BVHLoader.cpp +++ b/code/BVHLoader.cpp @@ -45,11 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_BVH_IMPORTER #include "BVHLoader.h" -#include "fast_atof.h" -#include "SkeletonMeshBuilder.h" +#include +#include #include #include -#include "TinyFormatter.h" +#include #include #include #include diff --git a/code/BVHLoader.h b/code/BVHLoader.h index 6a89e1aaf..72f0f8e99 100644 --- a/code/BVHLoader.h +++ b/code/BVHLoader.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_BVHLOADER_H_INC #define AI_BVHLOADER_H_INC -#include "BaseImporter.h" +#include struct aiNode; diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp index b9b9eeb71..d213e5828 100644 --- a/code/BaseImporter.cpp +++ b/code/BaseImporter.cpp @@ -44,10 +44,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Implementation of BaseImporter */ -#include "BaseImporter.h" +#include #include "FileSystemFilter.h" #include "Importer.h" -#include "ByteSwapper.h" +#include #include #include #include diff --git a/code/BaseProcess.cpp b/code/BaseProcess.cpp index 9e175d315..e19d57604 100644 --- a/code/BaseProcess.cpp +++ b/code/BaseProcess.cpp @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Implementation of BaseProcess */ -#include "BaseImporter.h" +#include #include "BaseProcess.h" #include #include diff --git a/code/BaseProcess.h b/code/BaseProcess.h index aa873f717..332adc2e0 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. #define INCLUDED_AI_BASEPROCESS_H #include -#include "GenericProperty.h" +#include struct aiScene; diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp index 76994513e..c0ab65728 100644 --- a/code/Bitmap.cpp +++ b/code/Bitmap.cpp @@ -47,10 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Bitmap.h" +#include #include #include -#include "ByteSwapper.h" +#include namespace Assimp { diff --git a/code/BlenderBMesh.h b/code/BlenderBMesh.h index 0d58b818c..5b65fb503 100644 --- a/code/BlenderBMesh.h +++ b/code/BlenderBMesh.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_BLEND_BMESH_H #define INCLUDED_AI_BLEND_BMESH_H -#include "LogAux.h" +#include namespace Assimp { diff --git a/code/BlenderDNA.cpp b/code/BlenderDNA.cpp index 23ece913f..193d29538 100644 --- a/code/BlenderDNA.cpp +++ b/code/BlenderDNA.cpp @@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER #include "BlenderDNA.h" -#include "StreamReader.h" -#include "fast_atof.h" -#include "TinyFormatter.h" +#include +#include +#include using namespace Assimp; using namespace Assimp::Blender; diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h index bac8d78bc..932784e9f 100644 --- a/code/BlenderDNA.h +++ b/code/BlenderDNA.h @@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_BLEND_DNA_H #define INCLUDED_AI_BLEND_DNA_H -#include "BaseImporter.h" -#include "StreamReader.h" +#include +#include #include #include #include diff --git a/code/BlenderDNA.inl b/code/BlenderDNA.inl index c65ea81bc..de85815cc 100644 --- a/code/BlenderDNA.inl +++ b/code/BlenderDNA.inl @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define INCLUDED_AI_BLEND_DNA_INL #include -#include "TinyFormatter.h" +#include namespace Assimp { namespace Blender { diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp index 824954f56..6d298cf0e 100644 --- a/code/BlenderLoader.cpp +++ b/code/BlenderLoader.cpp @@ -53,13 +53,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BlenderIntermediate.h" #include "BlenderModifier.h" #include "BlenderBMesh.h" -#include "StringUtils.h" +#include #include #include -#include "StringComparison.h" -#include "StreamReader.h" -#include "MemoryIOWrapper.h" +#include +#include +#include #include diff --git a/code/BlenderLoader.h b/code/BlenderLoader.h index 66fff594b..d9e1da035 100644 --- a/code/BlenderLoader.h +++ b/code/BlenderLoader.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_BLEND_LOADER_H #define INCLUDED_AI_BLEND_LOADER_H -#include "BaseImporter.h" -#include "LogAux.h" +#include +#include #include struct aiNode; diff --git a/code/BlenderModifier.cpp b/code/BlenderModifier.cpp index 348df1f48..a0b332dd2 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 -#include "Subdivision.h" +#include #include #include diff --git a/code/BlenderModifier.h b/code/BlenderModifier.h index 9fa8c74ee..0d894d82d 100644 --- a/code/BlenderModifier.h +++ b/code/BlenderModifier.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define INCLUDED_AI_BLEND_MODIFIER_H #include "BlenderIntermediate.h" -#include "TinyFormatter.h" +#include namespace Assimp { namespace Blender { diff --git a/code/BlenderTessellator.h b/code/BlenderTessellator.h index 47d3a4665..3b4777852 100644 --- a/code/BlenderTessellator.h +++ b/code/BlenderTessellator.h @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # define ASSIMP_BLEND_WITH_POLY_2_TRI 1 #endif -#include "LogAux.h" +#include #if ASSIMP_BLEND_WITH_GLU_TESSELLATE diff --git a/code/C4DImporter.cpp b/code/C4DImporter.cpp index 1344f32fb..665d74633 100644 --- a/code/C4DImporter.cpp +++ b/code/C4DImporter.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include "C4DImporter.h" -#include "TinyFormatter.h" +#include #include #include #include diff --git a/code/C4DImporter.h b/code/C4DImporter.h index 4dea82161..2f67d90f3 100644 --- a/code/C4DImporter.h +++ b/code/C4DImporter.h @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_CINEMA_4D_LOADER_H #define INCLUDED_AI_CINEMA_4D_LOADER_H -#include "BaseImporter.h" -#include "LogAux.h" +#include +#include #include struct aiNode; diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 4d02240da..57f18f8d5 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -98,6 +98,40 @@ SET( PUBLIC_HEADERS ${HEADER_PATH}/DefaultIOStream.h ${HEADER_PATH}/DefaultIOSystem.h ${HEADER_PATH}/SceneCombiner.h + ${HEADER_PATH}/fast_atof.h + ${HEADER_PATH}/qnan.h + ${HEADER_PATH}/BaseImporter.h + ${HEADER_PATH}/Hash.h + ${HEADER_PATH}/MemoryIOWrapper.h + ${HEADER_PATH}/ParsingUtils.h + ${HEADER_PATH}/StreamReader.h + ${HEADER_PATH}/StreamWriter.h + ${HEADER_PATH}/StringComparison.h + ${HEADER_PATH}/StringUtils.h + ${HEADER_PATH}/SGSpatialSort.h + ${HEADER_PATH}/GenericProperty.h + ${HEADER_PATH}/SpatialSort.h + ${HEADER_PATH}/SkeletonMeshBuilder.h + ${HEADER_PATH}/SmoothingGroups.h + ${HEADER_PATH}/SmoothingGroups.inl + ${HEADER_PATH}/StandardShapes.h + ${HEADER_PATH}/RemoveComments.h + ${HEADER_PATH}/Subdivision.h + ${HEADER_PATH}/Vertex.h + ${HEADER_PATH}/LineSplitter.h + ${HEADER_PATH}/TinyFormatter.h + ${HEADER_PATH}/Profiler.h + ${HEADER_PATH}/LogAux.h + ${HEADER_PATH}/Bitmap.h + ${HEADER_PATH}/XMLTools.h + ${HEADER_PATH}/IOStreamBuffer.h + ${HEADER_PATH}/CreateAnimMesh.h + ${HEADER_PATH}/irrXMLWrapper.h + ${HEADER_PATH}/BlobIOSystem.h + ${HEADER_PATH}/MathFunctions.h + ${HEADER_PATH}/Macros.h + ${HEADER_PATH}/Exceptional.h + ${HEADER_PATH}/ByteSwapper.h ) SET( Core_SRCS @@ -117,68 +151,40 @@ SET( Logging_SRCS SOURCE_GROUP(Logging FILES ${Logging_SRCS}) SET( Common_SRCS - fast_atof.h - qnan.h BaseImporter.cpp - BaseImporter.h BaseProcess.cpp BaseProcess.h Importer.h ScenePrivate.h PostStepRegistry.cpp ImporterRegistry.cpp - ByteSwapper.h DefaultProgressHandler.h DefaultIOStream.cpp DefaultIOSystem.cpp CInterfaceIOWrapper.cpp CInterfaceIOWrapper.h - Hash.h Importer.cpp IFF.h - MemoryIOWrapper.h - ParsingUtils.h - StreamReader.h - StreamWriter.h - StringComparison.h - StringUtils.h SGSpatialSort.cpp - SGSpatialSort.h VertexTriangleAdjacency.cpp VertexTriangleAdjacency.h - GenericProperty.h SpatialSort.cpp - SpatialSort.h SceneCombiner.cpp ScenePreprocessor.cpp ScenePreprocessor.h SkeletonMeshBuilder.cpp - SkeletonMeshBuilder.h SplitByBoneCountProcess.cpp SplitByBoneCountProcess.h ScaleProcess.cpp ScaleProcess.h - SmoothingGroups.h StandardShapes.cpp - StandardShapes.h TargetAnimation.cpp TargetAnimation.h RemoveComments.cpp - RemoveComments.h Subdivision.cpp - Subdivision.h scene.cpp - Vertex.h - LineSplitter.h - TinyFormatter.h - Profiler.h - LogAux.h Bitmap.cpp - Bitmap.h - XMLTools.h Version.cpp - IOStreamBuffer.h - CreateAnimMesh.h CreateAnimMesh.cpp ) SOURCE_GROUP(Common FILES ${Common_SRCS}) @@ -573,7 +579,7 @@ SET( PostProcessing_SRCS ) SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS}) -SET( IrrXML_SRCS irrXMLWrapper.h ) +SET( IrrXML_SRCS ${HEADER_PATH}/irrXMLWrapper.h ) SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS}) ADD_ASSIMP_IMPORTER( Q3D @@ -703,7 +709,7 @@ SOURCE_GROUP( Step FILES ${Step_SRCS}) SET( Exporter_SRCS Exporter.cpp AssimpCExport.cpp - BlobIOSystem.h + ${HEADER_PATH}/BlobIOSystem.h ) SOURCE_GROUP( Exporter FILES ${Exporter_SRCS}) @@ -940,8 +946,8 @@ if (APPLE) # PUBLIC_HEADER option does not support directory structure creation # add ./Compiler/*.h to assimp.framework via copy command - ADD_CUSTOM_COMMAND(TARGET assimp POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_directory + ADD_CUSTOM_COMMAND(TARGET assimp POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy_directory "../${HEADER_PATH}/Compiler" assimp.framework/Headers/Compiler COMMENT "Copying public ./Compiler/ header files to framework bundle's Headers/Compiler/") diff --git a/code/COBLoader.cpp b/code/COBLoader.cpp index a92e231a5..14d022a5f 100644 --- a/code/COBLoader.cpp +++ b/code/COBLoader.cpp @@ -47,12 +47,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "COBLoader.h" #include "COBScene.h" -#include "StreamReader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include +#include -#include "LineSplitter.h" -#include "TinyFormatter.h" +#include +#include #include #include #include diff --git a/code/COBLoader.h b/code/COBLoader.h index 46dc86f62..062a0cd68 100644 --- a/code/COBLoader.h +++ b/code/COBLoader.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_COB_LOADER_H #define INCLUDED_AI_COB_LOADER_H -#include "BaseImporter.h" -#include "StreamReader.h" +#include +#include struct aiNode; diff --git a/code/COBScene.h b/code/COBScene.h index a1d6ebc27..08253f603 100644 --- a/code/COBScene.h +++ b/code/COBScene.h @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "BaseImporter.h" +#include #include namespace Assimp { diff --git a/code/CSMLoader.cpp b/code/CSMLoader.cpp index eeb6986b0..13032b68a 100644 --- a/code/CSMLoader.cpp +++ b/code/CSMLoader.cpp @@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_CSM_IMPORTER #include "CSMLoader.h" -#include "SkeletonMeshBuilder.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include +#include #include #include #include diff --git a/code/CSMLoader.h b/code/CSMLoader.h index 55a632dc6..fc6feb1f3 100644 --- a/code/CSMLoader.h +++ b/code/CSMLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_CSM_LOADER_H #define INCLUDED_AI_CSM_LOADER_H -#include "BaseImporter.h" +#include namespace Assimp { diff --git a/code/CalcTangentsProcess.cpp b/code/CalcTangentsProcess.cpp index 2af16fcc0..67ff18f7c 100644 --- a/code/CalcTangentsProcess.cpp +++ b/code/CalcTangentsProcess.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "CalcTangentsProcess.h" #include "ProcessHelper.h" -#include "TinyFormatter.h" -#include "qnan.h" +#include +#include using namespace Assimp; diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp index 4a10d5845..50245103c 100644 --- a/code/ColladaExporter.cpp +++ b/code/ColladaExporter.cpp @@ -43,17 +43,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_COLLADA_EXPORTER #include "ColladaExporter.h" -#include "Bitmap.h" -#include "fast_atof.h" +#include +#include #include -#include "StringUtils.h" -#include "XMLTools.h" +#include +#include #include #include #include #include -#include "Exceptional.h" +#include #include #include diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h index e7a4a9b5d..325f642e8 100644 --- a/code/ColladaExporter.h +++ b/code/ColladaExporter.h @@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "StringUtils.h" +#include struct aiScene; struct aiNode; diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index d41f4a999..3dbd5560a 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -53,10 +53,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "ColladaParser.h" -#include "fast_atof.h" -#include "ParsingUtils.h" -#include "SkeletonMeshBuilder.h" -#include "CreateAnimMesh.h" +#include +#include +#include +#include #include "time.h" #include "math.h" diff --git a/code/ColladaLoader.h b/code/ColladaLoader.h index 8388ab01e..3ab03bbcc 100644 --- a/code/ColladaLoader.h +++ b/code/ColladaLoader.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_COLLADALOADER_H_INC #define AI_COLLADALOADER_H_INC -#include "BaseImporter.h" +#include #include "ColladaParser.h" struct aiNode; diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp index 2fe0f1e0a..8359341b7 100644 --- a/code/ColladaParser.cpp +++ b/code/ColladaParser.cpp @@ -49,13 +49,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "ColladaParser.h" -#include "fast_atof.h" -#include "ParsingUtils.h" -#include "StringUtils.h" +#include +#include +#include #include #include #include -#include "TinyFormatter.h" +#include #include diff --git a/code/ColladaParser.h b/code/ColladaParser.h index 941ab8414..f8245f8a3 100644 --- a/code/ColladaParser.h +++ b/code/ColladaParser.h @@ -46,10 +46,10 @@ #ifndef AI_COLLADAPARSER_H_INC #define AI_COLLADAPARSER_H_INC -#include "irrXMLWrapper.h" +#include #include "ColladaHelper.h" #include -#include "TinyFormatter.h" +#include namespace Assimp { diff --git a/code/ComputeUVMappingProcess.cpp b/code/ComputeUVMappingProcess.cpp index c49666de8..3b0e64397 100644 --- a/code/ComputeUVMappingProcess.cpp +++ b/code/ComputeUVMappingProcess.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ComputeUVMappingProcess.h" #include "ProcessHelper.h" -#include "Exceptional.h" +#include using namespace Assimp; diff --git a/code/CreateAnimMesh.cpp b/code/CreateAnimMesh.cpp index 094a414bf..1a052849b 100644 --- a/code/CreateAnimMesh.cpp +++ b/code/CreateAnimMesh.cpp @@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ -#include "CreateAnimMesh.h" +#include namespace Assimp { diff --git a/code/D3MFExporter.cpp b/code/D3MFExporter.cpp index 229e3f261..25a57009f 100644 --- a/code/D3MFExporter.cpp +++ b/code/D3MFExporter.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "Exceptional.h" +#include #include "3MFXmlTags.h" #include "D3MFOpcPackage.h" diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp index 372416dbd..e44d6fb1a 100644 --- a/code/D3MFImporter.cpp +++ b/code/D3MFImporter.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "StringComparison.h" -#include "StringUtils.h" +#include +#include #include #include @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "D3MFOpcPackage.h" #include -#include "irrXMLWrapper.h" +#include #include "3MFXmlTags.h" namespace Assimp { diff --git a/code/D3MFImporter.h b/code/D3MFImporter.h index 604d73bd5..f5496eec5 100644 --- a/code/D3MFImporter.h +++ b/code/D3MFImporter.h @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_D3MFLOADER_H_INCLUDED #define AI_D3MFLOADER_H_INCLUDED -#include "BaseImporter.h" +#include namespace Assimp { diff --git a/code/D3MFOpcPackage.cpp b/code/D3MFOpcPackage.cpp index 49143fee7..05e82122a 100644 --- a/code/D3MFOpcPackage.cpp +++ b/code/D3MFOpcPackage.cpp @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_3MF_IMPORTER #include "D3MFOpcPackage.h" -#include "Exceptional.h" +#include #include #include diff --git a/code/D3MFOpcPackage.h b/code/D3MFOpcPackage.h index 818415e9f..cebe4fd62 100644 --- a/code/D3MFOpcPackage.h +++ b/code/D3MFOpcPackage.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "irrXMLWrapper.h" +#include namespace Assimp { namespace D3MF { diff --git a/code/DXFHelper.h b/code/DXFHelper.h index e16b7f1aa..6ab08c998 100644 --- a/code/DXFHelper.h +++ b/code/DXFHelper.h @@ -46,10 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_DXFHELPER_H #define INCLUDED_DXFHELPER_H -#include "LineSplitter.h" -#include "TinyFormatter.h" -#include "StreamReader.h" -#include "fast_atof.h" +#include +#include +#include +#include #include #include diff --git a/code/DXFLoader.cpp b/code/DXFLoader.cpp index 1e932e509..0c036dbb9 100644 --- a/code/DXFLoader.cpp +++ b/code/DXFLoader.cpp @@ -48,9 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER #include "DXFLoader.h" -#include "ParsingUtils.h" +#include #include "ConvertToLHProcess.h" -#include "fast_atof.h" +#include #include "DXFHelper.h" #include diff --git a/code/DXFLoader.h b/code/DXFLoader.h index 64822e9e2..b6fbd05ac 100644 --- a/code/DXFLoader.h +++ b/code/DXFLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_DXFLOADER_H_INCLUDED #define AI_DXFLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include namespace Assimp { diff --git a/code/DefaultIOSystem.cpp b/code/DefaultIOSystem.cpp index d83d2a79f..45082e59c 100644 --- a/code/DefaultIOSystem.cpp +++ b/code/DefaultIOSystem.cpp @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** @file Default implementation of IOSystem using the standard C file functions */ -#include "StringComparison.h" +#include #include #include diff --git a/code/DefaultLogger.cpp b/code/DefaultLogger.cpp index b69e18ea9..98c63a293 100644 --- a/code/DefaultLogger.cpp +++ b/code/DefaultLogger.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Win32DebugLogStream.h" #include "StdOStreamLogStream.h" #include "FileLogStream.h" -#include "StringUtils.h" +#include #include #include diff --git a/code/Exporter.cpp b/code/Exporter.cpp index eebecd859..e1f1a604f 100644 --- a/code/Exporter.cpp +++ b/code/Exporter.cpp @@ -53,7 +53,7 @@ Here we implement only the C++ interface (Assimp::Exporter). #ifndef ASSIMP_BUILD_NO_EXPORT -#include "BlobIOSystem.h" +#include #include #include "BaseProcess.h" #include "Importer.h" // need this for GetPostProcessingStepInstanceList() @@ -61,7 +61,7 @@ Here we implement only the C++ interface (Assimp::Exporter). #include "JoinVerticesProcess.h" #include "MakeVerboseFormat.h" #include "ConvertToLHProcess.h" -#include "Exceptional.h" +#include #include "ScenePrivate.h" #include diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp index cc2e734fc..37dca24f6 100644 --- a/code/FBXBinaryTokenizer.cpp +++ b/code/FBXBinaryTokenizer.cpp @@ -50,8 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXUtil.h" #include #include -#include "Exceptional.h" -#include "ByteSwapper.h" +#include +#include namespace Assimp { namespace FBX { diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp index 66f541f17..5d139a18e 100644 --- a/code/FBXConverter.cpp +++ b/code/FBXConverter.cpp @@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXUtil.h" #include "FBXProperties.h" #include "FBXImporter.h" -#include "StringComparison.h" +#include #include diff --git a/code/FBXImporter.cpp b/code/FBXImporter.cpp index 37d7cc4be..566bc992f 100644 --- a/code/FBXImporter.cpp +++ b/code/FBXImporter.cpp @@ -53,8 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXDocument.h" #include "FBXConverter.h" -#include "StreamReader.h" -#include "MemoryIOWrapper.h" +#include +#include #include #include diff --git a/code/FBXImporter.h b/code/FBXImporter.h index 43be97ffa..139fdecae 100644 --- a/code/FBXImporter.h +++ b/code/FBXImporter.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_FBX_IMPORTER_H #define INCLUDED_AI_FBX_IMPORTER_H -#include "BaseImporter.h" -#include "LogAux.h" +#include +#include #include "FBXImportSettings.h" diff --git a/code/FBXMaterial.cpp b/code/FBXMaterial.cpp index 130993d28..73e5e482c 100644 --- a/code/FBXMaterial.cpp +++ b/code/FBXMaterial.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXImportSettings.h" #include "FBXDocumentUtil.h" #include "FBXProperties.h" -#include "ByteSwapper.h" +#include namespace Assimp { namespace FBX { diff --git a/code/FBXParser.cpp b/code/FBXParser.cpp index 935fe5b08..e8e588b06 100644 --- a/code/FBXParser.cpp +++ b/code/FBXParser.cpp @@ -56,9 +56,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXParser.h" #include "FBXUtil.h" -#include "ParsingUtils.h" -#include "fast_atof.h" -#include "ByteSwapper.h" +#include +#include +#include #include diff --git a/code/FBXParser.h b/code/FBXParser.h index 736adcea0..c7cf5a458 100644 --- a/code/FBXParser.h +++ b/code/FBXParser.h @@ -48,8 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "LogAux.h" -#include "fast_atof.h" +#include +#include #include "FBXCompileConfig.h" #include "FBXTokenizer.h" diff --git a/code/FBXTokenizer.cpp b/code/FBXTokenizer.cpp index 881dcf53d..d94556b97 100644 --- a/code/FBXTokenizer.cpp +++ b/code/FBXTokenizer.cpp @@ -48,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // tab width for logging columns #define ASSIMP_FBX_TAB_WIDTH 4 -#include "ParsingUtils.h" +#include #include "FBXTokenizer.h" #include "FBXUtil.h" -#include "Exceptional.h" +#include namespace Assimp { namespace FBX { diff --git a/code/FBXUtil.cpp b/code/FBXUtil.cpp index 4fd91e18f..652174ffc 100644 --- a/code/FBXUtil.cpp +++ b/code/FBXUtil.cpp @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXUtil.h" #include "FBXTokenizer.h" -#include "TinyFormatter.h" +#include #include #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER diff --git a/code/FIReader.cpp b/code/FIReader.cpp index 0633ea050..3d5b6ad41 100755 --- a/code/FIReader.cpp +++ b/code/FIReader.cpp @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_X3D_IMPORTER #include "FIReader.hpp" -#include "StringUtils.h" +#include // Workaround for issue #1361 // https://github.com/assimp/assimp/issues/1361 @@ -54,13 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # define _GLIBCXX_USE_C99 1 #endif -#include "Exceptional.h" +#include #include #include -#include "MemoryIOWrapper.h" -#include "irrXMLWrapper.h" +#include +#include #include "../contrib/utf8cpp/source/utf8.h" -#include "fast_atof.h" +#include #include #include #include diff --git a/code/FileSystemFilter.h b/code/FileSystemFilter.h index 3370589d6..0fabb41dd 100644 --- a/code/FileSystemFilter.h +++ b/code/FileSystemFilter.h @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../include/assimp/IOSystem.hpp" #include "../include/assimp/DefaultLogger.hpp" -#include "fast_atof.h" -#include "ParsingUtils.h" +#include "../include/assimp/fast_atof.h" +#include "../include/assimp/ParsingUtils.h" namespace Assimp { diff --git a/code/FindDegenerates.cpp b/code/FindDegenerates.cpp index f9c04133a..fe13509b9 100644 --- a/code/FindDegenerates.cpp +++ b/code/FindDegenerates.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "ProcessHelper.h" #include "FindDegenerates.h" -#include "Exceptional.h" +#include using namespace Assimp; diff --git a/code/FindInvalidDataProcess.cpp b/code/FindInvalidDataProcess.cpp index c37d8956c..5b6b822b7 100644 --- a/code/FindInvalidDataProcess.cpp +++ b/code/FindInvalidDataProcess.cpp @@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "FindInvalidDataProcess.h" #include "ProcessHelper.h" -#include "Macros.h" -#include "Exceptional.h" -#include "qnan.h" +#include +#include +#include using namespace Assimp; diff --git a/code/FixNormalsStep.cpp b/code/FixNormalsStep.cpp index 05d05e873..e00458009 100644 --- a/code/FixNormalsStep.cpp +++ b/code/FixNormalsStep.cpp @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "FixNormalsStep.h" -#include "StringUtils.h" +#include #include #include #include diff --git a/code/GenFaceNormalsProcess.cpp b/code/GenFaceNormalsProcess.cpp index 82d80db77..f42b17ad0 100644 --- a/code/GenFaceNormalsProcess.cpp +++ b/code/GenFaceNormalsProcess.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "Exceptional.h" -#include "qnan.h" +#include +#include using namespace Assimp; diff --git a/code/GenVertexNormalsProcess.cpp b/code/GenVertexNormalsProcess.cpp index 93c0e1351..7e6267b9b 100644 --- a/code/GenVertexNormalsProcess.cpp +++ b/code/GenVertexNormalsProcess.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "GenVertexNormalsProcess.h" #include "ProcessHelper.h" -#include "Exceptional.h" -#include "qnan.h" +#include +#include using namespace Assimp; diff --git a/code/HMPLoader.h b/code/HMPLoader.h index 546643e8d..f85246e50 100644 --- a/code/HMPLoader.h +++ b/code/HMPLoader.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_HMPLOADER_H_INCLUDED // internal headers -#include "BaseImporter.h" +#include #include "MDLLoader.h" #include "HMPFileData.h" diff --git a/code/IFCLoader.cpp b/code/IFCLoader.cpp index 85382d467..2e548c853 100644 --- a/code/IFCLoader.cpp +++ b/code/IFCLoader.cpp @@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "IFCUtil.h" -#include "MemoryIOWrapper.h" +#include #include #include #include diff --git a/code/IFCLoader.h b/code/IFCLoader.h index 4cf116f8e..049c53382 100644 --- a/code/IFCLoader.h +++ b/code/IFCLoader.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_IFC_LOADER_H #define INCLUDED_AI_IFC_LOADER_H -#include "BaseImporter.h" -#include "LogAux.h" +#include +#include namespace Assimp { diff --git a/code/IFF.h b/code/IFF.h index 2b42b554b..91d7d4828 100644 --- a/code/IFF.h +++ b/code/IFF.h @@ -5,7 +5,7 @@ #ifndef AI_IFF_H_INCLUDED #define AI_IFF_H_INCLUDED -#include "ByteSwapper.h" +#include namespace Assimp { namespace IFF { diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp index c29d5b072..79cea759a 100644 --- a/code/IRRLoader.cpp +++ b/code/IRRLoader.cpp @@ -49,16 +49,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_IRR_IMPORTER #include "IRRLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" -#include "GenericProperty.h" +#include +#include +#include #include -#include "StandardShapes.h" +#include #include "Importer.h" // We need MathFunctions.h to compute the lcm/gcd of a number -#include "MathFunctions.h" +#include #include #include #include diff --git a/code/IRRLoader.h b/code/IRRLoader.h index d07199c0b..d7a972211 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 "IRRShared.h" #include #include "Importer.h" -#include "StringUtils.h" +#include #include namespace Assimp { diff --git a/code/IRRMeshLoader.cpp b/code/IRRMeshLoader.cpp index a63a2a134..f01b02561 100644 --- a/code/IRRMeshLoader.cpp +++ b/code/IRRMeshLoader.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER #include "IRRMeshLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include #include #include #include @@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "Macros.h" +#include using namespace Assimp; using namespace irr; diff --git a/code/IRRMeshLoader.h b/code/IRRMeshLoader.h index 312dbbfe0..041b7183c 100644 --- a/code/IRRMeshLoader.h +++ b/code/IRRMeshLoader.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_IRRMESHLOADER_H_INCLUDED #define AI_IRRMESHLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include "IRRShared.h" #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER diff --git a/code/IRRShared.cpp b/code/IRRShared.cpp index bfe408629..35eef2db2 100644 --- a/code/IRRShared.cpp +++ b/code/IRRShared.cpp @@ -50,8 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if !(defined(ASSIMP_BUILD_NO_IRR_IMPORTER) && defined(ASSIMP_BUILD_NO_IRRMESH_IMPORTER)) #include "IRRShared.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include #include #include diff --git a/code/IRRShared.h b/code/IRRShared.h index b5cd5d5ba..8770d2add 100644 --- a/code/IRRShared.h +++ b/code/IRRShared.h @@ -7,8 +7,8 @@ #ifndef INCLUDED_AI_IRRSHARED_H #define INCLUDED_AI_IRRSHARED_H -#include "irrXMLWrapper.h" -#include "BaseImporter.h" +#include +#include #include struct aiMaterial; diff --git a/code/Importer.cpp b/code/Importer.cpp index c6c6f0edd..73c643cbc 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -64,19 +64,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Internal headers // ------------------------------------------------------------------------------------------------ #include "Importer.h" -#include "BaseImporter.h" +#include #include "BaseProcess.h" #include "DefaultProgressHandler.h" -#include "GenericProperty.h" +#include #include "ProcessHelper.h" #include "ScenePreprocessor.h" #include "ScenePrivate.h" -#include "MemoryIOWrapper.h" -#include "Profiler.h" -#include "TinyFormatter.h" -#include "Exceptional.h" -#include "Profiler.h" +#include +#include +#include +#include +#include #include #include #include diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp index b4d2c3dcf..0ba6bf0b5 100644 --- a/code/ImporterRegistry.cpp +++ b/code/ImporterRegistry.cpp @@ -48,7 +48,7 @@ corresponding preprocessor flag to selectively disable formats. */ #include -#include "BaseImporter.h" +#include // ------------------------------------------------------------------------------------------------ // Importers diff --git a/code/ImproveCacheLocality.cpp b/code/ImproveCacheLocality.cpp index 2ac32aa84..f7cbdc9bd 100644 --- a/code/ImproveCacheLocality.cpp +++ b/code/ImproveCacheLocality.cpp @@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "ImproveCacheLocality.h" #include "VertexTriangleAdjacency.h" -#include "StringUtils.h" +#include #include #include #include diff --git a/code/JoinVerticesProcess.cpp b/code/JoinVerticesProcess.cpp index 17b0ab07f..693000215 100644 --- a/code/JoinVerticesProcess.cpp +++ b/code/JoinVerticesProcess.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "JoinVerticesProcess.h" #include "ProcessHelper.h" -#include "Vertex.h" -#include "TinyFormatter.h" +#include +#include #include using namespace Assimp; diff --git a/code/LWOLoader.cpp b/code/LWOLoader.cpp index 5ec07800d..516b95df6 100644 --- a/code/LWOLoader.cpp +++ b/code/LWOLoader.cpp @@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "LWOLoader.h" -#include "StringComparison.h" -#include "SGSpatialSort.h" -#include "ByteSwapper.h" +#include +#include +#include #include "ProcessHelper.h" #include "ConvertToLHProcess.h" #include diff --git a/code/LWOLoader.h b/code/LWOLoader.h index b92e5aab4..078e34fcf 100644 --- a/code/LWOLoader.h +++ b/code/LWOLoader.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "LWOFileData.h" -#include "BaseImporter.h" +#include #include diff --git a/code/LWOMaterial.cpp b/code/LWOMaterial.cpp index 621a2edc6..a0d8f70b4 100644 --- a/code/LWOMaterial.cpp +++ b/code/LWOMaterial.cpp @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "LWOLoader.h" -#include "ByteSwapper.h" +#include using namespace Assimp; diff --git a/code/LWSLoader.cpp b/code/LWSLoader.cpp index 2017cdb9d..baf8d5103 100644 --- a/code/LWSLoader.cpp +++ b/code/LWSLoader.cpp @@ -48,12 +48,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_LWS_IMPORTER #include "LWSLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include #include -#include "GenericProperty.h" -#include "SkeletonMeshBuilder.h" +#include +#include #include "ConvertToLHProcess.h" #include "Importer.h" #include diff --git a/code/LWSLoader.h b/code/LWSLoader.h index e36d27b77..b5b33a87d 100644 --- a/code/LWSLoader.h +++ b/code/LWSLoader.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "LWOFileData.h" #include -#include "BaseImporter.h" +#include struct aiImporterDesc; diff --git a/code/LimitBoneWeightsProcess.cpp b/code/LimitBoneWeightsProcess.cpp index 0bb4a4be3..9c8e56755 100644 --- a/code/LimitBoneWeightsProcess.cpp +++ b/code/LimitBoneWeightsProcess.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "LimitBoneWeightsProcess.h" -#include "StringUtils.h" +#include #include #include #include diff --git a/code/MD2Loader.cpp b/code/MD2Loader.cpp index f0a5432bf..ea6fa50bb 100644 --- a/code/MD2Loader.cpp +++ b/code/MD2Loader.cpp @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Implementation of the MD2 importer class */ #include "MD2Loader.h" -#include "ByteSwapper.h" +#include #include "MD2NormalTable.h" // shouldn't be included by other units #include #include diff --git a/code/MD2Loader.h b/code/MD2Loader.h index a7566dc64..29a0e173c 100644 --- a/code/MD2Loader.h +++ b/code/MD2Loader.h @@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MD2LOADER_H_INCLUDED #define AI_MD2LOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include -#include "ByteSwapper.h" +#include #include "MD2FileData.h" struct aiNode; diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp index 11a6e56dd..7948a635e 100644 --- a/code/MD3Loader.cpp +++ b/code/MD3Loader.cpp @@ -54,9 +54,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MD3Loader.h" #include -#include "GenericProperty.h" -#include "RemoveComments.h" -#include "ParsingUtils.h" +#include +#include +#include #include "Importer.h" #include #include diff --git a/code/MD3Loader.h b/code/MD3Loader.h index ff5b56a52..967d4cb35 100644 --- a/code/MD3Loader.h +++ b/code/MD3Loader.h @@ -45,10 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MD3LOADER_H_INCLUDED #define AI_MD3LOADER_H_INCLUDED -#include "BaseImporter.h" -#include "ByteSwapper.h" +#include +#include #include "MD3FileData.h" -#include "StringComparison.h" +#include #include #include diff --git a/code/MD5Loader.cpp b/code/MD5Loader.cpp index 172c98a30..d9eb74ec8 100644 --- a/code/MD5Loader.cpp +++ b/code/MD5Loader.cpp @@ -48,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_MD5_IMPORTER // internal headers -#include "RemoveComments.h" +#include #include "MD5Loader.h" -#include "StringComparison.h" -#include "fast_atof.h" -#include "SkeletonMeshBuilder.h" +#include +#include +#include #include #include #include diff --git a/code/MD5Loader.h b/code/MD5Loader.h index 13a01451d..59e8a114f 100644 --- a/code/MD5Loader.h +++ b/code/MD5Loader.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MD5LOADER_H_INCLUDED #define AI_MD5LOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include "MD5Parser.h" #include diff --git a/code/MD5Parser.cpp b/code/MD5Parser.cpp index 8076e5bc4..26fac1b29 100644 --- a/code/MD5Parser.cpp +++ b/code/MD5Parser.cpp @@ -48,9 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "MD5Loader.h" #include "MaterialSystem.h" -#include "fast_atof.h" -#include "ParsingUtils.h" -#include "StringComparison.h" +#include +#include +#include #include #include diff --git a/code/MD5Parser.h b/code/MD5Parser.h index bafcaf962..9cf4db017 100644 --- a/code/MD5Parser.h +++ b/code/MD5Parser.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_MD5PARSER_H_INCLUDED #include -#include "ParsingUtils.h" +#include #include #include diff --git a/code/MDCLoader.h b/code/MDCLoader.h index 5f3b365fd..841c8b680 100644 --- a/code/MDCLoader.h +++ b/code/MDCLoader.h @@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "BaseImporter.h" +#include #include "MDCFileData.h" -#include "ByteSwapper.h" +#include namespace Assimp { diff --git a/code/MDLFileData.h b/code/MDLFileData.h index 3ef58ca5a..e94bf9870 100644 --- a/code/MDLFileData.h +++ b/code/MDLFileData.h @@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "ByteSwapper.h" +#include #include #include diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index 643b3882f..4597afe11 100644 --- a/code/MDLLoader.cpp +++ b/code/MDLLoader.cpp @@ -50,11 +50,11 @@ 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 +#include #include "MDLDefaultColorMap.h" #include "MD2FileData.h" -#include "StringUtils.h" +#include #include #include #include diff --git a/code/MDLLoader.h b/code/MDLLoader.h index 8709426e6..284370537 100644 --- a/code/MDLLoader.h +++ b/code/MDLLoader.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MDLLOADER_H_INCLUDED #define AI_MDLLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include "MDLFileData.h" #include "HalfLifeFileData.h" diff --git a/code/MDLMaterialLoader.cpp b/code/MDLMaterialLoader.cpp index 4d23d0aa6..9c3c94041 100644 --- a/code/MDLMaterialLoader.cpp +++ b/code/MDLMaterialLoader.cpp @@ -48,13 +48,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "MDLLoader.h" #include "MDLDefaultColorMap.h" -#include "StringUtils.h" +#include #include #include #include #include #include -#include "qnan.h" +#include #include diff --git a/code/MMDImporter.h b/code/MMDImporter.h index e660abaaa..4ee94eeb0 100644 --- a/code/MMDImporter.h +++ b/code/MMDImporter.h @@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MMD_FILE_IMPORTER_H_INC #define MMD_FILE_IMPORTER_H_INC -#include "BaseImporter.h" +#include #include "MMDPmxParser.h" #include #include diff --git a/code/MMDPmxParser.cpp b/code/MMDPmxParser.cpp index 970cbc31e..3f194b6ba 100644 --- a/code/MMDPmxParser.cpp +++ b/code/MMDPmxParser.cpp @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "MMDPmxParser.h" #include "../contrib/utf8cpp/source/utf8.h" -#include "Exceptional.h" +#include namespace pmx { diff --git a/code/MS3DLoader.cpp b/code/MS3DLoader.cpp index 64ec1e076..56a1fcd75 100644 --- a/code/MS3DLoader.cpp +++ b/code/MS3DLoader.cpp @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "MS3DLoader.h" -#include "StreamReader.h" +#include #include #include #include diff --git a/code/MS3DLoader.h b/code/MS3DLoader.h index b4b19b3ad..6db60b3a4 100644 --- a/code/MS3DLoader.h +++ b/code/MS3DLoader.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MS3DLOADER_H_INCLUDED #define AI_MS3DLOADER_H_INCLUDED -#include "BaseImporter.h" -#include "StreamReader.h" +#include +#include struct aiNode; namespace Assimp { diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp index 55f1a4ff5..7dbee911e 100644 --- a/code/MaterialSystem.cpp +++ b/code/MaterialSystem.cpp @@ -43,14 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Implementation of the material system of the library */ -#include "Hash.h" -#include "fast_atof.h" -#include "ParsingUtils.h" +#include +#include +#include #include "MaterialSystem.h" #include #include #include -#include "Macros.h" +#include using namespace Assimp; diff --git a/code/NDOLoader.cpp b/code/NDOLoader.cpp index 2586bac3e..8247db049 100644 --- a/code/NDOLoader.cpp +++ b/code/NDOLoader.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "StreamReader.h" +#include #include using namespace Assimp; diff --git a/code/NDOLoader.h b/code/NDOLoader.h index 4fd315691..f2212edab 100644 --- a/code/NDOLoader.h +++ b/code/NDOLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define INCLUDED_AI_NDO_LOADER_H #include -#include "BaseImporter.h" +#include #include #include #include diff --git a/code/NFFLoader.cpp b/code/NFFLoader.cpp index a51c500f1..811f60618 100644 --- a/code/NFFLoader.cpp +++ b/code/NFFLoader.cpp @@ -47,11 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #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 #include #include diff --git a/code/NFFLoader.h b/code/NFFLoader.h index 0640d4405..6f8964a01 100644 --- a/code/NFFLoader.h +++ b/code/NFFLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_NFFLOADER_H_INCLUDED #define AI_NFFLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include #include diff --git a/code/OFFLoader.cpp b/code/OFFLoader.cpp index 5038176e2..ff8721ce2 100644 --- a/code/OFFLoader.cpp +++ b/code/OFFLoader.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "OFFLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include #include #include #include diff --git a/code/OFFLoader.h b/code/OFFLoader.h index 29a4927bd..01ddd1072 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. #ifndef AI_OFFLOADER_H_INCLUDED #define AI_OFFLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp index a8bf9935a..163960d4c 100644 --- a/code/ObjExporter.cpp +++ b/code/ObjExporter.cpp @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER #include "ObjExporter.h" -#include "Exceptional.h" -#include "StringComparison.h" +#include +#include #include #include #include diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp index 11f4b9487..c4295ab01 100644 --- a/code/ObjFileImporter.cpp +++ b/code/ObjFileImporter.cpp @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ObjFileImporter.h" #include "ObjFileParser.h" #include "ObjFileData.h" -#include "IOStreamBuffer.h" +#include #include #include #include diff --git a/code/ObjFileImporter.h b/code/ObjFileImporter.h index 302cf951a..3947996c0 100644 --- a/code/ObjFileImporter.h +++ b/code/ObjFileImporter.h @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef OBJ_FILE_IMPORTER_H_INC #define OBJ_FILE_IMPORTER_H_INC -#include "BaseImporter.h" +#include #include #include diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp index 6ef655f8a..5986b4c4e 100644 --- a/code/ObjFileMtlImporter.cpp +++ b/code/ObjFileMtlImporter.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ObjFileMtlImporter.h" #include "ObjTools.h" #include "ObjFileData.h" -#include "fast_atof.h" -#include "ParsingUtils.h" +#include +#include #include #include diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp index 2b9873bc1..25b0a97f1 100644 --- a/code/ObjFileParser.cpp +++ b/code/ObjFileParser.cpp @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ObjFileMtlImporter.h" #include "ObjTools.h" #include "ObjFileData.h" -#include "ParsingUtils.h" -#include "BaseImporter.h" +#include +#include #include #include #include diff --git a/code/ObjFileParser.h b/code/ObjFileParser.h index 15332a1df..3b6578c5e 100644 --- a/code/ObjFileParser.h +++ b/code/ObjFileParser.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "IOStreamBuffer.h" +#include namespace Assimp { diff --git a/code/ObjTools.h b/code/ObjTools.h index 7236cedc0..502f7c3c0 100644 --- a/code/ObjTools.h +++ b/code/ObjTools.h @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef OBJ_TOOLS_H_INC #define OBJ_TOOLS_H_INC -#include "fast_atof.h" -#include "ParsingUtils.h" +#include +#include #include namespace Assimp { diff --git a/code/OgreBinarySerializer.cpp b/code/OgreBinarySerializer.cpp index 95aec221f..f98bd583c 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 "OgreXmlSerializer.h" #include "OgreParsingUtils.h" -#include "TinyFormatter.h" +#include #include diff --git a/code/OgreBinarySerializer.h b/code/OgreBinarySerializer.h index c48e33dd6..06ce5f7fa 100644 --- a/code/OgreBinarySerializer.h +++ b/code/OgreBinarySerializer.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #include "OgreStructs.h" -#include "StreamReader.h" +#include namespace Assimp { diff --git a/code/OgreImporter.h b/code/OgreImporter.h index 2b3009096..97ea5463c 100644 --- a/code/OgreImporter.h +++ b/code/OgreImporter.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER -#include "BaseImporter.h" +#include #include "OgreStructs.h" #include "OgreParsingUtils.h" diff --git a/code/OgreMaterial.cpp b/code/OgreMaterial.cpp index 1abca2cf1..61a3caa5e 100644 --- a/code/OgreMaterial.cpp +++ b/code/OgreMaterial.cpp @@ -44,11 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #include "OgreImporter.h" -#include "TinyFormatter.h" +#include #include #include #include -#include "fast_atof.h" +#include #include #include diff --git a/code/OgreParsingUtils.h b/code/OgreParsingUtils.h index b0c31e5be..8c921c9e9 100644 --- a/code/OgreParsingUtils.h +++ b/code/OgreParsingUtils.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER -#include "ParsingUtils.h" +#include #include #include #include diff --git a/code/OgreStructs.cpp b/code/OgreStructs.cpp index 09597950a..b9c7df566 100644 --- a/code/OgreStructs.cpp +++ b/code/OgreStructs.cpp @@ -42,10 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #include "OgreStructs.h" -#include "TinyFormatter.h" +#include #include #include -#include "Exceptional.h" +#include namespace Assimp diff --git a/code/OgreStructs.h b/code/OgreStructs.h index 04383bc4e..613510dde 100644 --- a/code/OgreStructs.h +++ b/code/OgreStructs.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER -#include "MemoryIOWrapper.h" +#include #include #include #include diff --git a/code/OgreXmlSerializer.cpp b/code/OgreXmlSerializer.cpp index b5d20cdf6..215b72e9f 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 "OgreBinarySerializer.h" #include "OgreParsingUtils.h" -#include "TinyFormatter.h" +#include #include #include diff --git a/code/OgreXmlSerializer.h b/code/OgreXmlSerializer.h index 01b9a7b23..b10e105e3 100644 --- a/code/OgreXmlSerializer.h +++ b/code/OgreXmlSerializer.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #include "OgreStructs.h" -#include "irrXMLWrapper.h" +#include namespace Assimp { diff --git a/code/OpenGEXImporter.cpp b/code/OpenGEXImporter.cpp index 5448edba5..8f565849f 100644 --- a/code/OpenGEXImporter.cpp +++ b/code/OpenGEXImporter.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include "MakeVerboseFormat.h" -#include "StringComparison.h" +#include #include #include diff --git a/code/OpenGEXImporter.h b/code/OpenGEXImporter.h index c0cde579c..104ae3091 100644 --- a/code/OpenGEXImporter.h +++ b/code/OpenGEXImporter.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER -#include "BaseImporter.h" +#include #include #include diff --git a/code/OptimizeGraph.cpp b/code/OptimizeGraph.cpp index 11a6fcf65..75df935ea 100644 --- a/code/OptimizeGraph.cpp +++ b/code/OptimizeGraph.cpp @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OptimizeGraph.h" #include "ProcessHelper.h" #include -#include "Exceptional.h" +#include #include using namespace Assimp; diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp index f8183fc75..a65661c26 100644 --- a/code/OptimizeMeshes.cpp +++ b/code/OptimizeMeshes.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OptimizeMeshes.h" #include "ProcessHelper.h" #include -#include "Exceptional.h" +#include using namespace Assimp; diff --git a/code/PlyExporter.cpp b/code/PlyExporter.cpp index b20c2b328..f9b97cf0b 100644 --- a/code/PlyExporter.cpp +++ b/code/PlyExporter.cpp @@ -46,12 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "PlyExporter.h" #include #include -#include "Exceptional.h" +#include #include #include #include #include -#include "qnan.h" +#include //using namespace Assimp; diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index 7c4614474..f8238c5c1 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "PlyLoader.h" -#include "IOStreamBuffer.h" -#include "Macros.h" +#include +#include #include #include #include diff --git a/code/PlyLoader.h b/code/PlyLoader.h index eb64a9036..e117784e9 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. #ifndef AI_PLYLOADER_H_INCLUDED #define AI_PLYLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include "PlyParser.h" #include diff --git a/code/PlyParser.cpp b/code/PlyParser.cpp index 6321821d2..0dabcc739 100644 --- a/code/PlyParser.cpp +++ b/code/PlyParser.cpp @@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_PLY_IMPORTER -#include "fast_atof.h" +#include #include -#include "ByteSwapper.h" +#include #include "PlyLoader.h" using namespace Assimp; diff --git a/code/PlyParser.h b/code/PlyParser.h index b17b07341..05d37e288 100644 --- a/code/PlyParser.h +++ b/code/PlyParser.h @@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_PLYFILEHELPER_H_INC -#include "ParsingUtils.h" -#include "IOStreamBuffer.h" +#include +#include #include namespace Assimp diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp index 0751c4556..70d16382d 100644 --- a/code/PretransformVertices.cpp +++ b/code/PretransformVertices.cpp @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "PretransformVertices.h" #include "ProcessHelper.h" #include -#include "Exceptional.h" +#include using namespace Assimp; diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h index a49115936..4cacdcf85 100644 --- a/code/ProcessHelper.h +++ b/code/ProcessHelper.h @@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "SpatialSort.h" +#include #include "BaseProcess.h" -#include "ParsingUtils.h" +#include #include diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp index 0cdafae42..cbe531cfc 100644 --- a/code/Q3BSPFileImporter.cpp +++ b/code/Q3BSPFileImporter.cpp @@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "StringComparison.h" +#include static const aiImporterDesc desc = { "Quake III BSP Importer", diff --git a/code/Q3BSPFileImporter.h b/code/Q3BSPFileImporter.h index cf53d4db0..dad1aca48 100644 --- a/code/Q3BSPFileImporter.h +++ b/code/Q3BSPFileImporter.h @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_Q3BSPFILEIMPORTER_H_INC #define ASSIMP_Q3BSPFILEIMPORTER_H_INC -#include "BaseImporter.h" +#include #include diff --git a/code/Q3BSPFileParser.h b/code/Q3BSPFileParser.h index 1ee6d4aef..4ca9f6c24 100644 --- a/code/Q3BSPFileParser.h +++ b/code/Q3BSPFileParser.h @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_Q3BSPFILEPARSER_H_INC #define ASSIMP_Q3BSPFILEPARSER_H_INC -#include "BaseImporter.h" +#include #include namespace Assimp diff --git a/code/Q3DLoader.cpp b/code/Q3DLoader.cpp index 5aa639d09..3a5b763b5 100644 --- a/code/Q3DLoader.cpp +++ b/code/Q3DLoader.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "Q3DLoader.h" -#include "StreamReader.h" -#include "fast_atof.h" +#include +#include #include #include #include diff --git a/code/Q3DLoader.h b/code/Q3DLoader.h index 97184a5ff..f163e15dc 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. #ifndef AI_Q3DLOADER_H_INCLUDED #define AI_Q3DLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include #include diff --git a/code/RawLoader.cpp b/code/RawLoader.cpp index 13deb0005..2d51c4a72 100644 --- a/code/RawLoader.cpp +++ b/code/RawLoader.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "RawLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include #include #include #include diff --git a/code/RawLoader.h b/code/RawLoader.h index 0a1a35815..8f633d011 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. #ifndef AI_RAWLOADER_H_INCLUDED #define AI_RAWLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include diff --git a/code/RemoveComments.cpp b/code/RemoveComments.cpp index 1ed94ea4d..024ff7f7a 100644 --- a/code/RemoveComments.cpp +++ b/code/RemoveComments.cpp @@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Defines the CommentRemover utility class */ -#include "RemoveComments.h" -#include "ParsingUtils.h" +#include +#include namespace Assimp { diff --git a/code/RemoveRedundantMaterials.cpp b/code/RemoveRedundantMaterials.cpp index c6319f892..d7d2de402 100644 --- a/code/RemoveRedundantMaterials.cpp +++ b/code/RemoveRedundantMaterials.cpp @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "RemoveRedundantMaterials.h" -#include "ParsingUtils.h" +#include #include "ProcessHelper.h" #include "MaterialSystem.h" #include diff --git a/code/SGSpatialSort.cpp b/code/SGSpatialSort.cpp index 7a80381e2..e3714610f 100644 --- a/code/SGSpatialSort.cpp +++ b/code/SGSpatialSort.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. vertices close to a given position. Special implementation for the 3ds loader handling smooth groups correctly */ -#include "SGSpatialSort.h" +#include using namespace Assimp; diff --git a/code/SGSpatialSort.h b/code/SGSpatialSort.h index e7cd38724..f087ad8b5 100644 --- a/code/SGSpatialSort.h +++ b/code/SGSpatialSort.h @@ -57,7 +57,7 @@ namespace Assimp { * implementation to handle all details of its file format correctly. */ // ---------------------------------------------------------------------------------- -class SGSpatialSort +class ASSIMP_API SGSpatialSort { public: diff --git a/code/SIBImporter.cpp b/code/SIBImporter.cpp index 2127e2e0c..af6e45cb1 100644 --- a/code/SIBImporter.cpp +++ b/code/SIBImporter.cpp @@ -55,9 +55,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "SIBImporter.h" -#include "ByteSwapper.h" -#include "StreamReader.h" -#include "TinyFormatter.h" +#include +#include +#include //#include "../contrib/ConvertUTF/ConvertUTF.h" #include "../contrib/utf8cpp/source/utf8.h" #include diff --git a/code/SIBImporter.h b/code/SIBImporter.h index e7e2ec0b9..e8df2b07c 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. #ifndef AI_SIBIMPORTER_H_INCLUDED #define AI_SIBIMPORTER_H_INCLUDED -#include "BaseImporter.h" +#include #include #include diff --git a/code/SMDLoader.cpp b/code/SMDLoader.cpp index 60e3f63c8..9bb07ba96 100644 --- a/code/SMDLoader.cpp +++ b/code/SMDLoader.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "SMDLoader.h" -#include "fast_atof.h" -#include "SkeletonMeshBuilder.h" +#include +#include #include #include #include diff --git a/code/SMDLoader.h b/code/SMDLoader.h index c50b327e3..a8e88f448 100644 --- a/code/SMDLoader.h +++ b/code/SMDLoader.h @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SMDLOADER_H_INCLUDED // internal headers -#include "BaseImporter.h" -#include "ParsingUtils.h" +#include +#include // public Assimp headers #include diff --git a/code/STEPFile.h b/code/STEPFile.h index 8a30beb3f..32bd9062a 100644 --- a/code/STEPFile.h +++ b/code/STEPFile.h @@ -71,7 +71,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # endif #endif -#include "LineSplitter.h" +#include // uncomment this to have the loader evaluate all entities upon loading. // this is intended as stress test - by default, entities are evaluated diff --git a/code/STEPFileEncoding.cpp b/code/STEPFileEncoding.cpp index 7204f802b..13a87d370 100644 --- a/code/STEPFileEncoding.cpp +++ b/code/STEPFileEncoding.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief STEP character handling, string un-escaping */ #include "STEPFileEncoding.h" -#include "fast_atof.h" +#include #include #include diff --git a/code/STEPFileReader.cpp b/code/STEPFileReader.cpp index d014c1a5d..407643862 100644 --- a/code/STEPFileReader.cpp +++ b/code/STEPFileReader.cpp @@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "STEPFileReader.h" #include "STEPFileEncoding.h" -#include "TinyFormatter.h" -#include "fast_atof.h" +#include +#include #include diff --git a/code/STLExporter.cpp b/code/STLExporter.cpp index 60b5d8bf3..648e5645b 100644 --- a/code/STLExporter.cpp +++ b/code/STLExporter.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "Exceptional.h" -#include "ByteSwapper.h" +#include +#include using namespace Assimp; namespace Assimp { diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp index be4c7584d..34abce2c2 100644 --- a/code/STLLoader.cpp +++ b/code/STLLoader.cpp @@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "STLLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include #include #include #include diff --git a/code/STLLoader.h b/code/STLLoader.h index c51604861..12ad4707e 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. #ifndef AI_STLLOADER_H_INCLUDED #define AI_STLLOADER_H_INCLUDED -#include "BaseImporter.h" +#include #include // Forward declarations diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index 4b77bb2db..bc466562b 100644 --- a/code/SceneCombiner.cpp +++ b/code/SceneCombiner.cpp @@ -52,9 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // ---------------------------------------------------------------------------- #include -#include "StringUtils.h" -#include "fast_atof.h" -#include "Hash.h" +#include +#include +#include #include "time.h" #include #include diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp index e9f427113..a0a26bb7b 100644 --- a/code/SkeletonMeshBuilder.cpp +++ b/code/SkeletonMeshBuilder.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -#include "SkeletonMeshBuilder.h" +#include using namespace Assimp; diff --git a/code/SortByPTypeProcess.cpp b/code/SortByPTypeProcess.cpp index e4b314e02..7f934da1f 100644 --- a/code/SortByPTypeProcess.cpp +++ b/code/SortByPTypeProcess.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "ProcessHelper.h" #include "SortByPTypeProcess.h" -#include "Exceptional.h" +#include using namespace Assimp; diff --git a/code/SpatialSort.cpp b/code/SpatialSort.cpp index 35724c2cd..297452884 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 using namespace Assimp; diff --git a/code/SplitByBoneCountProcess.cpp b/code/SplitByBoneCountProcess.cpp index a73dfe81e..6244db35e 100644 --- a/code/SplitByBoneCountProcess.cpp +++ b/code/SplitByBoneCountProcess.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "TinyFormatter.h" +#include using namespace Assimp; using namespace Assimp::Formatter; diff --git a/code/StandardShapes.cpp b/code/StandardShapes.cpp index 4346a8d76..1925e8f12 100644 --- a/code/StandardShapes.cpp +++ b/code/StandardShapes.cpp @@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * http://geometrictools.com/Documentation/PlatonicSolids.pdf. */ -#include "StandardShapes.h" -#include "StringComparison.h" +#include +#include #include #include #include diff --git a/code/StepExporter.cpp b/code/StepExporter.cpp index acf1b6dad..5d95d34e6 100644 --- a/code/StepExporter.cpp +++ b/code/StepExporter.cpp @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "StepExporter.h" #include "ConvertToLHProcess.h" -#include "Bitmap.h" -#include "BaseImporter.h" -#include "fast_atof.h" +#include +#include +#include #include #include #include @@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "Exceptional.h" +#include #include #include #include diff --git a/code/Subdivision.cpp b/code/Subdivision.cpp index bc5292dbe..b780a2656 100644 --- a/code/Subdivision.cpp +++ b/code/Subdivision.cpp @@ -39,11 +39,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -#include "Subdivision.h" +#include #include -#include "SpatialSort.h" +#include #include "ProcessHelper.h" -#include "Vertex.h" +#include #include #include diff --git a/code/TerragenLoader.cpp b/code/TerragenLoader.cpp index 0126229ac..5a1847d55 100644 --- a/code/TerragenLoader.cpp +++ b/code/TerragenLoader.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_TERRAGEN_IMPORTER #include "TerragenLoader.h" -#include "StreamReader.h" +#include #include #include #include diff --git a/code/TerragenLoader.h b/code/TerragenLoader.h index a95bd6bff..a4a22fcac 100644 --- a/code/TerragenLoader.h +++ b/code/TerragenLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_TERRAGEN_TERRAIN_LOADER_H #define INCLUDED_AI_TERRAGEN_TERRAIN_LOADER_H -#include "BaseImporter.h" +#include namespace Assimp { // Magic strings diff --git a/code/TextureTransform.cpp b/code/TextureTransform.cpp index 30953113e..72ee8ec21 100644 --- a/code/TextureTransform.cpp +++ b/code/TextureTransform.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "TextureTransform.h" -#include "StringUtils.h" +#include using namespace Assimp; diff --git a/code/TextureTransform.h b/code/TextureTransform.h index 7f1e4572f..cff675657 100644 --- a/code/TextureTransform.h +++ b/code/TextureTransform.h @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_TEXTURE_TRANSFORM_H_INCLUDED #define AI_TEXTURE_TRANSFORM_H_INCLUDED -#include "BaseImporter.h" +#include #include "BaseProcess.h" #include diff --git a/code/UnrealLoader.cpp b/code/UnrealLoader.cpp index a79a2a5c5..c5d55eb39 100644 --- a/code/UnrealLoader.cpp +++ b/code/UnrealLoader.cpp @@ -52,9 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_3D_IMPORTER #include "UnrealLoader.h" -#include "StreamReader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include +#include #include "ConvertToLHProcess.h" #include diff --git a/code/UnrealLoader.h b/code/UnrealLoader.h index a2ceb3d54..b930fc280 100644 --- a/code/UnrealLoader.h +++ b/code/UnrealLoader.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_3D_LOADER_H #define INCLUDED_AI_3D_LOADER_H -#include "BaseImporter.h" +#include #include namespace Assimp { diff --git a/code/ValidateDataStructure.cpp b/code/ValidateDataStructure.cpp index c036eac18..87ff094fd 100644 --- a/code/ValidateDataStructure.cpp +++ b/code/ValidateDataStructure.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // internal headers #include "ValidateDataStructure.h" -#include "BaseImporter.h" -#include "fast_atof.h" +#include +#include #include "ProcessHelper.h" #include diff --git a/code/X3DExporter.cpp b/code/X3DExporter.cpp index b560855fb..9839e6ca6 100644 --- a/code/X3DExporter.cpp +++ b/code/X3DExporter.cpp @@ -9,8 +9,8 @@ #include "X3DExporter.hpp" // Header files, Assimp. -#include "Exceptional.h" -#include "StringUtils.h" +#include +#include #include #include diff --git a/code/X3DImporter.cpp b/code/X3DImporter.cpp index aaf99b309..3d898757a 100644 --- a/code/X3DImporter.cpp +++ b/code/X3DImporter.cpp @@ -47,11 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "X3DImporter.hpp" #include "X3DImporter_Macro.hpp" -#include "StringUtils.h" +#include // Header files, Assimp. #include -#include "fast_atof.h" +#include #include "FIReader.hpp" // Header files, stdlib. diff --git a/code/X3DImporter.hpp b/code/X3DImporter.hpp index 468db5f3e..db0b5e2fc 100644 --- a/code/X3DImporter.hpp +++ b/code/X3DImporter.hpp @@ -54,8 +54,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "BaseImporter.h" -#include "irrXMLWrapper.h" +#include +#include #include "FIReader.hpp" //#include diff --git a/code/X3DImporter_Geometry3D.cpp b/code/X3DImporter_Geometry3D.cpp index b2e9a28f8..1802967fc 100644 --- a/code/X3DImporter_Geometry3D.cpp +++ b/code/X3DImporter_Geometry3D.cpp @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "X3DImporter_Macro.hpp" // Header files, Assimp. -#include "StandardShapes.h" +#include namespace Assimp { diff --git a/code/X3DImporter_Light.cpp b/code/X3DImporter_Light.cpp index ff450f7a9..d6a0091ed 100644 --- a/code/X3DImporter_Light.cpp +++ b/code/X3DImporter_Light.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "X3DImporter.hpp" #include "X3DImporter_Macro.hpp" -#include "StringUtils.h" +#include namespace Assimp { diff --git a/code/X3DImporter_Postprocess.cpp b/code/X3DImporter_Postprocess.cpp index 390ef8995..65775959c 100644 --- a/code/X3DImporter_Postprocess.cpp +++ b/code/X3DImporter_Postprocess.cpp @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Header files, Assimp. #include -#include "StandardShapes.h" -#include "StringUtils.h" +#include +#include // Header files, stdlib. #include diff --git a/code/XFileExporter.cpp b/code/XFileExporter.cpp index 6407bf738..446aed943 100644 --- a/code/XFileExporter.cpp +++ b/code/XFileExporter.cpp @@ -46,15 +46,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "XFileExporter.h" #include "ConvertToLHProcess.h" -#include "Bitmap.h" -#include "BaseImporter.h" -#include "fast_atof.h" +#include +#include +#include #include #include #include #include #include -#include "Exceptional.h" +#include #include #include #include diff --git a/code/XFileImporter.cpp b/code/XFileImporter.cpp index 00c32dcc2..75be90310 100644 --- a/code/XFileImporter.cpp +++ b/code/XFileImporter.cpp @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "XFileImporter.h" #include "XFileParser.h" -#include "TinyFormatter.h" +#include #include "ConvertToLHProcess.h" #include #include diff --git a/code/XFileImporter.h b/code/XFileImporter.h index 0fa6b52eb..1b591b875 100644 --- a/code/XFileImporter.h +++ b/code/XFileImporter.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "XFileHelper.h" -#include "BaseImporter.h" +#include #include diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp index 1f8b8cbd3..86e749aec 100644 --- a/code/XFileParser.cpp +++ b/code/XFileParser.cpp @@ -47,11 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "XFileParser.h" #include "XFileHelper.h" -#include "fast_atof.h" -#include "Exceptional.h" -#include "TinyFormatter.h" -#include "ByteSwapper.h" -#include "StringUtils.h" +#include +#include +#include +#include +#include #include diff --git a/code/XGLLoader.cpp b/code/XGLLoader.cpp index 809936099..ed9b48f0e 100644 --- a/code/XGLLoader.cpp +++ b/code/XGLLoader.cpp @@ -46,11 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_XGL_IMPORTER #include "XGLLoader.h" -#include "ParsingUtils.h" -#include "fast_atof.h" +#include +#include -#include "StreamReader.h" -#include "MemoryIOWrapper.h" +#include +#include #include #include #include diff --git a/code/XGLLoader.h b/code/XGLLoader.h index 97ae5f8a3..4a30eee94 100644 --- a/code/XGLLoader.h +++ b/code/XGLLoader.h @@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_XGLLOADER_H_INCLUDED #define AI_XGLLOADER_H_INCLUDED -#include "BaseImporter.h" -#include "irrXMLWrapper.h" -#include "LogAux.h" +#include +#include +#include #include #include #include diff --git a/code/glTF2Asset.h b/code/glTF2Asset.h index cece307d9..35c05af9c 100644 --- a/code/glTF2Asset.h +++ b/code/glTF2Asset.h @@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef ASSIMP_API # include # include -# include "ByteSwapper.h" +# include #else # include # define AI_SWAP4(p) @@ -88,7 +88,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # endif #endif -#include "StringUtils.h" +#include namespace glTF2 { diff --git a/code/glTF2Asset.inl b/code/glTF2Asset.inl index 549df747e..c3dbb3540 100644 --- a/code/glTF2Asset.inl +++ b/code/glTF2Asset.inl @@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -#include "StringUtils.h" +#include // Header files, Assimp #include diff --git a/code/glTF2Exporter.cpp b/code/glTF2Exporter.cpp index 22ceb57d2..6e30e2777 100644 --- a/code/glTF2Exporter.cpp +++ b/code/glTF2Exporter.cpp @@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "glTF2Exporter.h" -#include "Exceptional.h" -#include "StringComparison.h" -#include "ByteSwapper.h" +#include +#include +#include #include "SplitLargeMeshes.h" diff --git a/code/glTF2Importer.cpp b/code/glTF2Importer.cpp index 94e5ca3f1..fd4acbacc 100644 --- a/code/glTF2Importer.cpp +++ b/code/glTF2Importer.cpp @@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER #include "glTF2Importer.h" -#include "StringComparison.h" -#include "StringUtils.h" +#include +#include #include #include diff --git a/code/glTF2Importer.h b/code/glTF2Importer.h index 6be7131d1..e6e6067a2 100644 --- a/code/glTF2Importer.h +++ b/code/glTF2Importer.h @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_GLTF2IMPORTER_H_INC #define AI_GLTF2IMPORTER_H_INC -#include "BaseImporter.h" +#include #include struct aiNode; diff --git a/code/glTFAsset.h b/code/glTFAsset.h index e1daf27a2..419e6fb23 100644 --- a/code/glTFAsset.h +++ b/code/glTFAsset.h @@ -66,7 +66,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef ASSIMP_API # include # include -# include "ByteSwapper.h" +# include #else # include # define AI_SWAP4(p) diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl index b01957f3b..e4e7cb361 100644 --- a/code/glTFAsset.inl +++ b/code/glTFAsset.inl @@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -#include "StringUtils.h" +#include #include // Header files, Assimp diff --git a/code/glTFExporter.cpp b/code/glTFExporter.cpp index d88081884..2ab74187d 100644 --- a/code/glTFExporter.cpp +++ b/code/glTFExporter.cpp @@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "glTFExporter.h" -#include "Exceptional.h" -#include "StringComparison.h" -#include "ByteSwapper.h" +#include +#include +#include #include "SplitLargeMeshes.h" diff --git a/code/glTFImporter.cpp b/code/glTFImporter.cpp index 381e459fd..526ccde04 100644 --- a/code/glTFImporter.cpp +++ b/code/glTFImporter.cpp @@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER #include "glTFImporter.h" -#include "StringComparison.h" -#include "StringUtils.h" +#include +#include #include #include diff --git a/code/glTFImporter.h b/code/glTFImporter.h index 46f450f86..2518f9fa4 100644 --- a/code/glTFImporter.h +++ b/code/glTFImporter.h @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_GLTFIMPORTER_H_INC #define AI_GLTFIMPORTER_H_INC -#include "BaseImporter.h" +#include #include struct aiNode; diff --git a/code/makefile.mingw b/code/makefile.mingw index 341642c04..711d57f57 100644 --- a/code/makefile.mingw +++ b/code/makefile.mingw @@ -1,105 +1,105 @@ -### USE OF THIS MAKEFILE IS NOT RECOMMENDED. -### It is no longer maintained. Use CMAKE instead. - -# --------------------------------------------------------------------------- -# Makefile for Open Asset Import Library (MinGW32-make) -# aramis_acg@users.sourceforge.net -# - just a quick'n'dirty one, could be buggy ... -# -# Usage: mingw32-make -f makefile.mingw - -# TARGETS: -# all Build a shared so from the whole library -# clean Cleanup object files, prepare for rebuild -# static Build a static library (*.a) - -# MACROS: (make clean before you change one) -# NOBOOST=1 Build against boost workaround -# SINGLETHREADED=1 Build single-threaded library -# DEBUG=1 Build debug build of library -# -# --------------------------------------------------------------------------- - -# C++ object files -OBJECTS := $(patsubst %.cpp,%.o, $(wildcard *.cpp)) -OBJECTS += $(patsubst %.cpp,%.o, $(wildcard extra/*.cpp)) -OBJECTS += $(patsubst %.cpp,%.o, $(wildcard ./../contrib/irrXML/*.cpp)) - -# C object files -OBJECTSC := $(patsubst %.c,%.oc, $(wildcard ./../contrib/zlib/*.c)) -OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/ConvertUTF/*.c)) -OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/unzip/*.c)) - -# Include flags for gcc -INCLUDEFLAGS = - -# Preprocessor defines for gcc -DEFINEFLAGS = - -# Suffix for the output binary, represents build type -NAMESUFFIX = - -# Output path for binaries -BINPATH = ../bin/mingw/ - -# GCC compiler flags -CPPFLAGS=-Wall - -# Setup environment for noboost build -ifeq ($(NOBOOST),1) - SINGLETHREADED = 1 - INCLUDEFLAGS += -I./BoostWorkaround/ - DEFINEFLAGS += -DASSIMP_BUILD_BOOST_WORKAROUND -# NAMESUFFIX += -noboost -else - # adjust this manually if your boost is stored elsewhere - INCLUDEFLAGS += -I"C:/Program Files/boost/boost_1_38" - #INCLUDEFLAGS += -I"$(BOOST_DIR)" - -endif - -# Setup environment for st build -ifeq ($(SINGLETHREADED),1) - DEFINEFLAGS += -DASSIMP_BUILD_SINGLETHREADED -# NAMESUFFIX += -st -endif - -# Setup environment for debug build -ifeq ($(DEBUG),1) - DEFINEFLAGS += -D_DEBUG -DDEBUG - CPPFLAGS += -g -# NAMESUFFIX += -debug -else - CPPFLAGS += -O2 -s - DEFINEFLAGS += -DNDEBUG -D_NDEBUG -endif - -# Output name of shared library -SHARED_TARGET = $(BINPATH)/libassimp$(NAMESUFFIX).so - -# Output name of static library -STATIC = $(BINPATH)/libassimp$(NAMESUFFIX).a - -# target: all -# usage : build a shared library (*.so) -all: $(SHARED_TARGET) - -$(SHARED_TARGET): $(OBJECTS) $(OBJECTSC) - gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++ -%.o:%.cpp - $(CXX) -c $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) -%.oc:%.c - $(CXX) -x c -c -ansi $(CPPFLAGS) $? -o $@ - -# target: clean -# usage : cleanup all object files, prepare for a rebuild -.PHONY: clean -clean: - -del *.o .\..\contrib\irrXML\*.o .\..\contrib\zlib\*.oc .\..\contrib\unzip\*.oc .\..\contrib\ConvertUTF\*.oc - -# target: static -# usage : build a static library (*.a) -static: $(STATIC) -$(STATIC): $(OBJECTS) $(OBJECTSC) - ar rcs $@ $(OBJECTS) $(OBJECTSC) - +### USE OF THIS MAKEFILE IS NOT RECOMMENDED. +### It is no longer maintained. Use CMAKE instead. + +# --------------------------------------------------------------------------- +# Makefile for Open Asset Import Library (MinGW32-make) +# aramis_acg@users.sourceforge.net +# - just a quick'n'dirty one, could be buggy ... +# +# Usage: mingw32-make -f makefile.mingw + +# TARGETS: +# all Build a shared so from the whole library +# clean Cleanup object files, prepare for rebuild +# static Build a static library (*.a) + +# MACROS: (make clean before you change one) +# NOBOOST=1 Build against boost workaround +# SINGLETHREADED=1 Build single-threaded library +# DEBUG=1 Build debug build of library +# +# --------------------------------------------------------------------------- + +# C++ object files +OBJECTS := $(patsubst %.cpp,%.o, $(wildcard *.cpp)) +OBJECTS += $(patsubst %.cpp,%.o, $(wildcard extra/*.cpp)) +OBJECTS += $(patsubst %.cpp,%.o, $(wildcard ./../contrib/irrXML/*.cpp)) + +# C object files +OBJECTSC := $(patsubst %.c,%.oc, $(wildcard ./../contrib/zlib/*.c)) +OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/ConvertUTF/*.c)) +OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/unzip/*.c)) + +# Include flags for gcc +INCLUDEFLAGS = + +# Preprocessor defines for gcc +DEFINEFLAGS = + +# Suffix for the output binary, represents build type +NAMESUFFIX = + +# Output path for binaries +BINPATH = ../bin/mingw/ + +# GCC compiler flags +CPPFLAGS=-Wall + +# Setup environment for noboost build +ifeq ($(NOBOOST),1) + SINGLETHREADED = 1 + INCLUDEFLAGS += -I./BoostWorkaround/ + DEFINEFLAGS += -DASSIMP_BUILD_BOOST_WORKAROUND +# NAMESUFFIX += -noboost +else + # adjust this manually if your boost is stored elsewhere + INCLUDEFLAGS += -I"C:/Program Files/boost/boost_1_38" + #INCLUDEFLAGS += -I"$(BOOST_DIR)" + +endif + +# Setup environment for st build +ifeq ($(SINGLETHREADED),1) + DEFINEFLAGS += -DASSIMP_BUILD_SINGLETHREADED +# NAMESUFFIX += -st +endif + +# Setup environment for debug build +ifeq ($(DEBUG),1) + DEFINEFLAGS += -D_DEBUG -DDEBUG + CPPFLAGS += -g +# NAMESUFFIX += -debug +else + CPPFLAGS += -O2 -s + DEFINEFLAGS += -DNDEBUG -D_NDEBUG +endif + +# Output name of shared library +SHARED_TARGET = $(BINPATH)/libassimp$(NAMESUFFIX).so + +# Output name of static library +STATIC = $(BINPATH)/libassimp$(NAMESUFFIX).a + +# target: all +# usage : build a shared library (*.so) +all: $(SHARED_TARGET) + +$(SHARED_TARGET): $(OBJECTS) $(OBJECTSC) + gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++ +%.o:%.cpp + $(CXX) -c $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) +%.oc:%.c + $(CXX) -x c -c -ansi $(CPPFLAGS) $? -o $@ + +# target: clean +# usage : cleanup all object files, prepare for a rebuild +.PHONY: clean +clean: + -del *.o .\..\contrib\irrXML\*.o .\..\contrib\zlib\*.oc .\..\contrib\unzip\*.oc .\..\contrib\ConvertUTF\*.oc + +# target: static +# usage : build a static library (*.a) +static: $(STATIC) +$(STATIC): $(OBJECTS) $(OBJECTSC) + ar rcs $@ $(OBJECTS) $(OBJECTSC) + diff --git a/contrib/irrXML/irrXML.cpp b/contrib/irrXML/irrXML.cpp index 42509b5f3..532eed544 100644 --- a/contrib/irrXML/irrXML.cpp +++ b/contrib/irrXML/irrXML.cpp @@ -9,7 +9,7 @@ #include "irrXML.h" #include "irrString.h" #include "irrArray.h" -#include "./../../code/fast_atof.h" +#include #include "CXMLReaderImpl.h" namespace irr diff --git a/code/BaseImporter.h b/include/assimp/BaseImporter.h similarity index 100% rename from code/BaseImporter.h rename to include/assimp/BaseImporter.h diff --git a/code/Bitmap.h b/include/assimp/Bitmap.h similarity index 98% rename from code/Bitmap.h rename to include/assimp/Bitmap.h index 96c994dbe..02b598c49 100644 --- a/code/Bitmap.h +++ b/include/assimp/Bitmap.h @@ -49,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_BITMAP_H_INC #define AI_BITMAP_H_INC +#include "defs.h" #include #include @@ -58,7 +59,7 @@ namespace Assimp { class IOStream; -class Bitmap { +class ASSIMP_API Bitmap { protected: struct Header { diff --git a/code/BlobIOSystem.h b/include/assimp/BlobIOSystem.h similarity index 100% rename from code/BlobIOSystem.h rename to include/assimp/BlobIOSystem.h diff --git a/code/ByteSwapper.h b/include/assimp/ByteSwapper.h similarity index 100% rename from code/ByteSwapper.h rename to include/assimp/ByteSwapper.h diff --git a/code/CreateAnimMesh.h b/include/assimp/CreateAnimMesh.h similarity index 97% rename from code/CreateAnimMesh.h rename to include/assimp/CreateAnimMesh.h index 84cab8932..0115b6baa 100644 --- a/code/CreateAnimMesh.h +++ b/include/assimp/CreateAnimMesh.h @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { /** Create aiAnimMesh from aiMesh. */ -aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh); +ASSIMP_API aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh); } // end of namespace Assimp #endif // INCLUDED_AI_CREATE_ANIM_MESH_H diff --git a/code/Exceptional.h b/include/assimp/Exceptional.h similarity index 100% rename from code/Exceptional.h rename to include/assimp/Exceptional.h diff --git a/code/GenericProperty.h b/include/assimp/GenericProperty.h similarity index 100% rename from code/GenericProperty.h rename to include/assimp/GenericProperty.h diff --git a/code/Hash.h b/include/assimp/Hash.h similarity index 100% rename from code/Hash.h rename to include/assimp/Hash.h diff --git a/code/IOStreamBuffer.h b/include/assimp/IOStreamBuffer.h similarity index 100% rename from code/IOStreamBuffer.h rename to include/assimp/IOStreamBuffer.h diff --git a/code/LineSplitter.h b/include/assimp/LineSplitter.h similarity index 100% rename from code/LineSplitter.h rename to include/assimp/LineSplitter.h diff --git a/code/LogAux.h b/include/assimp/LogAux.h similarity index 100% rename from code/LogAux.h rename to include/assimp/LogAux.h diff --git a/code/Macros.h b/include/assimp/Macros.h similarity index 100% rename from code/Macros.h rename to include/assimp/Macros.h diff --git a/code/MathFunctions.h b/include/assimp/MathFunctions.h similarity index 100% rename from code/MathFunctions.h rename to include/assimp/MathFunctions.h diff --git a/code/MemoryIOWrapper.h b/include/assimp/MemoryIOWrapper.h similarity index 100% rename from code/MemoryIOWrapper.h rename to include/assimp/MemoryIOWrapper.h diff --git a/code/ParsingUtils.h b/include/assimp/ParsingUtils.h similarity index 100% rename from code/ParsingUtils.h rename to include/assimp/ParsingUtils.h diff --git a/code/Profiler.h b/include/assimp/Profiler.h similarity index 100% rename from code/Profiler.h rename to include/assimp/Profiler.h diff --git a/code/RemoveComments.h b/include/assimp/RemoveComments.h similarity index 100% rename from code/RemoveComments.h rename to include/assimp/RemoveComments.h diff --git a/include/assimp/SGSpatialSort.h b/include/assimp/SGSpatialSort.h new file mode 100644 index 000000000..f087ad8b5 --- /dev/null +++ b/include/assimp/SGSpatialSort.h @@ -0,0 +1,141 @@ +/* +Open Asset Import Library (assimp) +---------------------------------------------------------------------- + +Copyright (c) 2006-2017, assimp team + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the +following conditions are met: + +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of the assimp team, nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of the assimp team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---------------------------------------------------------------------- +*/ + +/** Small helper classes to optimize finding vertices close to a given location + */ +#ifndef AI_D3DSSPATIALSORT_H_INC +#define AI_D3DSSPATIALSORT_H_INC + +#include +#include +#include + +namespace Assimp { + +// ---------------------------------------------------------------------------------- +/** Specialized version of SpatialSort to support smoothing groups + * This is used in by the 3DS, ASE and LWO loaders. 3DS and ASE share their + * normal computation code in SmoothingGroups.inl, the LWO loader has its own + * implementation to handle all details of its file format correctly. + */ +// ---------------------------------------------------------------------------------- +class ASSIMP_API SGSpatialSort +{ +public: + + SGSpatialSort(); + + // ------------------------------------------------------------------- + /** Construction from a given face array, handling smoothing groups + * properly + */ + explicit SGSpatialSort(const std::vector& vPositions); + + // ------------------------------------------------------------------- + /** Add a vertex to the spatial sort + * @param vPosition Vertex position to be added + * @param index Index of the vrtex + * @param smoothingGroup SmoothingGroup for this vertex + */ + void Add(const aiVector3D& vPosition, unsigned int index, + unsigned int smoothingGroup); + + // ------------------------------------------------------------------- + /** Prepare the spatial sorter for use. This step runs in O(logn) + */ + void Prepare(); + + /** Destructor */ + ~SGSpatialSort(); + + // ------------------------------------------------------------------- + /** Returns an iterator for all positions close to the given position. + * @param pPosition The position to look for vertices. + * @param pSG Only included vertices with at least one shared smooth group + * @param pRadius Maximal distance from the position a vertex may have + * to be counted in. + * @param poResults The container to store the indices of the found + * positions. Will be emptied by the call so it may contain anything. + * @param exactMatch Specifies whether smoothing groups are bit masks + * (false) or integral values (true). In the latter case, a vertex + * cannot belong to more than one smoothing group. + * @return An iterator to iterate over all vertices in the given area. + */ + // ------------------------------------------------------------------- + void FindPositions( const aiVector3D& pPosition, uint32_t pSG, + float pRadius, std::vector& poResults, + bool exactMatch = false) const; + +protected: + /** Normal of the sorting plane, normalized. The center is always at (0, 0, 0) */ + aiVector3D mPlaneNormal; + + // ------------------------------------------------------------------- + /** An entry in a spatially sorted position array. Consists of a + * vertex index, its position and its precalculated distance from + * the reference plane */ + // ------------------------------------------------------------------- + struct Entry + { + unsigned int mIndex; ///< The vertex referred by this entry + aiVector3D mPosition; ///< Position + uint32_t mSmoothGroups; + float mDistance; ///< Distance of this vertex to the sorting plane + + Entry() { /** intentionally not initialized.*/ } + Entry( unsigned int pIndex, const aiVector3D& pPosition, float pDistance,uint32_t pSG) + : + mIndex( pIndex), + mPosition( pPosition), + mSmoothGroups (pSG), + mDistance( pDistance) + { } + + bool operator < (const Entry& e) const { return mDistance < e.mDistance; } + }; + + // all positions, sorted by distance to the sorting plane + std::vector mPositions; +}; + +} // end of namespace Assimp + +#endif // AI_SPATIALSORT_H_INC diff --git a/code/SkeletonMeshBuilder.h b/include/assimp/SkeletonMeshBuilder.h similarity index 99% rename from code/SkeletonMeshBuilder.h rename to include/assimp/SkeletonMeshBuilder.h index 7a7e7b8ff..cc6731e5c 100644 --- a/code/SkeletonMeshBuilder.h +++ b/include/assimp/SkeletonMeshBuilder.h @@ -64,7 +64,7 @@ namespace Assimp { * the resembles the node hierarchy. This is useful for file formats * that don't carry any mesh data but only animation data. */ -class SkeletonMeshBuilder +class ASSIMP_API SkeletonMeshBuilder { public: diff --git a/code/SmoothingGroups.h b/include/assimp/SmoothingGroups.h similarity index 100% rename from code/SmoothingGroups.h rename to include/assimp/SmoothingGroups.h diff --git a/code/SmoothingGroups.inl b/include/assimp/SmoothingGroups.inl similarity index 99% rename from code/SmoothingGroups.inl rename to include/assimp/SmoothingGroups.inl index 42c500070..84ea4a1b0 100644 --- a/code/SmoothingGroups.inl +++ b/include/assimp/SmoothingGroups.inl @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SMOOTHINGGROUPS_INL_INCLUDED // internal headers -#include "SGSpatialSort.h" +#include // CRT header #include diff --git a/code/SpatialSort.h b/include/assimp/SpatialSort.h similarity index 99% rename from code/SpatialSort.h rename to include/assimp/SpatialSort.h index 36b7a2767..9fdebf025 100644 --- a/code/SpatialSort.h +++ b/include/assimp/SpatialSort.h @@ -57,7 +57,7 @@ namespace Assimp * time, with O(n) worst case complexity when all vertices lay on the plane. The plane is chosen * so that it avoids common planes in usual data sets. */ // ------------------------------------------------------------------------------------------------ -class SpatialSort +class ASSIMP_API SpatialSort { public: diff --git a/code/StandardShapes.h b/include/assimp/StandardShapes.h similarity index 99% rename from code/StandardShapes.h rename to include/assimp/StandardShapes.h index a31de566c..7bea88a94 100644 --- a/code/StandardShapes.h +++ b/include/assimp/StandardShapes.h @@ -56,7 +56,7 @@ namespace Assimp { /** \brief Helper class to generate vertex buffers for standard geometric * shapes, such as cylinders, cones, boxes, spheres, elipsoids ... . */ -class StandardShapes +class ASSIMP_API StandardShapes { // class cannot be instanced StandardShapes() {} diff --git a/code/StreamReader.h b/include/assimp/StreamReader.h similarity index 100% rename from code/StreamReader.h rename to include/assimp/StreamReader.h diff --git a/code/StreamWriter.h b/include/assimp/StreamWriter.h similarity index 100% rename from code/StreamWriter.h rename to include/assimp/StreamWriter.h diff --git a/code/StringComparison.h b/include/assimp/StringComparison.h similarity index 100% rename from code/StringComparison.h rename to include/assimp/StringComparison.h diff --git a/code/StringUtils.h b/include/assimp/StringUtils.h similarity index 100% rename from code/StringUtils.h rename to include/assimp/StringUtils.h diff --git a/code/Subdivision.h b/include/assimp/Subdivision.h similarity index 100% rename from code/Subdivision.h rename to include/assimp/Subdivision.h diff --git a/code/TinyFormatter.h b/include/assimp/TinyFormatter.h similarity index 100% rename from code/TinyFormatter.h rename to include/assimp/TinyFormatter.h diff --git a/code/Vertex.h b/include/assimp/Vertex.h similarity index 100% rename from code/Vertex.h rename to include/assimp/Vertex.h diff --git a/code/XMLTools.h b/include/assimp/XMLTools.h similarity index 100% rename from code/XMLTools.h rename to include/assimp/XMLTools.h diff --git a/code/fast_atof.h b/include/assimp/fast_atof.h similarity index 100% rename from code/fast_atof.h rename to include/assimp/fast_atof.h diff --git a/code/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h similarity index 100% rename from code/irrXMLWrapper.h rename to include/assimp/irrXMLWrapper.h diff --git a/code/qnan.h b/include/assimp/qnan.h similarity index 100% rename from code/qnan.h rename to include/assimp/qnan.h