X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=29fa6cb69582332485e296b66f547b23f4d0029c;hb=2616da26cb879576841532c32923b1fe938f0de0;hp=86326396fc51113f0fd3987a9d7bffed031984ad;hpb=ae1b6c2bb0e51f2c07a559baed1b24d49ec7ef83;p=xonotic%2Fdarkplaces.git diff --git a/r_light.c b/r_light.c index 86326396..29fa6cb6 100644 --- a/r_light.c +++ b/r_light.c @@ -94,11 +94,11 @@ void R_DrawCoronas(void) continue; cscale = rtlight->corona * r_coronas.value* 0.25f; scale = rtlight->radius * rtlight->coronasizescale; - if (VectorDistance2(rtlight->shadoworigin, r_view.origin) < 32.0f * 32.0f) + if (VectorDistance2(rtlight->shadoworigin, r_view.origin) < 16.0f * 16.0f) continue; - if (CL_Move(rtlight->shadoworigin, vec3_origin, vec3_origin, r_view.origin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false).fraction < 1) + if (CL_Move(r_view.origin, vec3_origin, vec3_origin, rtlight->shadoworigin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false).fraction < 1) continue; - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, true, rtlight->shadoworigin, r_view.right, r_view.up, scale, -scale, -scale, scale, rtlight->color[0] * cscale, rtlight->color[1] * cscale, rtlight->color[2] * cscale, 1); + R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, true, false, rtlight->shadoworigin, r_view.right, r_view.up, scale, -scale, -scale, scale, rtlight->color[0] * cscale, rtlight->color[1] * cscale, rtlight->color[2] * cscale, 1); } for (i = 0;i < r_refdef.numlights;i++) { @@ -107,7 +107,7 @@ void R_DrawCoronas(void) continue; if (rtlight->corona <= 0) continue; - if (VectorDistance2(rtlight->shadoworigin, r_view.origin) < 16.0f * 16.0f) + if (VectorDistance2(rtlight->shadoworigin, r_view.origin) < 32.0f * 32.0f) continue; if (gl_flashblend.integer) { @@ -121,9 +121,9 @@ void R_DrawCoronas(void) } if (VectorLength(rtlight->color) * cscale < (1.0f / 256.0f)) continue; - if (CL_Move(rtlight->shadoworigin, vec3_origin, vec3_origin, r_view.origin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false).fraction < 1) + if (CL_Move(r_view.origin, vec3_origin, vec3_origin, rtlight->shadoworigin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false).fraction < 1) continue; - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, true, rtlight->shadoworigin, r_view.right, r_view.up, scale, -scale, -scale, scale, rtlight->color[0] * cscale, rtlight->color[1] * cscale, rtlight->color[2] * cscale, 1); + R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, true, false, rtlight->shadoworigin, r_view.right, r_view.up, scale, -scale, -scale, scale, rtlight->color[0] * cscale, rtlight->color[1] * cscale, rtlight->color[2] * cscale, 1); } }