Updated Assimp library to the latest version 1270

SVNRevision 1270
assimp--3.0.1270-source-only.zip

Change-Id: I332efb5fd0d086f24aca0a5fe9d396d549e531fa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 82 insertions, 78 deletions

diff --git a/src/3rdparty/assimp/code/MDCFileData.h b/src/3rdparty/assimp/code/MDCFileData.h
index 6c33880c6..0f110f9e9 100644
--- a/src/3rdparty/assimp/code/MDCFileData.h
+++ b/src/3rdparty/assimp/code/MDCFileData.h
@@ -1,12 +1,12 @@
 /*
-Open Asset Import Library (ASSIMP)
+Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2010, ASSIMP Development Team
+Copyright (c) 2006-2012, assimp team
 All rights reserved.
 
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
+Redistribution and use of this software in source and binary forms, 
+with or without modification, are permitted provided that the 
 following conditions are met:
 
 * Redistributions of source code must retain the above
@@ -18,30 +18,30 @@ following conditions are met:
   following disclaimer in the documentation and/or other
   materials provided with the distribution.
 
-* Neither the name of the ASSIMP team, nor the names of its
+* Neither the name of the assimp team, nor the names of its
   contributors may be used to endorse or promote products
   derived from this software without specific prior
-  written permission of the ASSIMP Development Team.
+  written permission of the assimp team.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
 
-/** @file Defines the helper data structures for importing MDC files
+/** @file Defines the helper data structures for importing MDC files  
 
 **********************************************************************
-File format specification:
+File format specification: 
 http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 **********************************************************************
 
@@ -49,11 +49,11 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 #ifndef AI_MDCFILEHELPER_H_INC
 #define AI_MDCFILEHELPER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 
 namespace Assimp {
@@ -61,17 +61,17 @@ namespace MDC {
 
 
 // to make it easier for us, we test the magic word against both "endianesses"
-#define AI_MDC_MAGIC_NUMBER_BE    AI_MAKE_MAGIC("CPDI")
-#define AI_MDC_MAGIC_NUMBER_LE    AI_MAKE_MAGIC("IDPC")
+#define AI_MDC_MAGIC_NUMBER_BE	AI_MAKE_MAGIC("CPDI")
+#define AI_MDC_MAGIC_NUMBER_LE	AI_MAKE_MAGIC("IDPC")
 
 // common limitations
-#define AI_MDC_VERSION            2
-#define AI_MDC_MAXQPATH            64
-#define    AI_MDC_MAX_BONES        128
+#define AI_MDC_VERSION			2
+#define AI_MDC_MAXQPATH			64
+#define	AI_MDC_MAX_BONES		128
 
-#define AI_MDC_CVERT_BIAS        127.0f
-#define    AI_MDC_DELTA_SCALING    4.0f
-#define    AI_MDC_BASE_SCALING        (1.0f / 64.0f)
+#define AI_MDC_CVERT_BIAS		127.0f
+#define	AI_MDC_DELTA_SCALING	4.0f
+#define	AI_MDC_BASE_SCALING		(1.0f / 64.0f)
 
 
 // ---------------------------------------------------------------------------
@@ -79,19 +79,19 @@ namespace MDC {
  */
 struct Header
 {
-    uint32_t ulIdent ;
-    uint32_t ulVersion ;
-    char ucName [ AI_MDC_MAXQPATH ] ;
-    uint32_t ulFlags ;
-    uint32_t ulNumFrames ;
-    uint32_t ulNumTags ;
-    uint32_t ulNumSurfaces ;
-    uint32_t ulNumSkins ;
-    uint32_t ulOffsetBorderFrames ;
-    uint32_t ulOffsetTagNames ;
-    uint32_t ulOffsetTagFrames ;
-    uint32_t ulOffsetSurfaces ;
-    uint32_t ulOffsetEnd ;
+	uint32_t ulIdent ;
+	uint32_t ulVersion ;
+	char ucName [ AI_MDC_MAXQPATH ] ;
+	uint32_t ulFlags ;
+	uint32_t ulNumFrames ;
+	uint32_t ulNumTags ;
+	uint32_t ulNumSurfaces ;
+	uint32_t ulNumSkins ;
+	uint32_t ulOffsetBorderFrames ;
+	uint32_t ulOffsetTagNames ;
+	uint32_t ulOffsetTagFrames ;
+	uint32_t ulOffsetSurfaces ;
+	uint32_t ulOffsetEnd ;
 } PACK_STRUCT ;
 
 
@@ -100,22 +100,26 @@ struct Header
  */
 struct Surface
 {
-    uint32_t ulIdent ;
-    char ucName [ AI_MDC_MAXQPATH ] ;
-    uint32_t ulFlags ;
-    uint32_t ulNumCompFrames ;
-    uint32_t ulNumBaseFrames ;
-    uint32_t ulNumShaders ;
-    uint32_t ulNumVertices ;
-    uint32_t ulNumTriangles ;
-    uint32_t ulOffsetTriangles ;
-    uint32_t ulOffsetShaders ;
-    uint32_t ulOffsetTexCoords ;
-    uint32_t ulOffsetBaseVerts ;
-    uint32_t ulOffsetCompVerts ;
-    uint32_t ulOffsetFrameBaseFrames ;
-    uint32_t ulOffsetFrameCompFrames ;
-    uint32_t ulOffsetEnd ;
+	uint32_t ulIdent ;
+	char ucName [ AI_MDC_MAXQPATH ] ;
+	uint32_t ulFlags ;
+	uint32_t ulNumCompFrames ;
+	uint32_t ulNumBaseFrames ;
+	uint32_t ulNumShaders ;
+	uint32_t ulNumVertices ;
+	uint32_t ulNumTriangles ;
+	uint32_t ulOffsetTriangles ;
+	uint32_t ulOffsetShaders ;
+	uint32_t ulOffsetTexCoords ;
+	uint32_t ulOffsetBaseVerts ;
+	uint32_t ulOffsetCompVerts ;
+	uint32_t ulOffsetFrameBaseFrames ;
+	uint32_t ulOffsetFrameCompFrames ;
+	uint32_t ulOffsetEnd;
+	Surface()
+	{
+		ucName[AI_MDC_MAXQPATH-1] = '\0';
+	}
 } PACK_STRUCT;
 
 // ---------------------------------------------------------------------------
@@ -123,20 +127,20 @@ struct Surface
  */
 struct Frame
 {
-    //! bounding box minimum coords
-    aiVector3D bboxMin ;
+	//! bounding box minimum coords
+	aiVector3D bboxMin ;
 
-    //! bounding box maximum coords
-    aiVector3D bboxMax ;
+	//! bounding box maximum coords
+	aiVector3D bboxMax ;
 
-    //! local origin of the frame
-    aiVector3D localOrigin ;
+	//! local origin of the frame
+	aiVector3D localOrigin ;
 
-    //! radius of the BB
-    float radius ;
+	//! radius of the BB
+	float radius ;
 
-    //! Name of the frame
-    char name [ 16 ] ;
+	//! Name of the frame
+	char name [ 16 ] ;
 } PACK_STRUCT;
 
 // ---------------------------------------------------------------------------
@@ -144,7 +148,7 @@ struct Frame
  */
 struct Triangle
 {
-    uint32_t aiIndices[3];
+	uint32_t aiIndices[3];
 } PACK_STRUCT;
 
 // ---------------------------------------------------------------------------
@@ -152,7 +156,7 @@ struct Triangle
  */
 struct TexturCoord
 {
-    float u,v;
+	float u,v;
 } PACK_STRUCT;
 
 // ---------------------------------------------------------------------------
@@ -160,8 +164,8 @@ struct TexturCoord
  */
 struct BaseVertex
 {
-    int16_t x,y,z;
-    uint16_t normal;
+	int16_t x,y,z;
+	uint16_t normal;
 } PACK_STRUCT;
 
 // ---------------------------------------------------------------------------
@@ -169,7 +173,7 @@ struct BaseVertex
  */
 struct CompressedVertex
 {
-    uint8_t xd,yd,zd,nd;
+	uint8_t xd,yd,zd,nd;
 } PACK_STRUCT;
 
 
@@ -178,22 +182,22 @@ struct CompressedVertex
  */
 struct Shader
 {
-    char ucName [ AI_MDC_MAXQPATH ] ;
-    uint32_t ulPath;
+	char ucName [ AI_MDC_MAXQPATH ] ;
+	uint32_t ulPath;
 
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 // ---------------------------------------------------------------------------
 /** Build a floating point vertex from the compressed data in MDC files
  */
 void BuildVertex(const Frame& frame,
-    const BaseVertex& bvert,
-    const CompressedVertex& cvert,
-    aiVector3D& vXYZOut,
-    aiVector3D& vNorOut);
+	const BaseVertex& bvert,
+	const CompressedVertex& cvert,
+	aiVector3D& vXYZOut, 
+	aiVector3D& vNorOut);
 }}
 
 #endif // !! AI_MDCFILEHELPER_H_INC