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

- move include/ to include/assimp/ to have consistent header locations between installed and trunk version. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
aramis_acg 2012-02-03 16:25:12 +00:00
parent 4dbf539b44
commit 075b1acaf0
124 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/3DSHelper.h
View File

@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
namespace D3DS { namespace D3DS {
#include "./../include/Compiler/pushpack1.h" #include "./../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
@ -352,7 +352,7 @@ struct Texture
int iUVSrc; int iUVSrc;
}; };
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** Helper structure representing a 3ds material */ /** Helper structure representing a 3ds material */

2
code/3DSLoader.h
View File

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

2
code/ACLoader.h
View File

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

2
code/ASELoader.h
View File

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

6
code/ASEParser.h
View File

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

2
code/Assimp.cpp
View File

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

2
code/AssimpPCH.cpp
View File

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

16
code/AssimpPCH.h
View File

@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ, * using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ,
* they won't affect the public API. * they won't affect the public API.
*/ */
#include "../include/aiDefines.h" #include "../include/assimp/aiDefines.h"
// Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw // Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
#if defined( _MSC_VER) && (_MSC_VER < 1600) #if defined( _MSC_VER) && (_MSC_VER < 1600)
@ -132,13 +132,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
// Public ASSIMP headers // Public ASSIMP headers
#include "../include/DefaultLogger.h" #include "../include/assimp/DefaultLogger.h"
#include "../include/IOStream.h" #include "../include/assimp/IOStream.h"
#include "../include/IOSystem.h" #include "../include/assimp/IOSystem.h"
#include "../include/aiScene.h" #include "../include/assimp/aiScene.h"
#include "../include/aiPostProcess.h" #include "../include/assimp/aiPostProcess.h"
#include "../include/assimp.hpp" #include "../include/assimp/assimp.hpp"
#include "../include/export.hpp" #include "../include/assimp/export.hpp"
// Internal utility headers // Internal utility headers
#include "BaseImporter.h" #include "BaseImporter.h"

6
code/B3DImporter.h
View File

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

2
code/BaseImporter.h
View File

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

2
code/BaseProcess.h
View File

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

4
code/ByteSwap.h
View File

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

2
code/CInterfaceIOWrapper.h
View File

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

2
code/CMakeLists.txt
View File

@ -8,7 +8,7 @@ SET( LIBRARY_SOVERSION "2" )
# 3) Add libassimp using the file lists (eliminates duplication of file names between # 3) Add libassimp using the file lists (eliminates duplication of file names between
# source groups and library command) # source groups and library command)
# #
SET( HEADER_PATH ../include ) SET( HEADER_PATH ../include/assimp )
SET( COMPILER_HEADERS SET( COMPILER_HEADERS
${HEADER_PATH}/Compiler/pushpack1.h ${HEADER_PATH}/Compiler/pushpack1.h

2
code/ColladaExporter.h
View File

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

2
code/ColladaLoader.cpp
View File

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

2
code/ComputeUVMappingProcess.h
View File

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

2
code/ConvertToLHProcess.h
View File

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

4
code/DeboneProcess.h
View File

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

2
code/DefaultIOStream.h
View File

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

2
code/DefaultIOSystem.h
View File

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

2
code/DefaultProgressHandler.h
View File

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

4
code/FileLogStream.h
View File

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

2
code/FileSystemFilter.h
View File

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

2
code/FindDegenerates.h
View File

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

2
code/FindInvalidDataProcess.h
View File

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

2
code/GenFaceNormalsProcess.h
View File

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

2
code/GenVertexNormalsProcess.h
View File

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

2
code/GenericProperty.h
View File

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

4
code/HMPFileData.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
namespace HMP { namespace HMP {
#include "./../include/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.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"
#define AI_HMP_MAGIC_NUMBER_BE_4 AI_MAKE_MAGIC("HMP4") #define AI_HMP_MAGIC_NUMBER_BE_4 AI_MAKE_MAGIC("HMP4")
@ -128,7 +128,7 @@ struct Vertex_HMP7
int8_t normal_x,normal_y; int8_t normal_x,normal_y;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
} //! namespace HMP } //! namespace HMP
} //! namespace Assimp } //! namespace Assimp

6
code/HMPLoader.h
View File

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

4
code/HalfLifeFileData.h
View File

@ -49,7 +49,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/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"
#include "MDLFileData.h" #include "MDLFileData.h"
@ -142,7 +142,7 @@ struct Header_HL2
int32_t transitionindex; int32_t transitionindex;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
} }
} // end namespaces } // end namespaces

4
code/IFF.h
View File

@ -12,7 +12,7 @@
namespace Assimp { namespace Assimp {
namespace IFF { namespace IFF {
#include "./../include/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
//! Describes an IFF chunk header //! Describes an IFF chunk header
@ -39,7 +39,7 @@ struct SubChunkHeader
uint16_t length; uint16_t length;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
#define AI_IFF_FOURCC(a,b,c,d) ((uint32_t) (((uint8_t)a << 24u) | \ #define AI_IFF_FOURCC(a,b,c,d) ((uint32_t) (((uint8_t)a << 24u) | \

2
code/Importer.cpp
View File

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

2
code/ImproveCacheLocality.h
View File

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

2
code/JoinVerticesProcess.h
View File

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

2
code/LWOFileData.h
View File

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

4
code/LWOLoader.h
View File

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

10
code/MD2FileData.h
View File

@ -45,11 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MD2FILEHELPER_H_INC #ifndef AI_MD2FILEHELPER_H_INC
#define AI_MD2FILEHELPER_H_INC #define AI_MD2FILEHELPER_H_INC
#include "../include/aiTypes.h" #include "../include/assimp/aiTypes.h"
#include "../include/aiMesh.h" #include "../include/assimp/aiMesh.h"
#include "../include/aiAnim.h" #include "../include/assimp/aiAnim.h"
#include "./../include/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"
namespace Assimp { namespace Assimp {
namespace MD2 { namespace MD2 {
@ -146,7 +146,7 @@ struct Skin
char name[AI_MD2_MAXQPATH]; /* texture file name */ char name[AI_MD2_MAXQPATH]; /* texture file name */
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

2
code/MD2Loader.h
View File

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

10
code/MD3FileData.h
View File

@ -50,11 +50,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include "../include/aiTypes.h" #include "../include/assimp/aiTypes.h"
#include "../include/aiMesh.h" #include "../include/assimp/aiMesh.h"
#include "../include/aiAnim.h" #include "../include/assimp/aiAnim.h"
#include "./../include/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"
namespace Assimp { namespace Assimp {
namespace MD3 { namespace MD3 {
@ -246,7 +246,7 @@ struct Vertex
uint16_t NORMAL; uint16_t NORMAL;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../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

2
code/MD3Loader.h
View File

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

2
code/MD5Loader.h
View File

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

2
code/MD5Parser.h
View File

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

10
code/MDCFileData.h
View File

@ -49,11 +49,11 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
#ifndef AI_MDCFILEHELPER_H_INC #ifndef AI_MDCFILEHELPER_H_INC
#define AI_MDCFILEHELPER_H_INC #define AI_MDCFILEHELPER_H_INC
#include "../include/aiTypes.h" #include "../include/assimp/aiTypes.h"
#include "../include/aiMesh.h" #include "../include/assimp/aiMesh.h"
#include "../include/aiAnim.h" #include "../include/assimp/aiAnim.h"
#include "./../include/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"
namespace Assimp { namespace Assimp {
@ -183,7 +183,7 @@ struct Shader
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

2
code/MDCLoader.h
View File

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

4
code/MDLFileData.h
View File

@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MDLFILEHELPER_H_INC #ifndef AI_MDLFILEHELPER_H_INC
#define AI_MDLFILEHELPER_H_INC #define AI_MDLFILEHELPER_H_INC
#include "./../include/Compiler/pushpack1.h" #include "./../include/assimp/Compiler/pushpack1.h"
namespace Assimp { namespace Assimp {
namespace MDL { namespace MDL {
@ -724,7 +724,7 @@ struct GroupFrame
SimpleFrame *frames; SimpleFrame *frames;
} PACK_STRUCT; } PACK_STRUCT;
#include "./../include/Compiler/poppack1.h" #include "./../include/assimp/Compiler/poppack1.h"
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
/** \struct IntFace_MDL7 /** \struct IntFace_MDL7

2
code/NFFLoader.h
View File

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

2
code/OFFLoader.h
View File

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

2
code/ObjExporter.cpp
View File

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

4
code/ObjFileData.h
View File

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

2
code/ObjFileParser.cpp
View File

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

2
code/OptimizeGraph.h
View File

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

2
code/OptimizeMeshes.h
View File

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

2
code/PlyLoader.h
View File

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

2
code/PretransformVertices.h
View File

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

2
code/ProcessHelper.h
View File

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

2
code/Profiler.h
View File

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

4
code/Q3BSPFileImporter.cpp
View File

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

4
code/Q3BSPZipArchive.h
View File

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

2
code/Q3DLoader.h
View File

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

2
code/RawLoader.h
View File

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

2
code/RemoveComments.h
View File

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

2
code/RemoveRedundantMaterials.h
View File

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

2
code/RemoveVCProcess.h
View File

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

2
code/SGSpatialSort.h
View File

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

8
code/SMDLoader.h
View File

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

2
code/STLExporter.cpp
View File

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

2
code/STLLoader.h
View File

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

2
code/SceneCombiner.h
View File

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

2
code/SkeletonMeshBuilder.cpp
View File

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

2
code/SkeletonMeshBuilder.h
View File

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

2
code/SortByPTypeProcess.h
View File

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

2
code/SpatialSort.h
View File

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

4
code/SplitByBoneCountProcess.h
View File

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

4
code/SplitLargeMeshes.h
View File

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

2
code/StdOStreamLogStream.h
View File

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

2
code/ValidateDataStructure.h
View File

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

4
code/VertexTriangleAdjacency.h
View File

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

2
code/Win32DebugLogStream.h
View File

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

8
code/XFileHelper.h
View File

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

2
code/XFileImporter.h
View File

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

2
code/XFileParser.h
View File

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

2
code/irrXMLWrapper.h
View File

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

0
include/Compiler/poppack1.h → include/assimp/Compiler/poppack1.h
View File

0
include/Compiler/pushpack1.h → include/assimp/Compiler/pushpack1.h
View File

0
include/DefaultLogger.h → include/assimp/DefaultLogger.h
View File

0
include/IOStream.h → include/assimp/IOStream.h
View File

0
include/IOSystem.h → include/assimp/IOSystem.h
View File

0
include/LogStream.h → include/assimp/LogStream.h
View File

0
include/Logger.h → include/assimp/Logger.h
View File

0
include/NullLogger.h → include/assimp/NullLogger.h
View File

0
include/ProgressHandler.h → include/assimp/ProgressHandler.h
View File

0
include/aiAnim.h → include/assimp/aiAnim.h
View File

0
include/aiAssert.h → include/assimp/aiAssert.h
View File

0
include/aiCamera.h → include/assimp/aiCamera.h
View File

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

0
include/aiColor4D.inl → include/assimp/aiColor4D.inl
View File

0
include/aiConfig.h → include/assimp/aiConfig.h
View File

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

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