merged q1bsp and q3bsp surface rendering

[xonotic/darkplaces.git] / r_light.h

diff --git a/r_light.h b/r_light.h
index a3c7066e26fbe81c9177f3b8d948109f2fc57ca8..6020c915a8ce9f701f7c19b89df02f748db4d0fc 100644 (file)
--- a/r_light.h
+++ b/r_light.h
@@ -2,34 +2,13 @@
 #ifndef R_LIGHT_H
 #define R_LIGHT_H
 
 #ifndef R_LIGHT_H
 #define R_LIGHT_H
 

-typedef struct
-{
-       vec3_t origin;
-       vec_t cullradius2; // only for culling comparisons, squared version
-       vec3_t light; // the brightness of the light
-       vec_t cullradius; // only for culling comparisons
-       vec_t subtract; // to avoid sudden brightness change at cullradius, subtract this
-       entity_render_t *ent; // owner of this light
-
-       matrix4x4_t matrix_lighttoworld;
-       matrix4x4_t matrix_worldtolight;
-       matrix4x4_t matrix_worldtoattenuationxyz;
-       matrix4x4_t matrix_worldtoattenuationz;
-
-       vec3_t color;
-       vec_t radius;
-       int cubemapnum;
-       int shadow;
-       vec_t corona;
-}
-rdlight_t;
-

 extern int r_numdlights;
 extern int r_numdlights;

-extern rdlight_t r_dlight[MAX_DLIGHTS];
+extern dlight_t r_dlight[MAX_DLIGHTS];

 
 

-void R_BuildLightList(void);
-void R_AnimateLight(void);
+void R_UpdateLights(void);
+#ifdef LHREMOVESOON

 void R_MarkLights(entity_render_t *ent);
 void R_MarkLights(entity_render_t *ent);

+#endif

 void R_DrawCoronas(void);
 void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic, const mleaf_t *leaf);
 int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, const entity_render_t *ent, float colorr, float colorg, float colorb, float colora, int worldcoords);
 void R_DrawCoronas(void);
 void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic, const mleaf_t *leaf);
 int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, const entity_render_t *ent, float colorr, float colorg, float colorb, float colora, int worldcoords);