Removed a potential buffer overflow and factorized some code

[xonotic/darkplaces.git] / r_shadow.h

diff --git a/r_shadow.h b/r_shadow.h
index 20a3f3606bb083eb1e729418985dfa1361d92f84..2e1a9d4cac078f34febd0bbb2a78de217ef2419a 100644 (file)
--- a/r_shadow.h
+++ b/r_shadow.h
@@ -11,6 +11,7 @@ extern cvar_t r_shadow_gloss;
 extern cvar_t r_shadow_debuglight;
 extern cvar_t r_shadow_bumpscale_bumpmap;
 extern cvar_t r_shadow_bumpscale_basetexture;
+extern cvar_t r_shadow_shadows;
 
 void R_Shadow_Init(void);
 void R_Shadow_Volume(int numverts, int numtris, const float *invertex3f, int *elements, int *neighbors, vec3_t relativelightorigin, float lightradius, float projectdistance);
@@ -25,7 +26,6 @@ void R_Shadow_Stage_ShadowVolumes(void);
 void R_Shadow_Stage_LightWithShadows(void);
 void R_Shadow_Stage_LightWithoutShadows(void);
 void R_Shadow_Stage_End(void);
-//int R_Shadow_ScissorForBBoxAndSphere(const float *mins, const float *maxs, const float *origin, float radius);
 int R_Shadow_ScissorForBBox(const float *mins, const float *maxs);
 
 typedef struct worldlight_s
@@ -55,14 +55,13 @@ typedef struct worldlight_s
        vec3_t maxs;
        vec_t cullradius;
        struct worldlight_s *next;
-       msurface_t **surfaces;
-       int numsurfaces;
-       mleaf_t **leafs;
-       int numleafs;
        rtexture_t *cubemap;
        int style;
-       shadowmesh_t *shadowvolume;
        int selected;
+
+       // premade shadow volumes and lit surfaces to render
+       shadowmesh_t *meshchain_shadow;
+       shadowmesh_t *meshchain_light;
 }
 worldlight_t;
 
@@ -70,4 +69,7 @@ extern worldlight_t *r_shadow_worldlightchain;
 
 void R_Shadow_UpdateWorldLightSelection(void);
 
+void R_Shadow_DrawStaticWorldLight_Shadow(worldlight_t *light, matrix4x4_t *matrix);
+void R_Shadow_DrawStaticWorldLight_Light(worldlight_t *light, matrix4x4_t *matrix, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
+
 #endif