fixed a stupid typo in EntityFrame5_ExpandEdicts that caused a double free error

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index f8c81f7908aecf4e1326faed00684f35df0f7283..15c6d8a25b0c03ed1254ca403026baef537507c1 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -213,42 +213,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;
@@ -262,7 +226,7 @@ typedef struct aliasmesh_s
 {
        // skins to choose from (indexed by entity skin)
        int num_skins;
-       aliasskin_t *data_skins;
+       texture_t *data_skins;
 
        // triangles comprising the mesh
        int num_triangles;
@@ -277,6 +241,13 @@ typedef struct aliasmesh_s
        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;
@@ -298,5 +269,10 @@ typedef struct aliasbone_s
 }
 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);
+int Mod_Alias_GetTagMatrix(const struct model_s *model, int poseframe, int tagindex, matrix4x4_t *outmatrix);
+int Mod_Alias_GetTagIndexForName(const struct model_s *model, unsigned int skin, const char *tagname);
+
 #endif