Fix compiler warnings.
This commit is contained in:
@@ -142,14 +142,14 @@ struct Frame
|
||||
//! name of frame
|
||||
char name[ AI_MD3_MAXFRAME ];
|
||||
|
||||
} PACK_STRUCT;
|
||||
} /* PACK_STRUCT */;
|
||||
|
||||
|
||||
// -------------------------------------------------------------------------------
|
||||
/** @brief Data structure for the tag header
|
||||
/**
|
||||
* @brief Data structure for the tag header
|
||||
*/
|
||||
struct Tag
|
||||
{
|
||||
struct Tag {
|
||||
//! name of the tag
|
||||
char NAME[ AI_MD3_MAXQPATH ];
|
||||
|
||||
@@ -157,14 +157,13 @@ struct Tag
|
||||
aiVector3D origin;
|
||||
ai_real orientation[3][3];
|
||||
|
||||
} PACK_STRUCT;
|
||||
} /* PACK_STRUCT */;
|
||||
|
||||
|
||||
// -------------------------------------------------------------------------------
|
||||
/** @brief Data structure for the surface header
|
||||
*/
|
||||
struct Surface
|
||||
{
|
||||
struct Surface {
|
||||
//! magic number
|
||||
int32_t IDENT;
|
||||
|
||||
@@ -186,7 +185,6 @@ struct Surface
|
||||
//! number of triangles in the surface
|
||||
uint32_t NUM_TRIANGLES;
|
||||
|
||||
|
||||
//! offset to the triangle data
|
||||
uint32_t OFS_TRIANGLES;
|
||||
|
||||
@@ -201,19 +199,18 @@ struct Surface
|
||||
|
||||
//! offset to the end of the Surface object
|
||||
int32_t OFS_END;
|
||||
} PACK_STRUCT;
|
||||
} /*PACK_STRUCT*/;
|
||||
|
||||
// -------------------------------------------------------------------------------
|
||||
/** @brief Data structure for a shader defined in there
|
||||
*/
|
||||
struct Shader
|
||||
{
|
||||
struct Shader {
|
||||
//! filename of the shader
|
||||
char NAME[ AI_MD3_MAXQPATH ];
|
||||
|
||||
//! index of the shader
|
||||
uint32_t SHADER_INDEX;
|
||||
} PACK_STRUCT;
|
||||
} /*PACK_STRUCT*/;
|
||||
|
||||
|
||||
// -------------------------------------------------------------------------------
|
||||
@@ -223,7 +220,7 @@ struct Triangle
|
||||
{
|
||||
//! triangle indices
|
||||
uint32_t INDEXES[3];
|
||||
} PACK_STRUCT;
|
||||
} /*PACK_STRUCT*/;
|
||||
|
||||
|
||||
// -------------------------------------------------------------------------------
|
||||
@@ -233,7 +230,7 @@ struct TexCoord
|
||||
{
|
||||
//! UV coordinates
|
||||
ai_real U,V;
|
||||
} PACK_STRUCT;
|
||||
} /*PACK_STRUCT*/;
|
||||
|
||||
|
||||
// -------------------------------------------------------------------------------
|
||||
@@ -246,7 +243,7 @@ struct Vertex
|
||||
|
||||
//! encoded normal vector
|
||||
uint16_t NORMAL;
|
||||
} PACK_STRUCT;
|
||||
} /*PACK_STRUCT*/;
|
||||
|
||||
#include "./../include/assimp/Compiler/poppack1.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user