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

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/3DSLoader.h

@@ -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"

code/ACLoader.h

@@ -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	{
 

code/ASELoader.h

@@ -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"

code/ASEParser.h

@@ -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"

code/Assimp.cpp

@@ -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"

code/AssimpPCH.cpp

@@ -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.

code/AssimpPCH.h

@@ -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"

code/B3DImporter.h

@@ -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>

code/BaseImporter.h

@@ -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;
 

code/BaseProcess.h

@@ -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;

code/ByteSwap.h

@@ -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>

code/CInterfaceIOWrapper.h

@@ -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	{
 	

code/CMakeLists.txt

@@ -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

code/ColladaExporter.h

@@ -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;

code/ColladaLoader.cpp

@@ -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"
 

code/ComputeUVMappingProcess.h

@@ -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

code/ConvertToLHProcess.h

@@ -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;

code/DeboneProcess.h

@@ -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;
 

code/DefaultIOStream.h

@@ -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	{
 

code/DefaultIOSystem.h

@@ -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	{
 

code/DefaultProgressHandler.h

@@ -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	{
 
 // ------------------------------------------------------------------------------------

code/FileLogStream.h

@@ -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	{
 

code/FileSystemFilter.h

@@ -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	{

code/FindDegenerates.h

@@ -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	{

code/FindInvalidDataProcess.h

@@ -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;

code/GenFaceNormalsProcess.h

@@ -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
 {

code/GenVertexNormalsProcess.h

@@ -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;
 

code/GenericProperty.h

@@ -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"
 
 // ------------------------------------------------------------------------------------------------

code/HMPLoader.h

@@ -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"

code/Importer.cpp

@@ -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.

code/ImproveCacheLocality.h

@@ -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;
 

code/JoinVerticesProcess.h

@@ -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
 {

code/LWOFileData.h

@@ -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"

code/LWOLoader.h

@@ -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"

code/MD2FileData.h

@@ -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"
 

code/MD2Loader.h

@@ -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"

code/MD3FileData.h

@@ -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"
 

code/MD3Loader.h

@@ -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	{

code/MD5Loader.h

@@ -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	{
 

code/MD5Parser.h

@@ -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;

code/MDCFileData.h

@@ -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"
 

code/MDCLoader.h

@@ -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"

code/NFFLoader.h

@@ -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	{
 

code/OFFLoader.h

@@ -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	{

code/ObjExporter.cpp

@@ -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	{

code/ObjFileData.h

@@ -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
 {

code/ObjFileParser.cpp

@@ -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	

code/OptimizeGraph.h

@@ -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;

code/OptimizeMeshes.h

@@ -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;

code/PlyLoader.h

@@ -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;
 

code/PretransformVertices.h

@@ -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	{

code/ProcessHelper.h

@@ -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"

code/Profiler.h

@@ -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 {

code/Q3BSPFileImporter.cpp

@@ -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

code/Q3BSPZipArchive.h

@@ -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>

code/Q3DLoader.h

@@ -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	{

code/RawLoader.h

@@ -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	{

code/RemoveComments.h

@@ -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	{
 

code/RemoveRedundantMaterials.h

@@ -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	{

code/RemoveVCProcess.h

@@ -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	{

code/SGSpatialSort.h

@@ -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	{
 

code/SMDLoader.h

@@ -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

code/STLExporter.cpp

@@ -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	{

code/STLLoader.h

@@ -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	{
 

code/SceneCombiner.h

@@ -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	{
 

code/SkeletonMeshBuilder.cpp

@@ -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;

code/SkeletonMeshBuilder.h

@@ -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;

code/SortByPTypeProcess.h

@@ -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	{

code/SpatialSort.h

@@ -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
 {

code/SplitByBoneCountProcess.h

@@ -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
 {

code/SplitLargeMeshes.h

@@ -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

code/StdOStreamLogStream.h

@@ -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	{

code/ValidateDataStructure.h

@@ -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;

code/VertexTriangleAdjacency.h

@@ -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	{

code/Win32DebugLogStream.h

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

code/XFileHelper.h

@@ -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
 {

code/XFileImporter.h

@@ -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;
 

code/XFileParser.h

@@ -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
 {

code/irrXMLWrapper.h

@@ -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	{
 
 // ---------------------------------------------------------------------------------

include/assimp/DefaultLogger.h → include/assimp/DefaultLogger.hpp

@@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_DEFAULTLOGGER
 #define INCLUDED_AI_DEFAULTLOGGER
 
-#include "Logger.h"
-#include "LogStream.h"
-#include "NullLogger.h"
+#include "Logger.hpp"
+#include "LogStream.hpp"
+#include "NullLogger.hpp"
 #include <vector>
 
 namespace Assimp	{

include/assimp/export.hpp → include/assimp/Exporter.hpp

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-#include "export.h"
+#include "cexport.h"
 
 namespace Assimp	{
 	class ExporterPimpl;

include/assimp/IOStream.h → include/assimp/IOStream.hpp

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_IOSTREAM_H_INC
 #define AI_IOSTREAM_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifndef __cplusplus
 #	error This header requires C++ to be used. aiFileIO.h is the \

include/assimp/IOSystem.h → include/assimp/IOSystem.hpp

@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	corresponding C interface.
 #endif
 
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 class IOStream;
 

include/assimp/assimp.hpp → include/assimp/Importer.hpp

@@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 // Public ASSIMP data structures
-#include "aiTypes.h"
-#include "aiConfig.h"
-#include "aiAssert.h"
+#include "types.h"
+#include "config.h"
+#include "assert.h"
 
 namespace Assimp	{
 	// =======================================================================

include/assimp/LogStream.h → include/assimp/LogStream.hpp

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_LOGSTREAM_H
 #define INCLUDED_AI_LOGSTREAM_H
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 class IOSystem;
 

include/assimp/Logger.h → include/assimp/Logger.hpp

@@ -38,13 +38,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-/** @file Logger.h
+/** @file Logger.hpp
  *  @brief Abstract base class 'Logger', base of the logging system. 
  */
 #ifndef INCLUDED_AI_LOGGER_H
 #define INCLUDED_AI_LOGGER_H
 
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 class LogStream;
 

include/assimp/NullLogger.h → include/assimp/NullLogger.hpp

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_NULLLOGGER_H
 #define INCLUDED_AI_NULLLOGGER_H
 
-#include "Logger.h"
+#include "Logger.hpp"
 namespace Assimp	{
 // ---------------------------------------------------------------------------
 /** @brief CPP-API: Empty logging implementation.

include/assimp/ProgressHandler.h → include/assimp/ProgressHandler.hpp

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_PROGRESSHANDLER_H
 #define INCLUDED_AI_PROGRESSHANDLER_H
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------------

include/assimp/aiAnim.h → include/assimp/anim.h

@@ -39,15 +39,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiAnim.h
+/** @file anim.h
  *  @brief Defines the data structures in which the imported animations
  *  are returned.
  */
 #ifndef AI_ANIM_H_INC
 #define AI_ANIM_H_INC
 
-#include "aiTypes.h"
-#include "aiQuaternion.h"
+#include "types.h"
+#include "quaternion.h"
 
 #ifdef __cplusplus
 extern "C" {

include/assimp/aiAssert.h → include/assimp/assert.h

@@ -1,4 +1,4 @@
-/** @file aiAssert.h
+/** @file assert.h
  */
 #ifndef AI_DEBUG_H_INC
 #define AI_DEBUG_H_INC

include/assimp/aiCamera.h → include/assimp/camera.h

@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiCamera.h
+/** @file camera.h
  *  @brief Defines the aiCamera data structure
  */
 
 #ifndef AI_CAMERA_H_INC
 #define AI_CAMERA_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/assimp/export.h → include/assimp/cexport.h

@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file  export.h
+/** @file  cexport.h
 *  @brief Defines the C-API for the Assimp export interface
 */
 #ifndef AI_EXPORT_H_INC
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/assimp/aiFileIO.h → include/assimp/cfileio.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_FILEIO_H_INC
 #define AI_FILEIO_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/assimp/assimp.h → include/assimp/cimport.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef AI_ASSIMP_H_INC
 #define AI_ASSIMP_H_INC
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -354,7 +354,7 @@ ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
  *  specify them per import.
  *
  * @param szName Name of the configuration property to be set. All supported 
- *   public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX).
+ *   public properties are defined in the config.h header file (#AI_CONFIG_XXX).
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyInteger(
@@ -370,7 +370,7 @@ ASSIMP_API void aiSetImportPropertyInteger(
  *  specify them per import.
  *
  * @param szName Name of the configuration property to be set. All supported 
- *   public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX).
+ *   public properties are defined in the config.h header file (#AI_CONFIG_XXX).
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyFloat(
@@ -387,7 +387,7 @@ ASSIMP_API void aiSetImportPropertyFloat(
  *
  * @param property store to modify. Use #aiCreatePropertyStore to obtain a store.
  * @param szName Name of the configuration property to be set. All supported 
- *   public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX).
+ *   public properties are defined in the config.h header file (#AI_CONFIG_XXX).
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyString(

include/assimp/aiColor4D.inl → include/assimp/color4.inl

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_COLOR4D_INL_INC
 
 #ifdef __cplusplus
-#include "aiColor4D.h"
+#include "color4.h"
 
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>

include/assimp/aiConfig.h → include/assimp/config.h

@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiConfig.h
+/** @file config.h
  *  @brief Defines constants for configurable properties for the library
  *
  *  Typically these properties are set via 

include/assimp/aiLight.h → include/assimp/light.h

@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiLight.h
+/** @file light.h
  *  @brief Defines the aiLight data structure
  */
 
 #ifndef __AI_LIGHT_H_INC__
 #define __AI_LIGHT_H_INC__
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/assimp/aiMaterial.h → include/assimp/material.h

@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiMaterial.h
+/** @file material.h
  *  @brief Defines the material system of the library
  */
 
 #ifndef AI_MATERIAL_H_INC
 #define AI_MATERIAL_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1485,7 +1485,7 @@ C_ENUM aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
 #ifdef __cplusplus
 }
 
-#include "aiMaterial.inl"
+#include "material.inl"
 
 #endif //!__cplusplus
 #endif //!!AI_MATERIAL_H_INC