X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_brush.h;h=1bf8be8d355cdc1a5a79503e132c40e86b416263;hb=fa330326d7e8f8b15f73f77a7cce86a6e954f935;hp=e99f07cd9b66c3570a68ab797ee75e6fa549a0fe;hpb=ea1a30a140048d0ef4c9023d4804bfa57eba9fa8;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.h b/model_brush.h
index e99f07cd..1bf8be8d 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -87,106 +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
 {
 	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
-
-	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
 {