From d4b0cd53ea9cfe20bb809c2bf440ea5f98597f14 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 14:55:20 +0200 Subject: [PATCH 01/13] Replaced "../Include/" include from FBXDocumentUtil.h --- code/FBXDocumentUtil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/FBXDocumentUtil.h b/code/FBXDocumentUtil.h index acc8c4a5c..c0435a663 100644 --- a/code/FBXDocumentUtil.h +++ b/code/FBXDocumentUtil.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_FBX_DOCUMENT_UTIL_H #define INCLUDED_AI_FBX_DOCUMENT_UTIL_H -#include "../include/assimp/defs.h" +#include #include #include #include "FBXDocument.h" From 531f30302f52a813f33fa27a03c4bc188c0341ee Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 14:58:06 +0200 Subject: [PATCH 02/13] Replaced "../Include/" include from 3DSHelper.h --- code/3DSHelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/3DSHelper.h b/code/3DSHelper.h index a904abb20..6acc192de 100644 --- a/code/3DSHelper.h +++ b/code/3DSHelper.h @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { namespace D3DS { -#include "./../include/assimp/Compiler/pushpack1.h" +#include // --------------------------------------------------------------------------- /** Discreet3DS class: Helper class for loading 3ds files. Defines chunks From d9a7ed19a8ace623ef5e20fdc481d1e62eeb7955 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 14:59:20 +0200 Subject: [PATCH 03/13] Replaced "../Include/" include from 3DSHelper.h --- code/3DSHelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/3DSHelper.h b/code/3DSHelper.h index 6acc192de..d67a7c14c 100644 --- a/code/3DSHelper.h +++ b/code/3DSHelper.h @@ -363,7 +363,7 @@ struct Texture { int iUVSrc; }; -#include "./../include/assimp/Compiler/poppack1.h" +#include // --------------------------------------------------------------------------- /** Helper structure representing a 3ds material */ From 99fc989af7024ac3f5edfa7d44ebf6a8ad413041 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:01:42 +0200 Subject: [PATCH 04/13] Replaced "../Include/" include from MDLFileData.h --- code/MDLFileData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/MDLFileData.h b/code/MDLFileData.h index 1215b2a80..f9be6761b 100644 --- a/code/MDLFileData.h +++ b/code/MDLFileData.h @@ -709,7 +709,7 @@ struct GroupFrame SimpleFrame *frames; } PACK_STRUCT; -#include "./../include/assimp/Compiler/poppack1.h" +#include // ------------------------------------------------------------------------------------- /** \struct IntFace_MDL7 From 463a7e80167f2a572a2661757a3aaffd3f426664 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:02:58 +0200 Subject: [PATCH 05/13] Replaced "../Include/" include from MD3FileData.h --- code/MD3FileData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/MD3FileData.h b/code/MD3FileData.h index 3f9741366..910813fc4 100644 --- a/code/MD3FileData.h +++ b/code/MD3FileData.h @@ -246,7 +246,7 @@ struct Vertex uint16_t NORMAL; } /*PACK_STRUCT*/; -#include "./../include/assimp/Compiler/poppack1.h" +#include // ------------------------------------------------------------------------------- /** @brief Unpack a Q3 16 bit vector to its full float3 representation From 91a805a082e5e1287184d571769226b10eb8a709 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:05:18 +0200 Subject: [PATCH 06/13] Update HalfLifeFileData.h --- code/HalfLifeFileData.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/HalfLifeFileData.h b/code/HalfLifeFileData.h index 930980c80..7c55657d4 100644 --- a/code/HalfLifeFileData.h +++ b/code/HalfLifeFileData.h @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_MDLFILEHELPER2_H_INC #define AI_MDLFILEHELPER2_H_INC -#include "./../include/assimp/Compiler/pushpack1.h" +#include namespace Assimp { namespace MDL { @@ -141,7 +141,7 @@ struct Header_HL2 { int32_t transitionindex; } /* PACK_STRUCT */; -#include "./../include/assimp/Compiler/poppack1.h" +#include } } // end namespaces From 8bb4b57d1d7f4fb77fbc8b6a818a9fd13347b05c Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:11:47 +0200 Subject: [PATCH 07/13] Replaced "../Include/" include from HMPFileData.h --- code/HMPFileData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/HMPFileData.h b/code/HMPFileData.h index a8ad2deb0..08e8b3be3 100644 --- a/code/HMPFileData.h +++ b/code/HMPFileData.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { namespace HMP { -#include "./../include/assimp/Compiler/pushpack1.h" +#include #include // to make it easier for us, we test the magic word against both "endianesses" From d7bcd581748a29d6d0aee4b61af925b59c97c0b9 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:15:43 +0200 Subject: [PATCH 08/13] Replaced "../Include/" include from MD4FileData.h --- code/MD4FileData.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/MD4FileData.h b/code/MD4FileData.h index e515808ac..ed3dc65e7 100644 --- a/code/MD4FileData.h +++ b/code/MD4FileData.h @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) # pragma pack(push,1) From 7061493ead4abb250e418ff944a8a9cd158b7361 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:16:40 +0200 Subject: [PATCH 09/13] Replaced "../Include/" include from HMPFileData.h --- code/HMPFileData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/HMPFileData.h b/code/HMPFileData.h index 08e8b3be3..962f2f9c7 100644 --- a/code/HMPFileData.h +++ b/code/HMPFileData.h @@ -131,7 +131,7 @@ struct Vertex_HMP7 int8_t normal_x,normal_y; } PACK_STRUCT; -#include "./../include/assimp/Compiler/poppack1.h" +#include } //! namespace HMP } //! namespace Assimp From 47fcbfd3695f0ce2cd9f2e238c240c7a2f591f1b Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:19:56 +0200 Subject: [PATCH 10/13] Replaced "../Include/" include from glTF2Asset.h --- code/glTF2Asset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/glTF2Asset.h b/code/glTF2Asset.h index d1a70ae0a..0def5b74d 100644 --- a/code/glTF2Asset.h +++ b/code/glTF2Asset.h @@ -170,7 +170,7 @@ namespace glTF2 #include #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/pushpack1.h" + #include #endif //! For binary .glb files @@ -189,7 +189,7 @@ namespace glTF2 } PACK_STRUCT; #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/poppack1.h" + #include #endif From 88c173a6f474ae9b8363d50a21bcb186a6e7c9f9 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:20:28 +0200 Subject: [PATCH 11/13] Replaced "../Include/" include from glTFAsset.h --- code/glTFAsset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/glTFAsset.h b/code/glTFAsset.h index bc79f72ec..b04692901 100644 --- a/code/glTFAsset.h +++ b/code/glTFAsset.h @@ -170,7 +170,7 @@ namespace glTF #define AI_GLB_MAGIC_NUMBER "glTF" #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/pushpack1.h" + #include #endif //! For the KHR_binary_glTF extension (binary .glb file) @@ -185,7 +185,7 @@ namespace glTF } PACK_STRUCT; #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/poppack1.h" + #include #endif From 716205fde007f1255326aacd2e111e319ac8d7b9 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 15:22:10 +0200 Subject: [PATCH 12/13] Replaced "../Include/" include from irrXMLWrapper.h --- include/assimp/irrXMLWrapper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h index 70b20ebd3..296f26a32 100644 --- a/include/assimp/irrXMLWrapper.h +++ b/include/assimp/irrXMLWrapper.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // some long includes .... #include -#include "./../include/assimp/IOStream.hpp" +#include "IOStream.hpp" #include "BaseImporter.h" #include From 239c59d71508e32e9f1d98ff788f06748cb36808 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 16:12:58 +0200 Subject: [PATCH 13/13] Fixed include: IFCReaderGen_4 instead of IFCReaderGen4 --- code/Importer/IFC/IFCReaderGen_4.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Importer/IFC/IFCReaderGen_4.cpp b/code/Importer/IFC/IFCReaderGen_4.cpp index 7a312e691..fdefedb18 100644 --- a/code/Importer/IFC/IFCReaderGen_4.cpp +++ b/code/Importer/IFC/IFCReaderGen_4.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER #include "AssimpPCH.h" -#include "IFCReaderGen4.h" +#include "IFCReaderGen_4.h" namespace Assimp { using namespace IFC;