X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_light.h;h=6020c915a8ce9f701f7c19b89df02f748db4d0fc;hp=9a264c9428fba804966c0eb7b5ac1e226531ed12;hb=c651b263f8a63fa5846df832051d4f5658680a03;hpb=12d41dc109d083ea965d53d2c35aec6ecd246691;ds=sidebyside

diff --git a/r_light.h b/r_light.h
index 9a264c94..6020c915 100644
--- a/r_light.h
+++ b/r_light.h
@@ -1,21 +1,19 @@
 
-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 lightsubtract; // to avoid sudden brightness change at cullradius, subtract this
-	entity_render_t *ent; // owner of this light
-}
-rdlight_t;
+#ifndef R_LIGHT_H
+#define R_LIGHT_H
 
 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_MarkLights(void);
+void R_UpdateLights(void);
+#ifdef LHREMOVESOON
+void R_MarkLights(entity_render_t *ent);
+#endif
 void R_DrawCoronas(void);
-void R_CompleteLightPoint(vec3_t color, vec3_t p, int dynamic, mleaf_t *leaf);
-void R_LightModel(int numverts);
+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_LightModel_CalcVertexColors(const float *ambientcolor4f, const float *diffusecolor, const float *diffusenormal, int numverts, const float *vertex3f, const float *normal3f, float *color4f);
+void R_UpdateEntLights(entity_render_t *ent);
+
+#endif
+