DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index 3d628cd2d642be929964ad39d4841bf1956363ad..e45abc344b2c58f0332696f770af9a9cd3f74cfd 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef MODEL_ALIAS_H
+#define MODEL_ALIAS_H
+
 /*
 ==============================================================================
 
@@ -29,38 +32,6 @@ Alias models are position independent, so the cache manager can move them.
 
 #include "modelgen.h"
 
-/*
-typedef struct
-{
-       int                                     firstpose;
-       int                                     numposes;
-       float                           interval;
-       trivertx_t                      bboxmin;
-       trivertx_t                      bboxmax;
-       int                                     frame;
-       char                            name[16];
-} maliasframedesc_t;
-
-typedef struct
-{
-       trivertx_t                      bboxmin;
-       trivertx_t                      bboxmax;
-       int                                     frame;
-} maliasgroupframedesc_t;
-
-typedef struct
-{
-       int                                             numframes;
-       int                                             intervals;
-       maliasgroupframedesc_t  frames[1];
-} maliasgroup_t;
-
-typedef struct mtriangle_s {
-       int                                     facesfront;
-       int                                     vertindex[3];
-} mtriangle_t;
-*/
-
 typedef struct {
        int                     ident;
        int                     version;
@@ -79,19 +50,6 @@ typedef struct {
        float           size;
 } daliashdr_t;
 
-typedef struct
-{
-       vec3_t          scale;
-       vec3_t          scale_origin;
-       int                     numverts;
-       int                     numtris;
-       int                     numframes;
-       int                     numposes;
-       int                     texdata; // LordHavoc: texture coordinate array
-       int                     posedata; // LordHavoc: vertex data for all the poses
-       int                     tridata; // LordHavoc: vertex indices for the triangles
-} maliashdr_t;
-
 #define        MAXALIASVERTS   4096
 #define        MAXALIASFRAMES  1024
 #define        MAXALIASTRIS    4096
@@ -107,7 +65,6 @@ typedef struct
 // LordHavoc: grabbed this from the Q2 utility source,
 // renamed a things to avoid conflicts
 
-#define MD2IDALIASHEADER               (('2'<<24)+('P'<<16)+('D'<<8)+'I')
 #define MD2ALIAS_VERSION       8
 
 #define        MD2MAX_TRIANGLES        4096
@@ -134,17 +91,8 @@ typedef struct
        float           scale[3];       // multiply byte verts by this
        float           translate[3];   // then add this
        char            name[16];       // frame name from grabbing
-       trivertx_t      verts[1];       // variable sized
 } md2frame_t;
 
-// must match md2frame_t, this is just used for sizeof()
-typedef struct
-{
-       float           scale[3];       // multiply byte verts by this
-       float           translate[3];   // then add this
-} md2framesize_t;
-
-
 // the glcmd format:
 // a positive integer starts a tristrip command, followed by that many
 // vertex structures.
@@ -174,29 +122,13 @@ typedef struct
        int                     ofs_st;                 // byte offset from start for stverts
        int                     ofs_tris;               // offset for dtriangles
        int                     ofs_frames;             // offset for first frame
-       int                     ofs_glcmds;     
+       int                     ofs_glcmds;
        int                     ofs_end;                // end of file
 } md2_t;
 
-typedef struct
-{
-       int                     framesize;              // byte size of each frame
-
-       int                     num_skins;
-       int                     num_xyz;
-       int                     num_st;                 // greater than num_xyz for seams
-       int                     num_tris;
-       int                     num_glcmds;             // dwords in strip/fan command list
-       int                     num_frames;
-
-       int                     ofs_tris;               // offset for dtriangles
-       int                     ofs_frames;             // offset for first frame
-       int                     ofs_glcmds;     
-} md2mem_t;
-
-#define ALIASTYPE_MDL 1
-#define ALIASTYPE_MD2 2
-#define ALIASTYPE_ZYM 3
+// LordHavoc: Q1 and Q2 models are converted to the same internal format
+#define ALIASTYPE_MDLMD2 1
+#define ALIASTYPE_ZYM 2
 
 extern void Mod_LoadAliasModel (struct model_s *mod, void *buffer);
 extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
@@ -204,3 +136,6 @@ extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
 extern void Mod_AliasInit(void);
 
 #include "model_zymotic.h"
+
+#endif
+