decals added back due to popular demand, currently not at all optimized (they're...

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 8f504282cf19d0fdf506e18caaa2a7d3b1e7163d..fb9bc566b40c90a54b970fa15cfd51bec7ed2ada 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -230,12 +230,9 @@ typedef struct model_s
 
        animscene_t             *animscenes; // [numframes]
 
-       // Q1 and Q2 models are the same after loading
-       int                             *mdlmd2data_indices;
-       float                   *mdlmd2data_texcoords;
-       md2frame_t              *mdlmd2data_frames;
-       trivertx_t              *mdlmd2data_pose;
-       int                             *mdlmd2data_triangleneighbors;
+       // mdl/md2/md3 models are the same after loading
+       int                             aliasnum_meshes;
+       aliasmesh_t             *aliasdata_meshes;
 
        // for Zymotic models
        int                             zymnum_verts;
@@ -308,7 +305,7 @@ void Mod_LoadModels(void);
 extern model_t *loadmodel;
 extern char loadname[32];      // for hunk tags
 
-int Mod_FindTriangleWithEdge(const int *elements, int numtriangles, int start, int end);
+int Mod_FindTriangleWithEdge(const int *elements, int numtriangles, int start, int end, int ignore);
 void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles);
 void Mod_ValidateElements(const int *elements, int numtriangles, int numverts, const char *filename, int fileline);
 void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals);