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

Merge branch 'master' into C4244

pull/2171/head
Kim Kulling 2018-10-07 14:29:39 +02:00 committed by GitHub
parent 0d14cdea2d e45e4dc736
commit c355412348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/3DSHelper.h
View File

@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
namespace D3DS { namespace D3DS {
#include "./../include/assimp/Compiler/pushpack1.h" #include <assimp/Compiler/pushpack1.h>
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** Discreet3DS class: Helper class for loading 3ds files. Defines chunks /** Discreet3DS class: Helper class for loading 3ds files. Defines chunks
@ -363,7 +363,7 @@ struct Texture {
int iUVSrc; int iUVSrc;
}; };
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** Helper structure representing a 3ds material */ /** Helper structure representing a 3ds material */

2
code/FBXDocumentUtil.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef INCLUDED_AI_FBX_DOCUMENT_UTIL_H #ifndef INCLUDED_AI_FBX_DOCUMENT_UTIL_H
#define INCLUDED_AI_FBX_DOCUMENT_UTIL_H #define INCLUDED_AI_FBX_DOCUMENT_UTIL_H
#include "../include/assimp/defs.h" #include <assimp/defs.h>
#include <string> #include <string>
#include <memory> #include <memory>
#include "FBXDocument.h" #include "FBXDocument.h"

4
code/HMPFileData.h
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
namespace HMP { namespace HMP {
#include "./../include/assimp/Compiler/pushpack1.h" #include <assimp/Compiler/pushpack1.h>
#include <stdint.h> #include <stdint.h>
// to make it easier for us, we test the magic word against both "endianesses" // to make it easier for us, we test the magic word against both "endianesses"
@ -131,7 +131,7 @@ struct Vertex_HMP7
int8_t normal_x,normal_y; int8_t normal_x,normal_y;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
} //! namespace HMP } //! namespace HMP
} //! namespace Assimp } //! namespace Assimp

4
code/HalfLifeFileData.h
View File

@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MDLFILEHELPER2_H_INC #ifndef AI_MDLFILEHELPER2_H_INC
#define AI_MDLFILEHELPER2_H_INC #define AI_MDLFILEHELPER2_H_INC
#include "./../include/assimp/Compiler/pushpack1.h" #include <assimp/Compiler/pushpack1.h>
namespace Assimp { namespace Assimp {
namespace MDL { namespace MDL {
@ -141,7 +141,7 @@ struct Header_HL2 {
int32_t transitionindex; int32_t transitionindex;
} /* PACK_STRUCT */; } /* PACK_STRUCT */;
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
} }
} // end namespaces } // end namespaces

2
code/Importer/IFC/IFCReaderGen_4.cpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_IFC_IMPORTER #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
#include "AssimpPCH.h" #include "AssimpPCH.h"
#include "IFCReaderGen4.h" #include "IFCReaderGen_4.h"
namespace Assimp { namespace Assimp {
using namespace IFC; using namespace IFC;

2
code/MD3FileData.h
View File

@ -246,7 +246,7 @@ struct Vertex
uint16_t NORMAL; uint16_t NORMAL;
} /*PACK_STRUCT*/; } /*PACK_STRUCT*/;
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
/** @brief Unpack a Q3 16 bit vector to its full float3 representation /** @brief Unpack a Q3 16 bit vector to its full float3 representation

6
code/MD4FileData.h
View File

@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include "../include/assimp/types.h" #include <assimp/types.h>
#include "../include/assimp/mesh.h" #include <assimp/mesh.h>
#include "../include/assimp/anim.h" #include <assimp/anim.h>
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
# pragma pack(push,1) # pragma pack(push,1)

2
code/MDLFileData.h
View File

@ -709,7 +709,7 @@ struct GroupFrame
SimpleFrame *frames; SimpleFrame *frames;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
/** \struct IntFace_MDL7 /** \struct IntFace_MDL7

4
code/glTF2Asset.h
View File

@ -170,7 +170,7 @@ namespace glTF2
#include <assimp/pbrmaterial.h> #include <assimp/pbrmaterial.h>
#ifdef ASSIMP_API #ifdef ASSIMP_API
#include "./../include/assimp/Compiler/pushpack1.h" #include <assimp/Compiler/pushpack1.h>
#endif #endif
//! For binary .glb files //! For binary .glb files
@ -189,7 +189,7 @@ namespace glTF2
} PACK_STRUCT; } PACK_STRUCT;
#ifdef ASSIMP_API #ifdef ASSIMP_API
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
#endif #endif

4
code/glTFAsset.h
View File

@ -170,7 +170,7 @@ namespace glTF
#define AI_GLB_MAGIC_NUMBER "glTF" #define AI_GLB_MAGIC_NUMBER "glTF"
#ifdef ASSIMP_API #ifdef ASSIMP_API
#include "./../include/assimp/Compiler/pushpack1.h" #include <assimp/Compiler/pushpack1.h>
#endif #endif
//! For the KHR_binary_glTF extension (binary .glb file) //! For the KHR_binary_glTF extension (binary .glb file)
@ -185,7 +185,7 @@ namespace glTF
} PACK_STRUCT; } PACK_STRUCT;
#ifdef ASSIMP_API #ifdef ASSIMP_API
#include "./../include/assimp/Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
#endif #endif

2
include/assimp/irrXMLWrapper.h
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// some long includes .... // some long includes ....
#include <irrXML.h> #include <irrXML.h>
#include "./../include/assimp/IOStream.hpp" #include "IOStream.hpp"
#include "BaseImporter.h" #include "BaseImporter.h"
#include <vector> #include <vector>