cleaned up R_RenderView setup code a bit, and shuffled SCR_CalcRefdef stuff to SCR_Up...

[xonotic/darkplaces.git] / r_light.h

diff --git a/r_light.h b/r_light.h
index 9a264c9428fba804966c0eb7b5ac1e226531ed12..5c7c116b74148adef7e245dcec516b07bcf4836b 100644 (file)
--- a/r_light.h
+++ b/r_light.h
@@ -1,21 +1,39 @@
 
+#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 lightsubtract; // to avoid sudden brightness change at cullradius, subtract this
+       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 rdlight_t r_dlight[MAX_DLIGHTS];
 
-void R_BuildLightList(void);
-void R_AnimateLight(void);
-void R_MarkLights(void);
+void R_UpdateLights(void);
+void R_MarkLights(entity_render_t *ent);
 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
+