X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_brush.h;h=bcb79f103798daa4b2f9b91d465bfee52c2cc9a7;hp=44ecdc3864a1b8821d2834c6f877f29aee85c4a3;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hpb=c651b263f8a63fa5846df832051d4f5658680a03

diff --git a/model_brush.h b/model_brush.h
index 44ecdc38..bcb79f10 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -35,7 +35,7 @@ BRUSH MODELS
 //
 // in memory representation
 //
-typedef struct
+typedef struct mvertex_s
 {
 	vec3_t position;
 }
@@ -87,113 +87,15 @@ mplane_t;
 // probably used only on q1bsp water
 #define MATERIALFLAG_LIGHTBOTHSIDES 1024
 
-struct entity_render_s;
-struct texture_s;
-struct msurface_s;
-
-typedef struct texture_s
-{
-	// q1bsp
-	// name
-	//char name[16];
-	// size
-	unsigned int width, height;
-	// SURF_ flags
-	//unsigned int flags;
-
-	// base material flags
-	int basematerialflags;
-	// current material flags (updated each bmodel render)
-	int currentmaterialflags;
-
-	// loaded the same as model skins
-	skinframe_t skin;
-
-	// total frames in sequence and alternate sequence
-	int anim_total[2];
-	// direct pointers to each of the frames in the sequences
-	// (indexed as [alternate][frame])
-	struct texture_s *anim_frames[2][10];
-	// set if animated or there is an alternate frame set
-	// (this is an optimization in the renderer)
-	int animated;
-	// the current texture frame in animation
-	struct texture_s *currentframe;
-	// current alpha of the texture
-	float currentalpha;
-
-	// q3bsp
-	char name[Q3PATHLENGTH];
-	char firstpasstexturename[Q3PATHLENGTH]; // used only during loading
-	int surfaceflags;
-	int supercontents;
-	int surfaceparms;
-	int textureflags;
-
-	//skinframe_t skin;
-}
-texture_t;
-
-typedef struct
+typedef struct medge_s
 {
 	unsigned short v[2];
 }
 medge_t;
 
-typedef struct
-{
-	float vecs[2][4];
-	texture_t *texture;
-	int flags;
-}
-mtexinfo_t;
-
-struct q3deffect_s;
-typedef struct msurface_s
-{
-	// bounding box for onscreen checks
-	vec3_t mins;
-	vec3_t maxs;
-	// the texture to use on the surface
-	texture_t *texture;
-	// the lightmap texture fragment to use on the rendering mesh
-	rtexture_t *lightmaptexture;
-	// mesh for rendering
-	surfmesh_t mesh;
-	// index into model->brush.shadowmesh
-	int num_firstshadowmeshtriangle;
-
-	// the node plane this is on, backwards if SURF_PLANEBACK flag set
-	//mplane_t *plane; // q1bsp
-	// SURF_ flags
-	//int flags; // q1bsp
-	// texture mapping properties used by this surface
-	mtexinfo_t *texinfo; // q1bsp
-	// index into d_lightstylevalue array, 255 means not used (black)
-	qbyte styles[MAXLIGHTMAPS]; // q1bsp
-	// RGB lighting data [numstyles][height][width][3]
-	qbyte *samples; // q1bsp
-	// stain to apply on lightmap (soot/dirt/blood/whatever)
-	qbyte *stainsamples; // q1bsp
-	// the stride when building lightmaps to comply with fragment update
-	int lightmaptexturestride; // q1bsp
-	int texturemins[2]; // q1bsp
-	int extents[2]; // q1bsp
-	// if lightmap settings changed, this forces update
-	int cached_dlight; // q1bsp
-#ifdef LHREMOVESOON
-	// if this == r_framecount there are dynamic lights on the surface
-	int dlightframe; // q1bsp
-	// which dynamic lights are touching this surface
-	// (only access this if dlightframe is current)
-	int dlightbits[8]; // q1bsp
-#endif
-
-	struct q3deffect_s *effect; // q3bsp
-	// FIXME: collisionmarkframe should be kept in a separate array
-	int collisionmarkframe; // q3bsp // don't collide twice in one trace
-}
-msurface_t;
+struct entity_render_s;
+struct texture_s;
+struct msurface_s;
 
 typedef struct mnode_s
 {
@@ -232,13 +134,13 @@ typedef struct mleaf_s
 	int *firstleafsurface;
 	int numleafbrushes; // q3bsp
 	int *firstleafbrush; // q3bsp
-	qbyte ambient_sound_level[NUM_AMBIENTS]; // q1bsp
+	unsigned char ambient_sound_level[NUM_AMBIENTS]; // q1bsp
 	int contents; // q1bsp: // TODO: remove (only used temporarily during loading when making collision hull 0)
 	int portalmarkid; // q1bsp // used by see-polygon-through-portals visibility checker
 }
 mleaf_t;
 
-typedef struct
+typedef struct hull_s
 {
 	dclipnode_t *clipnodes;
 	mplane_t *planes;
@@ -309,12 +211,6 @@ typedef struct mlight_s
 }
 mlight_t;
 
-struct model_s;
-void Mod_Q1BSP_Load(struct model_s *mod, void *buffer);
-void Mod_IBSP_Load(struct model_s *mod, void *buffer);
-void Mod_MAP_Load(struct model_s *mod, void *buffer);
-void Mod_BrushInit(void);
-
 // Q2 bsp stuff
 
 #define Q2BSPVERSION	38
@@ -345,14 +241,14 @@ void Mod_BrushInit(void);
 #define	Q2LUMP_AREAPORTALS	18
 #define	Q2HEADER_LUMPS		19
 
-typedef struct
+typedef struct q2dheader_s
 {
 	int			ident;
 	int			version;
 	lump_t		lumps[HEADER_LUMPS];
 } q2dheader_t;
 
-typedef struct
+typedef struct q2dmodel_s
 {
 	float		mins[3], maxs[3];
 	float		origin[3];		// for sounds or lights
@@ -418,7 +314,7 @@ typedef struct
 
 
 
-typedef struct
+typedef struct q2dnode_s
 {
 	int			planenum;
 	int			children[2];	// negative numbers are -(leafs+1), not nodes
@@ -429,7 +325,7 @@ typedef struct
 } q2dnode_t;
 
 
-typedef struct
+typedef struct q2texinfo_s
 {
 	float		vecs[2][4];		// [s/t][xyz offset]
 	int			flags;			// miptex flags + overrides
@@ -438,7 +334,7 @@ typedef struct
 	int			nexttexinfo;	// for animations, -1 = end of chain
 } q2texinfo_t;
 
-typedef struct
+typedef struct q2dleaf_s
 {
 	int				contents;			// OR of all brushes (not needed?)
 
@@ -455,13 +351,13 @@ typedef struct
 	unsigned short	numleafbrushes;
 } q2dleaf_t;
 
-typedef struct
+typedef struct q2dbrushside_s
 {
 	unsigned short	planenum;		// facing out of the leaf
 	short	texinfo;
 } q2dbrushside_t;
 
-typedef struct
+typedef struct q2dbrush_s
 {
 	int			firstside;
 	int			numsides;
@@ -474,7 +370,7 @@ typedef struct
 // compressed bit vectors
 #define	Q2DVIS_PVS	0
 #define	Q2DVIS_PHS	1
-typedef struct
+typedef struct q2dvis_s
 {
 	int			numclusters;
 	int			bitofs[8][2];	// bitofs[numclusters][2]
@@ -483,13 +379,13 @@ typedef struct
 // each area has a list of portals that lead into other areas
 // when portals are closed, other areas may not be visible or
 // hearable even if the vis info says that it should be
-typedef struct
+typedef struct q2dareaportal_s
 {
 	int		portalnum;
 	int		otherarea;
 } q2dareaportal_t;
 
-typedef struct
+typedef struct q2darea_s
 {
 	int		numareaportals;
 	int		firstareaportal;
@@ -519,14 +415,14 @@ typedef struct
 #define	Q3LUMP_PVS			16 // potentially visible set; bit[clusters][clusters] (used by rendering)
 #define	Q3HEADER_LUMPS		17
 
-typedef struct
+typedef struct q3dheader_s
 {
 	int			ident;
 	int			version;
 	lump_t		lumps[HEADER_LUMPS];
 } q3dheader_t;
 
-typedef struct
+typedef struct q3dtexture_s
 {
 	char name[Q3PATHLENGTH];
 	int surfaceflags;
@@ -535,14 +431,14 @@ typedef struct
 q3dtexture_t;
 
 // note: planes are paired, the pair of planes with i and i ^ 1 are opposites.
-typedef struct
+typedef struct q3dplane_s
 {
 	float normal[3];
 	float dist;
 }
 q3dplane_t;
 
-typedef struct
+typedef struct q3dnode_s
 {
 	int planeindex;
 	int childrenindex[2];
@@ -551,7 +447,7 @@ typedef struct
 }
 q3dnode_t;
 
-typedef struct
+typedef struct q3dleaf_s
 {
 	int clusterindex; // pvs index
 	int areaindex; // area index
@@ -564,7 +460,7 @@ typedef struct
 }
 q3dleaf_t;
 
-typedef struct
+typedef struct q3dmodel_s
 {
 	float mins[3];
 	float maxs[3];
@@ -575,7 +471,7 @@ typedef struct
 }
 q3dmodel_t;
 
-typedef struct
+typedef struct q3dbrush_s
 {
 	int firstbrushside;
 	int numbrushsides;
@@ -583,14 +479,14 @@ typedef struct
 }
 q3dbrush_t;
 
-typedef struct
+typedef struct q3dbrushside_s
 {
 	int planeindex;
 	int textureindex;
 }
 q3dbrushside_t;
 
-typedef struct
+typedef struct q3dvertex_s
 {
 	float origin3f[3];
 	float texcoord2f[2];
@@ -600,7 +496,7 @@ typedef struct
 }
 q3dvertex_t;
 
-typedef struct
+typedef struct q3dmeshvertex_s
 {
 	int offset; // first vertex index of mesh
 }
@@ -619,7 +515,7 @@ q3deffect_t;
 #define Q3FACETYPE_MESH 3 // common
 #define Q3FACETYPE_FLARE 4 // rare (is this ever used?)
 
-typedef struct
+typedef struct q3dface_s
 {
 	int textureindex;
 	int effectindex; // -1 if none
@@ -690,13 +586,13 @@ typedef struct
 }
 q3dface_t;
 
-typedef struct
+typedef struct q3dlightmap_s
 {
 	unsigned char rgb[128*128*3];
 }
 q3dlightmap_t;
 
-typedef struct
+typedef struct q3dlightgrid_s
 {
 	unsigned char ambientrgb[3];
 	unsigned char diffusergb[3];
@@ -705,7 +601,7 @@ typedef struct
 }
 q3dlightgrid_t;
 
-typedef struct
+typedef struct q3dpvs_s
 {
 	int numclusters;
 	int chainlength;