gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index f8c81f7908aecf4e1326faed00684f35df0f7283..9b769bda84e43d7cf56e8061ca6b042e101c4803 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -32,7 +32,8 @@ Alias models are position independent, so the cache manager can move them.
 
 #include "modelgen.h"
 
-typedef struct {
+typedef struct daliashdr_s
+{
        int                     ident;
        int                     version;
        vec3_t          scale;
@@ -48,7 +49,8 @@ typedef struct {
        synctype_t      synctype;
        int                     flags;
        float           size;
-} daliashdr_t;
+}
+daliashdr_t;
 
 /*
 ========================================================================
@@ -64,19 +66,19 @@ typedef struct {
 #define MD2ALIAS_VERSION       8
 #define        MD2_SKINNAME    64
 
-typedef struct
+typedef struct md2stvert_s
 {
        short   s;
        short   t;
 } md2stvert_t;
 
-typedef struct
+typedef struct md2triangle_s
 {
        short   index_xyz[3];
        short   index_st[3];
 } md2triangle_t;
 
-typedef struct
+typedef struct md2frame_s
 {
        float           scale[3];       // multiply byte verts by this
        float           translate[3];   // then add this
@@ -92,7 +94,7 @@ typedef struct
 // and an integer vertex index.
 
 
-typedef struct
+typedef struct md2_s
 {
        int                     ident;
        int                     version;
@@ -116,14 +118,6 @@ typedef struct
        int                     ofs_end;                // end of file
 } md2_t;
 
-extern void Mod_IDP0_Load(struct model_s *mod, void *buffer);
-extern void Mod_IDP2_Load(struct model_s *mod, void *buffer);
-extern void Mod_IDP3_Load(struct model_s *mod, void *buffer);
-
-extern void Mod_AliasInit(void);
-
-#include "model_zymotic.h"
-
 // all md3 ints, floats, and shorts, are little endian, and thus need to be
 // passed through LittleLong/LittleFloat/LittleShort to avoid breaking on
 // bigendian machines (Macs for example)
@@ -213,76 +207,6 @@ typedef struct md3modelheader_s
 }
 md3modelheader_t;
 
-// this layer is fog (completely specialized behavior, automatic NODRAW_IF_NOTFOGGED behavior)
-#define ALIASLAYER_FOG 1
-// apply diffuse lighting
-#define ALIASLAYER_DIFFUSE 8
-// apply specular lighting
-#define ALIASLAYER_SPECULAR 16
-// tint with pants color
-#define ALIASLAYER_COLORMAP_PANTS 32
-// tint with shirt color
-#define ALIASLAYER_COLORMAP_SHIRT 64
-// don't draw this layer if colormap is not used
-#define ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED 128
-// don't draw this layer if colormap is used
-#define ALIASLAYER_NODRAW_IF_COLORMAPPED 256
-// ignore NODRAW flags on this layer only if all previous layers were skipped
-#define ALIASLAYER_FORCEDRAW_IF_FIRSTPASS 512
-
-typedef struct aliaslayer_s
-{
-       int flags;
-       rtexture_t *texture;
-       rtexture_t *nmap;
-}
-aliaslayer_t;
-
-// indicates this skin is transparent
-#define ALIASSKIN_TRANSPARENT 1
-
-typedef struct aliasskin_s
-{
-       int flags;
-       int num_layers;
-       aliaslayer_t *data_layers;
-}
-aliasskin_t;
-
-typedef struct aliasvertexboneweight_s
-{
-       unsigned int vertexindex;
-       unsigned int boneindex;
-       float origin[3];
-       float weight;
-}
-aliasvertexboneweight_t;
-
-typedef struct aliasmesh_s
-{
-       // skins to choose from (indexed by entity skin)
-       int num_skins;
-       aliasskin_t *data_skins;
-
-       // triangles comprising the mesh
-       int num_triangles;
-       int *data_element3i;
-       int *data_neighbor3i;
-
-       // skin texcoords do not change
-       int num_vertices;
-       float *data_texcoord2f;
-
-       // morph blending, these are zero if model is skeletal
-       int num_morphframes;
-       float *data_morphvertex3f;
-
-       // skeletal blending, these are zero if model is morph
-       int num_vertexboneweights;
-       aliasvertexboneweight_t *data_vertexboneweights;
-}
-aliasmesh_t;
-
 typedef struct aliastag_s
 {
        char name[MD3NAME];
@@ -298,5 +222,11 @@ typedef struct aliasbone_s
 }
 aliasbone_t;
 
+#include "model_zymotic.h"
+
+#include "model_dpmodel.h"
+
+#include "model_psk.h"
+
 #endif