X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_shared.h;h=830428d7f65adfcc01f1a923d475d960fe26a549;hp=45165a4012815ca965e00b27821e2dd9ffe22f21;hb=b6349d879773e5913f7b1e50dbe0c1d224e4b88f;hpb=c5205c4638557817c9a7d281d2d2dcad3e09e7df

diff --git a/model_shared.h b/model_shared.h
index 45165a40..830428d7 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -30,7 +30,7 @@ m*_t structures are in-memory
 
 */
 
-typedef enum {mod_invalid, mod_brush, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t;
+typedef enum {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t;
 
 typedef struct animscene_s
 {
@@ -117,31 +117,22 @@ shadowmesh_t;
 
 typedef struct model_alias_s
 {
-	// LordHavoc: Q2/ZYM model support
-	int				aliastype;
+	// mdl/md2/md3/zym model formats are treated the same after loading
 
-	// mdl/md2/md3 models are the same after loading
+	// the shader meshes comprising this model
 	int				aliasnum_meshes;
 	aliasmesh_t		*aliasdata_meshes;
 
+	// for md3 models
 	int				aliasnum_tags;
 	int				aliasnum_tagframes;
 	aliastag_t		*aliasdata_tags;
 
-	// for Zymotic models
-	int				zymnum_verts;
-	int				zymnum_tris;
-	int				zymnum_shaders;
-	int				zymnum_bones;
-	int				zymnum_scenes;
-	float			*zymdata_texcoords;
-	rtexture_t		**zymdata_textures;
-	qbyte			*zymdata_trizone;
-	zymbone_t		*zymdata_bones;
-	unsigned int	*zymdata_vertbonecounts;
-	zymvertex_t		*zymdata_verts;
-	unsigned int	*zymdata_renderlist;
-	float			*zymdata_poses;
+	// for skeletal models
+	int				aliasnum_bones;
+	aliasbone_t		*aliasdata_bones;
+	int				aliasnum_poses;
+	float			*aliasdata_poses;
 }
 model_alias_t;
 
@@ -336,16 +327,31 @@ model_brushq2_t;
 #define Q3SURFACEPARM_TRANS 16777216
 #define Q3SURFACEPARM_WATER 33554432
 
+// various flags from shaders
+#define Q3TEXTUREFLAG_TWOSIDED 1
+#define Q3TEXTUREFLAG_ADDITIVE 2
+#define Q3TEXTUREFLAG_NOMIPMAPS 4
+#define Q3TEXTUREFLAG_NOPICMIP 8
+#define Q3TEXTUREFLAG_AUTOSPRITE 16
+#define Q3TEXTUREFLAG_AUTOSPRITE2 32
+
+struct q3msurface_s;
 typedef struct q3mtexture_s
 {
 	char name[Q3PATHLENGTH];
+	char firstpasstexturename[Q3PATHLENGTH];
 	int surfaceflags;
 	int nativecontents;
 	int supercontents;
 	int surfaceparms;
+	int textureflags;
 
 	int number;
 	skinframe_t skin;
+
+	int numfaces;
+	struct q3msurface_s **facelist;
+	int *facenumlist;
 }
 q3mtexture_t;
 
@@ -372,7 +378,8 @@ typedef struct q3mleaf_s
 	int clusterindex;
 	int areaindex;
 	int numleaffaces;
-	struct q3mface_s **firstleafface;
+	struct q3msurface_s **firstleafface;
+	int *firstleaffacenum;
 	int numleafbrushes;
 	struct q3mbrush_s **firstleafbrush;
 }
@@ -383,7 +390,7 @@ typedef struct q3mmodel_s
 	vec3_t mins;
 	vec3_t maxs;
 	int numfaces;
-	struct q3mface_s *firstface;
+	struct q3msurface_s *firstface;
 	int numbrushes;
 	struct q3mbrush_s *firstbrush;
 }
@@ -413,21 +420,17 @@ typedef struct q3meffect_s
 }
 q3meffect_t;
 
-typedef struct q3mface_s
+typedef struct q3msurface_s
 {
+	// FIXME: collisionmarkframe should be kept in a separate array
+	// FIXME: visframe should be kept in a separate array
+	// FIXME: shadowmark should be kept in a separate array
+
 	struct q3mtexture_s *texture;
 	struct q3meffect_s *effect;
 	rtexture_t *lightmaptexture;
-	int collisions; // performs per triangle collisions on this surface
 	int collisionmarkframe; // don't collide twice in one trace
-	int type;
-	int firstvertex;
-	int firstelement;
-	int patchsize[2];
-	// used for processing
-	int markframe;
-	// (world only) visframe == r_framecount means it is visible this frame
-	int visframe;
+	int visframe; // visframe == r_framecount means it is visible this frame
 	// bounding box for culling
 	float mins[3];
 	float maxs[3];
@@ -451,12 +454,9 @@ typedef struct q3mface_s
 
 	// index into model->brush.shadowmesh
 	int num_firstshadowmeshtriangle;
-	
+
 	// used for shadow volume generation
 	int shadowmark;
-
-	// temporary use by light processing
-	int lighttemp_castshadow;
 }
 q3msurface_t;
 
@@ -468,6 +468,8 @@ typedef struct model_brushq3_s
 
 	int num_textures;
 	q3mtexture_t *data_textures;
+	q3msurface_t **data_texturefaces;
+	int *data_texturefacenums;
 
 	int num_planes;
 	mplane_t *data_planes;
@@ -483,6 +485,7 @@ typedef struct model_brushq3_s
 
 	int num_leaffaces;
 	q3msurface_t **data_leaffaces;
+	int *data_leaffacenums;
 
 	int num_models;
 	q3mmodel_t *data_models;
@@ -558,8 +561,6 @@ typedef struct model_s
 	int				flags;
 	// engine calculated flags, ones that can not be set in the file
 	int				flags2;
-	// LordHavoc: if true (normally only for sprites) the model/sprite/bmodel is always rendered fullbright
-	int				fullbright;
 	// number of QC accessible frame(group)s in the model
 	int				numframes;
 	// number of QC accessible skin(group)s in the model
@@ -647,8 +648,10 @@ void Mod_LoadModels(void);
 extern model_t *loadmodel;
 extern char loadname[32];	// for hunk tags
 
+int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, int numvertices, int *remapvertices);
 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_BuildNormals(int numverts, int numtriangles, const float *vertex3f, const int *elements, float *normal3f);
 void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals);
 
 shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtriangles, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, int light, int neighbors, int expandable);