X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=8a2deeb8227e79ccb1243ea11a95fa7516add2fc;hb=7af96fa3f500f70e1869316d201cdc4d31fbb75f;hp=00eadd228627381a66dab5a7ae5db03ca63a1211;hpb=d9c2443445df49c61e0107ebcb7e5dc06d978b6c;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index 00eadd22..8a2deeb8 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -195,6 +195,11 @@ typedef struct texture_s
 	int numskinframes;
 	float skinframerate;
 	skinframe_t skinframes[TEXTURE_MAXFRAMES];
+	// background layer (for terrain texture blending)
+	skinframe_t *backgroundcurrentskinframe;
+	int backgroundnumskinframes;
+	float backgroundskinframerate;
+	skinframe_t backgroundskinframes[TEXTURE_MAXFRAMES];
 
 	// total frames in sequence and alternate sequence
 	int anim_total[2];
@@ -215,6 +220,8 @@ typedef struct texture_s
 	qboolean colormapping;
 	rtexture_t *basetexture;
 	rtexture_t *glosstexture;
+	rtexture_t *backgroundbasetexture;
+	rtexture_t *backgroundglosstexture;
 	float specularscale;
 	float specularpower;
 
@@ -394,6 +401,8 @@ typedef struct model_brush_s
 	rtexture_t *solidskytexture;
 	rtexture_t *alphaskytexture;
 
+	qboolean supportwateralpha;
+
 	// QuakeWorld
 	int qw_md4sum;
 	int qw_md4sum2;
@@ -575,9 +584,9 @@ typedef struct model_s
 	// gathers info on which clusters and surfaces are lit by light, as well as calculating a bounding box
 	void(*GetLightInfo)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer);
 	// compile a shadow volume for the model based on light source
-	void(*CompileShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
+	void(*CompileShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist);
 	// draw a shadow volume for the model based on light source
-	void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
+	void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
 	// draw the lighting on a model (through stencil)
 	void(*DrawLight)(struct entity_render_s *ent, int numsurfaces, const int *surfacelist);
 	// trace a box against this model
@@ -677,8 +686,8 @@ struct entity_render_s;
 void R_Q1BSP_DrawSky(struct entity_render_s *ent);
 void R_Q1BSP_Draw(struct entity_render_s *ent);
 void R_Q1BSP_GetLightInfo(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer);
-void R_Q1BSP_CompileShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
-void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
+void R_Q1BSP_CompileShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist);
+void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
 void R_Q1BSP_DrawLight(struct entity_render_s *ent, int numsurfaces, const int *surfacelist);
 
 // alias models