X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=model_brush.h;h=7596a39ff142f27da6c9a3866d87d2604ae159ed;hb=9a5813aa435f4334c98f5c8fa65c9059653f31c7;hp=7ae603fe3084028a946ae4b773679d397f431cf1;hpb=06f3d99753c92cf01b4ff58e2c7cde7e12e20730;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.h b/model_brush.h
index 7ae603fe..7596a39f 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -82,7 +82,7 @@ struct msurface_s;
 // change this stuff when real shaders are added
 typedef struct Cshader_s
 {
-	void (*shaderfunc[SHADERSTAGE_COUNT])(const struct entity_render_s *ent, const struct texture_s *texture, const struct msurface_s *firstsurf);
+	void (*shaderfunc[SHADERSTAGE_COUNT])(const struct entity_render_s *ent, const struct texture_s *texture, struct msurface_s **surfchain);
 	int flags;
 }
 Cshader_t;
@@ -100,6 +100,9 @@ typedef struct texture_s
 	// SURF_ flags
 	unsigned int flags;
 
+	// position in the model's textures array
+	int number;
+
 	// type of rendering (SURFRENDER_ value)
 	int rendertype;
 
@@ -127,9 +130,10 @@ typedef struct texture_s
 	// set if animated or there is an alternate frame set
 	// (this is an optimization in the renderer)
 	int animated;
-	// the current texture frames in animation
-	// (index with entity frame != 0)
-	struct texture_s *currentframe[2];
+	// the current texture frame in animation
+	struct texture_s *currentframe;
+	// current alpha of the texture
+	float currentalpha;
 }
 texture_t;
 
@@ -152,47 +156,53 @@ typedef struct surfmesh_s
 {
 	// can be multiple meshs per surface
 	struct surfmesh_s *chain;
-	int numverts;
-	int numtriangles;
-	float *verts;
-	float *svectors;
-	float *tvectors;
-	float *normals;
-	int *lightmapoffsets;
-	float *str;
-	float *uvw;
-	float *abc;
-	int *index;
-	int *triangleneighbors;
+	int numverts; // number of vertices in the mesh
+	int numtriangles; // number of triangles in the mesh
+	float *verts; // float[verts*4] vertex locations
+	float *svectors; // float[verts*4] direction of 'S' (right) texture axis for each vertex
+	float *tvectors; // float[verts*4] direction of 'T' (down) texture axis for each vertex
+	float *normals; // float[verts*4] direction of 'R' (out) texture axis for each vertex
+	int *lightmapoffsets; // index into surface's lightmap samples for vertex lighting
+	float *str; // float[verts*4] texcoords for surface texture
+	float *uvw; // float[verts*4] texcoords for lightmap texture
+	float *abc; // float[verts*4] texcoords for detail texture
+	int *index; // int[tris*3] triangles of the mesh, 3 indices into vertex arrays for each
+	int *triangleneighbors; // int[tris*3] neighboring triangle on each edge (-1 if none)
 }
 surfmesh_t;
 
 typedef struct msurface_s
 {
-	// surface number, to avoid having to do a divide to find the number of a surface from it's address
-	int number;
-	// should be drawn if visframe == r_framecount (set by PrepareSurfaces)
-	int visframe;
-	// should be drawn if onscreen and not a backface (used for setting visframe)
-	//int pvsframe;
-	// chain of surfaces marked visible by pvs
-	//struct msurface_s *pvschain;
+	// bounding box for onscreen checks
+	vec3_t poly_mins;
+	vec3_t poly_maxs;
 
 	// the node plane this is on, backwards if SURF_PLANEBACK flag set
 	mplane_t *plane;
 	// SURF_ flags
 	int flags;
-	// rendering chain
-	struct msurface_s *texturechain;
+	// texture mapping properties used by this surface
+	mtexinfo_t *texinfo;
 
-	// look up in model->surfedges[], negative numbers are backwards edges
-	int firstedge;
-	int numedges;
+	// the lightmap texture fragment to use on the rendering mesh
+	rtexture_t *lightmaptexture;
+	// mesh for rendering
+	surfmesh_t *mesh;
+	// if lightmap settings changed, this forces update
+	int cached_dlight;
 
-	short texturemins[2];
-	short extents[2];
+	// should be drawn if visframe == r_framecount (set by PrepareSurfaces)
+	int visframe;
+	// should be drawn if onscreen and not a backface (used for setting visframe)
+	//int pvsframe;
+	// chain of surfaces marked visible by pvs
+	//struct msurface_s *pvschain;
 
-	mtexinfo_t *texinfo;
+	// surface number, to avoid having to do a divide to find the number of a surface from it's address
+	int number;
+
+	// center for sorting transparent meshes
+	vec3_t poly_center;
 
 	// index into d_lightstylevalue array, 255 means not used (black)
 	qbyte styles[MAXLIGHTMAPS];
@@ -200,47 +210,28 @@ typedef struct msurface_s
 	qbyte *samples;
 	// stain to apply on lightmap (soot/dirt/blood/whatever)
 	qbyte *stainsamples;
-
-	// these fields are generated during model loading
-	// the lightmap texture fragment to use on the surface
-	rtexture_t *lightmaptexture;
 	// the stride when building lightmaps to comply with fragment update
 	int lightmaptexturestride;
-	// mesh for rendering
-	surfmesh_t *mesh;
+	int texturemins[2];
+	int extents[2];
+
+	// if this == r_framecount there are dynamic lights on the surface
+	int dlightframe;
+	// which dynamic lights are touching this surface
+	// (only access this if dlightframe is current)
+	int dlightbits[8];
+	// avoid redundent addition of dlights
+	int lightframe;
 
 	// these are just 3D points defining the outline of the polygon,
 	// no texcoord info (that can be generated from these)
 	int poly_numverts;
 	float *poly_verts;
-	// bounding box for onscreen checks, and center for sorting
-	vec3_t poly_mins, poly_maxs, poly_center;
-	// bounding sphere radius (around poly_center)
-	float poly_radius, poly_radius2;
 
 	// neighboring surfaces (one per poly_numverts)
-	struct msurface_s **neighborsurfaces;
+	//struct msurface_s **neighborsurfaces;
 	// currently used only for generating static shadow volumes
 	int castshadow;
-
-	// these are regenerated every frame
-	// lighting info
-	int dlightframe;
-	int dlightbits[8];
-	// avoid redundent addition of dlights
-	int lightframe;
-	// only render each surface once
-	//int worldnodeframe;
-
-	// these cause lightmap updates if regenerated
-	// values currently used in lightmap
-	unsigned short cached_light[MAXLIGHTMAPS];
-	// if lightmap was lit by dynamic lights, force update on next frame
-	short cached_dlight;
-	// to cause lightmap to be rerendered when v_overbrightbits changes
-	short cached_lightmapscalebit;
-	// rerender lightmaps when r_ambient changes
-	float cached_ambient;
 }
 msurface_t;
 
@@ -356,6 +347,7 @@ typedef struct mlight_s
 	// maximum extent of the light for culling purposes
 	float cullradius;
 	float cullradius2;
+	/*
 	// surfaces this shines on
 	int numsurfaces;
 	msurface_t **surfaces;
@@ -365,6 +357,7 @@ typedef struct mlight_s
 	//svbspmesh_t *shadowvolume;
 	//vec3_t shadowvolumemins, shadowvolumemaxs;
 	shadowmesh_t *shadowvolume;
+	*/
 }
 mlight_t;
 
@@ -379,6 +372,7 @@ void Mod_FindNonSolidLocation(vec3_t pos, struct model_s *mod);
 mleaf_t *Mod_PointInLeaf (const float *p, struct model_s *model);
 int Mod_PointContents (const float *p, struct model_s *model);
 qbyte *Mod_LeafPVS (mleaf_t *leaf, struct model_s *model);
+void Mod_BuildPVSTextureChains(struct model_s *model);
 
 #endif