X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=r_light.h;h=ea1e525aa1abd1d936964beba38a73386f506065;hb=6e5e2170b2b4746be89fb3d736a2d23bad682717;hp=026a4ec0f8df2efff7907c250bc19998f03c49df;hpb=cf93d91077855abf71419763e56bc774bc3b244f;p=xonotic%2Fdarkplaces.git

diff --git a/r_light.h b/r_light.h
index 026a4ec0..ea1e525a 100644
--- a/r_light.h
+++ b/r_light.h
@@ -2,26 +2,15 @@
 #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
-}
-rdlight_t;
-
 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(entity_render_t *ent);
+void R_UpdateLights(void);
 void R_DrawCoronas(void);
-void R_CompleteLightPoint(vec3_t color, vec3_t p, int dynamic, mleaf_t *leaf);
-void R_LightModel(entity_render_t *ent, int numverts, float colorr, float colorg, float colorb, int worldcoords);
+void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic);
+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