fix two runaway loops caused by unsigned int i

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index 36d4e50e027f38764509c18f3816c85c7dd85b9c..338e2dd95dc6898565414f3d899e1e85cc7955bb 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -116,13 +116,9 @@ typedef struct
        int                     ofs_end;                // end of file
 } md2_t;
 
-// LordHavoc: mdl, md2 and md3 models are converted to the same internal format
-#define ALIASTYPE_ALIAS 1
-#define ALIASTYPE_ZYM 2
-
-extern void Mod_LoadQ1AliasModel (struct model_s *mod, void *buffer);
-extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
-extern void Mod_LoadQ3AliasModel (struct model_s *mod, void *buffer);
+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);
 
@@ -217,71 +213,64 @@ typedef struct md3modelheader_s
 }
 md3modelheader_t;
 
-// LordHavoc: all quake series 'alias' models (mdl, md2, md3) are converted to this vertex format
-typedef struct aliasvertex_s
+typedef struct aliasvertexboneweight_s
 {
-       // location
+       unsigned int vertexindex;
+       unsigned int boneindex;
        float origin[3];
-       // surface normal
-       float normal[3];
-       // S texture vector
-       float svector[3];
-}
-aliasvertex_t;
-
-// this layer is fog (completely specialized behavior)
-#define ALIASLAYER_FOG 1
-// alpha blending
-#define ALIASLAYER_ALPHA 2
-// additive blending
-#define ALIASLAYER_ADD 4
-// 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
-// draw this layer for realtime lighting passes, otherwise don't
-#define ALIASLAYER_DRAW_PER_LIGHT 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;
+       float weight;
 }
-aliasskin_t;
+aliasvertexboneweight_t;
 
 typedef struct aliasmesh_s
 {
+       // skins to choose from (indexed by entity skin)
        int num_skins;
+       texture_t *data_skins;
+
+       // triangles comprising the mesh
        int num_triangles;
-       int num_frames;
-       int num_vertices;
-       aliasskin_t *data_skins;
        int *data_element3i;
        int *data_neighbor3i;
+
+       // skin texcoords do not change
+       int num_vertices;
        float *data_texcoord2f;
-       aliasvertex_t *data_aliasvertex;
+
+       // morph blending, these are zero if model is skeletal
+       int num_morphframes;
+       float *data_morphvertex3f;
+
+       // base frame (frame zero typically)
+       // since most models do not animate, caching the base frame helps
+       float *data_basevertex3f;
+       float *data_basesvector3f;
+       float *data_basetvector3f;
+       float *data_basenormal3f;
+
+       // 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];
+       matrix4x4_t matrix;
+}
+aliastag_t;
+
+typedef struct aliasbone_s
+{
+       char name[MD3NAME];
+       int flags;
+       int parent; // -1 for no parent
+}
+aliasbone_t;
+
+struct frameblend_s;
+void Mod_Alias_GetMesh_Vertex3f(const struct model_s *model, const struct frameblend_s *frameblend, const struct aliasmesh_s *mesh, float *out3f);
+
 #endif