diff --git a/nq/source/gl_rlight.c b/nq/source/gl_rlight.c index 07eefd2e5..c1b9d4c85 100644 --- a/nq/source/gl_rlight.c +++ b/nq/source/gl_rlight.c @@ -43,15 +43,12 @@ #include "glquake.h" #include "r_shared.h" -/* - R_AnimateLight -*/ + void R_AnimateLight (void) { int i, j, k; -// // light animations // 'm' is normal light, 'a' is no light, 'z' is double bright i = (int) (cl.time * 10); @@ -67,10 +64,12 @@ R_AnimateLight (void) } } + /* DYNAMIC LIGHTS BLEND RENDERING */ + void AddLightBlend (float r, float g, float b, float a2) { @@ -86,6 +85,7 @@ AddLightBlend (float r, float g, float b, float a2) //Con_Printf("AddLightBlend(): %4.2f %4.2f %4.2f %4.6f\n", v_blend[0], v_blend[1], v_blend[2], v_blend[3]); } + float bubble_sintable[33], bubble_costable[33]; void @@ -105,6 +105,7 @@ R_InitBubble () } } + void R_RenderDlight (dlight_t *light) { @@ -151,9 +152,7 @@ R_RenderDlight (dlight_t *light) glEnd (); } -/* - R_RenderDlights -*/ + void R_RenderDlights (void) { @@ -188,9 +187,7 @@ R_RenderDlights (void) DYNAMIC LIGHTS */ -/* - R_MarkLights -*/ + // LordHavoc: heavily modified, to eliminate unnecessary texture uploads, // and support bmodel lighting better void @@ -283,9 +280,7 @@ loc0: } } -/* - R_PushDlights -*/ + void R_PushDlights (vec3_t entorigin) { @@ -410,6 +405,7 @@ RecursiveLightPoint (mnode_t *node, vec3_t start, vec3_t end) return RecursiveLightPoint (node->children[!side], mid, end); } + int R_LightPoint (vec3_t p) { diff --git a/qw/source/gl_rlight.c b/qw/source/gl_rlight.c index 07eefd2e5..7ab499ff8 100644 --- a/qw/source/gl_rlight.c +++ b/qw/source/gl_rlight.c @@ -43,15 +43,13 @@ #include "glquake.h" #include "r_shared.h" -/* - R_AnimateLight -*/ + void R_AnimateLight (void) { int i, j, k; -// + // light animations // 'm' is normal light, 'a' is no light, 'z' is double bright i = (int) (cl.time * 10); @@ -67,10 +65,12 @@ R_AnimateLight (void) } } + /* DYNAMIC LIGHTS BLEND RENDERING */ + void AddLightBlend (float r, float g, float b, float a2) { @@ -86,6 +86,7 @@ AddLightBlend (float r, float g, float b, float a2) //Con_Printf("AddLightBlend(): %4.2f %4.2f %4.2f %4.6f\n", v_blend[0], v_blend[1], v_blend[2], v_blend[3]); } + float bubble_sintable[33], bubble_costable[33]; void @@ -105,6 +106,7 @@ R_InitBubble () } } + void R_RenderDlight (dlight_t *light) { @@ -151,9 +153,7 @@ R_RenderDlight (dlight_t *light) glEnd (); } -/* - R_RenderDlights -*/ + void R_RenderDlights (void) { @@ -188,9 +188,7 @@ R_RenderDlights (void) DYNAMIC LIGHTS */ -/* - R_MarkLights -*/ + // LordHavoc: heavily modified, to eliminate unnecessary texture uploads, // and support bmodel lighting better void @@ -283,9 +281,7 @@ loc0: } } -/* - R_PushDlights -*/ + void R_PushDlights (vec3_t entorigin) { @@ -311,6 +307,7 @@ R_PushDlights (vec3_t entorigin) LIGHT SAMPLING */ + mplane_t *lightplane; vec3_t lightspot; @@ -410,6 +407,7 @@ RecursiveLightPoint (mnode_t *node, vec3_t start, vec3_t end) return RecursiveLightPoint (node->children[!side], mid, end); } + int R_LightPoint (vec3_t p) {