Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- unify naming of all header files. Obviously, this is a breaking change that affects all users.

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2012-02-03 17:04:06 +00:00
parent f07901df9d
commit 6fa251c2f2
138 changed files with 333 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
struct aiNode;
#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 "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
struct aiNode;
#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>
// public ASSIMP headers
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/anim.h"
// for some helper routines like IsSpace()
#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 "../include/assimp/assimp.h"
#include "../include/assimp/cimport.h"
#include "GenericProperty.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.
#include "AssimpPCH.h"
#include "./../include/assimp/aiVersion.h"
#include "./../include/assimp/version.h"
// --------------------------------------------------------------------------------
// Legal information string - dont't remove this.

20
code/AssimpPCH.h
View File

@@ -48,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ASSIMP_INTERNAL_BUILD
// ----------------------------------------------------------------------------------------
/* General compile config taken from aiDefines.h. It is important that the user compiles
* using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ,
/* General compile config taken from defs.h. It is important that the user compiles
* using exactly the same settings in defs.h. Settings in AssimpPCH.h may differ,
* they won't affect the public API.
*/
#include "../include/assimp/aiDefines.h"
#include "../include/assimp/defs.h"
// Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
#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>
// Public ASSIMP headers
#include "../include/assimp/DefaultLogger.h"
#include "../include/assimp/IOStream.h"
#include "../include/assimp/IOSystem.h"
#include "../include/assimp/aiScene.h"
#include "../include/assimp/aiPostProcess.h"
#include "../include/assimp/assimp.hpp"
#include "../include/assimp/export.hpp"
#include "../include/assimp/DefaultLogger.hpp"
#include "../include/assimp/IOStream.hpp"
#include "../include/assimp/IOSystem.hpp"
#include "../include/assimp/scene.h"
#include "../include/assimp/postprocess.h"
#include "../include/assimp/Importer.hpp"
#include "../include/assimp/Exporter.hpp"
// Internal utility headers
#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
#define AI_B3DIMPORTER_H_INC
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiMaterial.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/material.h"
#include <string>
#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 <map>
#include <vector>
#include "./../include/assimp/aiTypes.h"
#include "./../include/assimp/types.h"
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 "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "GenericProperty.h"
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
#define AI_BYTESWAP_H_INC
#include "../include/assimp/aiAssert.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/assert.h"
#include "../include/assimp/types.h"
#if _MSC_VER >= 1400
#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
#define AI_CIOSYSTEM_H_INCLUDED
#include "../include/assimp/aiFileIO.h"
#include "../include/assimp/cfileio.h"
namespace Assimp {

86
code/CMakeLists.txt
View File

@@ -18,44 +18,44 @@ SET( COMPILER_HEADERS
SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
SET( PUBLIC_HEADERS
${HEADER_PATH}/aiAnim.h
${HEADER_PATH}/aiAssert.h
${HEADER_PATH}/aiCamera.h
${HEADER_PATH}/aiColor4D.h
${HEADER_PATH}/aiColor4D.inl
${HEADER_PATH}/aiConfig.h
${HEADER_PATH}/aiDefines.h
${HEADER_PATH}/aiFileIO.h
${HEADER_PATH}/aiLight.h
${HEADER_PATH}/aiMaterial.h
${HEADER_PATH}/aiMaterial.inl
${HEADER_PATH}/aiMatrix3x3.h
${HEADER_PATH}/aiMatrix3x3.inl
${HEADER_PATH}/aiMatrix4x4.h
${HEADER_PATH}/aiMatrix4x4.inl
${HEADER_PATH}/aiMesh.h
${HEADER_PATH}/aiPostProcess.h
${HEADER_PATH}/aiQuaternion.h
${HEADER_PATH}/aiQuaternion.inl
${HEADER_PATH}/aiScene.h
${HEADER_PATH}/aiTexture.h
${HEADER_PATH}/aiTypes.h
${HEADER_PATH}/aiVector2D.h
${HEADER_PATH}/aiVector2D.inl
${HEADER_PATH}/aiVector3D.h
${HEADER_PATH}/aiVector3D.inl
${HEADER_PATH}/aiVersion.h
${HEADER_PATH}/assimp.h
${HEADER_PATH}/assimp.hpp
${HEADER_PATH}/DefaultLogger.h
${HEADER_PATH}/ProgressHandler.h
${HEADER_PATH}/IOStream.h
${HEADER_PATH}/IOSystem.h
${HEADER_PATH}/Logger.h
${HEADER_PATH}/LogStream.h
${HEADER_PATH}/NullLogger.h
${HEADER_PATH}/export.h
${HEADER_PATH}/export.hpp
${HEADER_PATH}/anim.h
${HEADER_PATH}/assert.h
${HEADER_PATH}/camera.h
${HEADER_PATH}/color4.h
${HEADER_PATH}/color4.inl
${HEADER_PATH}/config.h
${HEADER_PATH}/defs.h
${HEADER_PATH}/cfileio.h
${HEADER_PATH}/light.h
${HEADER_PATH}/material.h
${HEADER_PATH}/material.inl
${HEADER_PATH}/matrix3x3.h
${HEADER_PATH}/matrix3x3.inl
${HEADER_PATH}/matrix4x4.h
${HEADER_PATH}/matrix4x4.inl
${HEADER_PATH}/mesh.h
${HEADER_PATH}/postprocess.h
${HEADER_PATH}/quaternion.h
${HEADER_PATH}/quaternion.inl
${HEADER_PATH}/scene.h
${HEADER_PATH}/texture.h
${HEADER_PATH}/types.h
${HEADER_PATH}/vector2.h
${HEADER_PATH}/vector2.inl
${HEADER_PATH}/vector3.h
${HEADER_PATH}/vector3.inl
${HEADER_PATH}/version.h
${HEADER_PATH}/cimport.h
${HEADER_PATH}/Importer.hpp
${HEADER_PATH}/DefaultLogger.hpp
${HEADER_PATH}/ProgressHandler.hpp
${HEADER_PATH}/IOStream.hpp
${HEADER_PATH}/IOSystem.hpp
${HEADER_PATH}/Logger.hpp
${HEADER_PATH}/LogStream.hpp
${HEADER_PATH}/NullLogger.hpp
${HEADER_PATH}/cexport.h
${HEADER_PATH}/Exporter.hpp
)
SET( Core_SRCS
@@ -79,11 +79,11 @@ SET( Boost_SRCS
SOURCE_GROUP(Boost FILES ${Boost_SRCS})
SET( Logging_SRCS
${HEADER_PATH}/DefaultLogger.h
${HEADER_PATH}/IOStream.h
${HEADER_PATH}/LogStream.h
${HEADER_PATH}/Logger.h
${HEADER_PATH}/NullLogger.h
${HEADER_PATH}/DefaultLogger.hpp
${HEADER_PATH}/IOStream.hpp
${HEADER_PATH}/LogStream.hpp
${HEADER_PATH}/Logger.hpp
${HEADER_PATH}/NullLogger.hpp
Win32DebugLogStream.h
DefaultLogger.cpp
FileLogStream.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
#define AI_COLLADAEXPORTER_H_INC
#include "../include/assimp/aiAssert.h"
#include "../include/assimp/assert.h"
#include <sstream>
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"
#ifndef ASSIMP_BUILD_NO_DAE_IMPORTER
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/anim.h"
#include "ColladaLoader.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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
class ComputeUVMappingTest;
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
#define AI_CONVERTTOLHPROCESS_H_INC
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "BaseProcess.h"
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 "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiScene.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/scene.h"
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
#include <stdio.h>
#include "../include/assimp/IOStream.h"
#include "../include/assimp/IOStream.hpp"
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
#define AI_DEFAULTIOSYSTEM_H_INC
#include "../include/assimp/IOSystem.h"
#include "../include/assimp/IOSystem.hpp"
namespace Assimp {

4
code/DefaultProgressHandler.h
View File

@@ -38,13 +38,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------
*/
/** @file ProgressHandler.h
/** @file ProgressHandler.hpp
* @brief Abstract base class 'ProgressHandler'.
*/
#ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
#define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
#include "../include/assimp/ProgressHandler.h"
#include "../include/assimp/ProgressHandler.hpp"
namespace Assimp {
// ------------------------------------------------------------------------------------

4
code/FileLogStream.h
View File

@@ -1,8 +1,8 @@
#ifndef ASSIMP_FILELOGSTREAM_H_INC
#define ASSIMP_FILELOGSTREAM_H_INC
#include "../include/assimp/LogStream.h"
#include "../include/assimp/IOStream.h"
#include "../include/assimp/LogStream.hpp"
#include "../include/assimp/IOStream.hpp"
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
#define AI_FILESYSTEMFILTER_H_INC
#include "../include/assimp/IOSystem.h"
#include "../include/assimp/IOSystem.hpp"
#include "fast_atof.h"
#include "ParsingUtils.h"
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
class FindDegeneratesProcessTest;
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
#include "BaseProcess.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
struct aiMesh;
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
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
#define AI_GENERIC_PROPERTY_H_INCLUDED
#include "./../include/assimp/assimp.hpp"
#include "./../include/assimp/Importer.hpp"
#include "Hash.h"
// ------------------------------------------------------------------------------------------------

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
// public ASSIMP headers
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiTexture.h"
#include "../include/assimp/aiMaterial.h"
#include "../include/assimp/types.h"
#include "../include/assimp/texture.h"
#include "../include/assimp/material.h"
// internal headers
#include "BaseImporter.h"

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 "../include/assimp/aiVersion.h"
#include "../include/assimp/version.h"
// ------------------------------------------------------------------------------------------------
/* 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
#include "BaseProcess.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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
#include "BaseProcess.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
namespace Assimp
{

2
code/LWOFileData.h
View File

@@ -52,7 +52,7 @@ The chunks are taken from the official LightWave SDK headers.
#include <list>
// public ASSIMP headers
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
// internal headers
#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
#define AI_LWOLOADER_H_INCLUDED
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/DefaultLogger.h"
#include "../include/assimp/types.h"
#include "../include/assimp/DefaultLogger.hpp"
#include "LWOFileData.h"
#include "BaseImporter.h"

6
code/MD2FileData.h
View File

@@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_MD2FILEHELPER_H_INC
#define AI_MD2FILEHELPER_H_INC
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/anim.h"
#include "./../include/assimp/Compiler/pushpack1.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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
struct aiNode;
#include "MD2FileData.h"

6
code/MD3FileData.h
View File

@@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector>
#include <sstream>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/anim.h"
#include "./../include/assimp/Compiler/pushpack1.h"

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 "ByteSwap.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "MD3FileData.h"
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 "MD5Parser.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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
#define AI_MD5PARSER_H_INCLUDED
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "ParsingUtils.h"
struct aiFace;

6
code/MDCFileData.h
View File

@@ -49,9 +49,9 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
#ifndef AI_MDCFILEHELPER_H_INC
#define AI_MDCFILEHELPER_H_INC
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/anim.h"
#include "./../include/assimp/Compiler/pushpack1.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
#define AI_MDCLOADER_H_INCLUDED
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "BaseImporter.h"
#include "MDCFileData.h"

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 <vector>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include <vector>
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
#include "ObjExporter.h"
#include "../include/assimp/aiVersion.h"
#include "../include/assimp/version.h"
using 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 <map>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
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 "ObjFileData.h"
#include "ParsingUtils.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "DefaultIOSystem.h"
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 "ProcessHelper.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
struct aiMesh;
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
#include "BaseProcess.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
struct aiMesh;
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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
class PretransformVerticesTest;
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
#define AI_PROCESS_HELPER_H_INCLUDED
#include "../include/assimp/aiPostProcess.h"
#include "../include/assimp/postprocess.h"
#include "SpatialSort.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 "../include/assimp/DefaultLogger.h"
#include "../include/assimp/DefaultLogger.hpp"
#include "TinyFormatter.h"
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"
#endif
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/types.h"
#include "../include/assimp/mesh.h"
#include <vector>
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
#include "../contrib/unzip/unzip.h"
#include "../include/assimp/IOStream.h"
#include "../include/assimp/IOSystem.h"
#include "../include/assimp/IOStream.hpp"
#include "../include/assimp/IOSystem.hpp"
#include <string>
#include <vector>
#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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include <vector>
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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include <vector>
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
#define AI_REMOVE_COMMENTS_H_INC
#include "../include/assimp/aiAssert.h"
#include "../include/assimp/assert.h"
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
class RemoveRedundantMatsTest;
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
class RemoveVCProcessTest;
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
#include <vector>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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"
// public Assimp headers
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiTexture.h"
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/aiMaterial.h"
#include "../include/assimp/types.h"
#include "../include/assimp/texture.h"
#include "../include/assimp/anim.h"
#include "../include/assimp/material.h"
struct aiNode;
// 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)
#include "STLExporter.h"
#include "../include/assimp/aiVersion.h"
#include "../include/assimp/version.h"
using 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
#include "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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
#define AI_SCENE_COMBINER_H_INC
#include "../include/assimp/aiAssert.h"
#include "../include/assimp/assert.h"
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 "../include/assimp/aiScene.h"
#include "../include/assimp/scene.h"
#include "SkeletonMeshBuilder.h"
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
#include <vector>
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
struct aiScene;
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
#include "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/mesh.h"
class SortByPTypeProcessTest;
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
#include <vector>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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 "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiScene.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/scene.h"
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 "BaseProcess.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiScene.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/scene.h"
class SplitLargeMeshesTest;
namespace Assimp

2
code/StdOStreamLogStream.h
View File

@@ -1,7 +1,7 @@
#ifndef AI_STROSTREAMLOGSTREAM_H_INC
#define AI_STROSTREAMLOGSTREAM_H_INC
#include "../include/assimp/LogStream.h"
#include "../include/assimp/LogStream.hpp"
#include <ostream>
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
#define AI_VALIDATEPROCESS_H_INC
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
#include "BaseProcess.h"
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
#include "BaseProcess.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiAssert.h"
#include "../include/assimp/types.h"
#include "../include/assimp/assert.h"
struct aiMesh;
namespace Assimp {

2
code/Win32DebugLogStream.h
View File

@@ -3,7 +3,7 @@
#ifdef WIN32
#include "../include/assimp/LogStream.h"
#include "../include/assimp/LogStream.hpp"
#include "windows.h"
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 <vector>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/aiQuaternion.h"
#include "../include/assimp/aiMesh.h"
#include "../include/assimp/aiAnim.h"
#include "../include/assimp/types.h"
#include "../include/assimp/quaternion.h"
#include "../include/assimp/mesh.h"
#include "../include/assimp/anim.h"
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 "BaseImporter.h"
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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 <vector>
#include "../include/assimp/aiTypes.h"
#include "../include/assimp/types.h"
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 ....
#include "./../contrib/irrXML/irrXML.h"
#include "./../include/assimp/IOStream.h"
#include "./../include/assimp/IOStream.hpp"
namespace Assimp {
// ---------------------------------------------------------------------------------