From 8378b0700cdc5ef47c303f76011fcb2640ad05e0 Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 7 Jun 2011 11:49:07 -0400 Subject: [PATCH] removed some unnecessary typedefs --- src/geometry/matrix4x4.h | 4 ++-- src/md2/md2.h | 16 ++++++++-------- src/obj/obj.h | 12 ++++++------ src/sm/sm.h | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/geometry/matrix4x4.h b/src/geometry/matrix4x4.h index 1f04ddf..f17d954 100644 --- a/src/geometry/matrix4x4.h +++ b/src/geometry/matrix4x4.h @@ -5,7 +5,7 @@ #include "common.h" #include "vector3.h" -typedef enum +enum MATRIX_ELEMENTS { _11 = 0, _12 = 4, @@ -23,7 +23,7 @@ typedef enum _42 = 7, _43 = 11, _44 = 15 -} MATRIX_ELEMENTS; +}; /** * Represents a 4x4 column-major Matrix and provides common methods for diff --git a/src/md2/md2.h b/src/md2/md2.h index fa19d7d..9e0f72a 100644 --- a/src/md2/md2.h +++ b/src/md2/md2.h @@ -10,7 +10,7 @@ #define MD2_SKIN_NAME_LENGTH 64 #define MD2_FRAME_NAME_LENGTH 16 -typedef struct +struct Md2Header { char ident[4]; // Should be "IDP2" int version; // Should be 8 @@ -29,14 +29,14 @@ typedef struct int offsetFrames; int offsetGlCmds; int offsetEnd; -} Md2Header; +}; // Vertex and texcoord indices -typedef struct +struct Md2Polygon { unsigned short vertex[3]; unsigned short texCoord[3]; -} Md2Polygon; +}; // For each keyframe, stores the vertices, normals, and the string name typedef struct Md2Frame @@ -56,14 +56,14 @@ typedef struct Md2Frame delete[] vertices; delete[] normals; } -} Md2Frame; +}; -typedef struct +struct Md2Animation { std::string name; unsigned int startFrame; unsigned int endFrame; -} Md2Animation; +}; class Md2 { @@ -97,4 +97,4 @@ private: std::vector m_animations; }; -#endif \ No newline at end of file +#endif diff --git a/src/obj/obj.h b/src/obj/obj.h index 7d3144b..9ebea87 100644 --- a/src/obj/obj.h +++ b/src/obj/obj.h @@ -7,21 +7,21 @@ #include -typedef enum OBJ_FACE_VERTEX_TYPE +enum OBJ_FACE_VERTEX_TYPE { OBJ_VERTEX_TEXCOORD, OBJ_VERTEX_NORMAL, OBJ_VERTEX_FULL }; -typedef struct +struct ObjFace { unsigned int vertices[3]; unsigned int texcoords[3]; unsigned int normals[3]; -} ObjFace; +}; -typedef struct ObjMaterial +struct ObjMaterial { std::string name; Material *material; @@ -42,7 +42,7 @@ typedef struct ObjMaterial delete material; delete[] faces; } -} ObjMaterial; +}; class Obj { @@ -81,4 +81,4 @@ private: }; -#endif \ No newline at end of file +#endif diff --git a/src/sm/sm.h b/src/sm/sm.h index 6d89e23..95147d0 100644 --- a/src/sm/sm.h +++ b/src/sm/sm.h @@ -7,16 +7,16 @@ #include -typedef struct +struct SmPolygon { unsigned int vertices[3]; unsigned int normals[3]; unsigned int texcoords[3]; unsigned short colors[3]; short material; -} SmPolygon; +}; -typedef struct SmMaterial +struct SmMaterial { Material *material; unsigned int polyStart; @@ -33,7 +33,7 @@ typedef struct SmMaterial { delete material; } -} SmMaterial; +}; #define NO_MATERIAL -1 @@ -70,4 +70,4 @@ private: bool m_hasColors; }; -#endif \ No newline at end of file +#endif