Get rid of anonymous struct typedefs
We are using C++14 where there is no reason for this and is banned in C++20 under P1766R1. MSVC generates a warning under C++14 as a reminder.
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
#include "plugins/3dapi/xv3d_types.h"
|
||||
|
||||
|
||||
typedef struct
|
||||
struct SMATERIAL
|
||||
{
|
||||
SFVEC3F m_Ambient; //
|
||||
SFVEC3F m_Diffuse; ///< Default diffuse color if m_Color is NULL
|
||||
@@ -54,7 +54,7 @@ typedef struct
|
||||
wxString m_Displacement; // disp
|
||||
wxString m_Alpha; // map_d
|
||||
};*/
|
||||
} SMATERIAL;
|
||||
};
|
||||
|
||||
|
||||
/// Per-vertex normal/color/texcoors structure.
|
||||
@@ -73,7 +73,7 @@ typedef struct
|
||||
/// To convert this units to pcbunits, use the conversion facto UNITS3D_TO_UNITSPCB
|
||||
///
|
||||
/// m_Normals, m_Color and m_Texcoords are between 0.0f and 1.0f
|
||||
typedef struct
|
||||
struct SMESH
|
||||
{
|
||||
unsigned int m_VertexSize; ///< Number of vertex in the arrays
|
||||
SFVEC3F *m_Positions; ///< Vertex position array
|
||||
@@ -83,17 +83,17 @@ typedef struct
|
||||
unsigned int m_FaceIdxSize; ///< Number of elements of the m_FaceIdx array
|
||||
unsigned int *m_FaceIdx; ///< Triangle Face Indexes
|
||||
unsigned int m_MaterialIdx; ///< Material Index to be used in this mesh (must be < m_MaterialsSize )
|
||||
} SMESH;
|
||||
};
|
||||
|
||||
|
||||
/// Store the a model based on meshes and materials
|
||||
typedef struct
|
||||
struct S3DMODEL
|
||||
{
|
||||
unsigned int m_MeshesSize; ///< Number of meshes in the array
|
||||
SMESH *m_Meshes; ///< The meshes list of this model
|
||||
|
||||
unsigned int m_MaterialsSize; ///< Number of materials in the material array
|
||||
SMATERIAL *m_Materials; ///< The materials list of this model
|
||||
} S3DMODEL;
|
||||
};
|
||||
|
||||
#endif // C3DMODEL_H
|
||||
|
||||
Reference in New Issue
Block a user