X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=3510db724886b3ac8da1af71b6b4accadd26ac79;hb=57d978aa0a0c0a2bf4e89e74760c5855b03b01c1;hp=4ba71dc8df933248cc2c7fb501a57e21280dbc42;hpb=4b2c4ce4eabdbba55cb94a0b23122e447ec42782;p=xonotic%2Fdarkplaces.git

diff --git a/r_light.c b/r_light.c
index 4ba71dc8..3510db72 100644
--- a/r_light.c
+++ b/r_light.c
@@ -75,37 +75,55 @@ void R_Light_Init(void)
 void R_DrawCoronas(void)
 {
 	int i, lnum, flag;
-	float cscale, scale, viewdist, dist;
+	float cscale, scale;
 	dlight_t *light;
 	rtlight_t *rtlight;
-	if (r_coronas.value < 0.01)
+	if (r_coronas.value < (1.0f / 256.0f) && !gl_flashblend.integer)
 		return;
 	R_Mesh_Matrix(&identitymatrix);
-	viewdist = DotProduct(r_view.origin, r_view.forward);
 	flag = r_refdef.rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE;
+	// FIXME: these traces should scan all render entities instead of cl.world
 	for (lnum = 0, light = r_shadow_worldlightchain;light;light = light->next, lnum++)
 	{
-		if ((light->flags & flag) && light->corona * r_coronas.value > 0 && (r_shadow_debuglight.integer < 0 || r_shadow_debuglight.integer == lnum) && (dist = (DotProduct(light->rtlight.shadoworigin, r_view.forward) - viewdist)) >= 24.0f && CL_TraceBox(light->rtlight.shadoworigin, vec3_origin, vec3_origin, r_view.origin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1)
-		{
-			cscale = light->rtlight.corona * r_coronas.value * 0.25f;
-			scale = light->rtlight.radius * light->rtlight.coronasizescale;
-			R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, true, light->rtlight.shadoworigin, r_view.right, r_view.up, scale, -scale, -scale, scale, light->rtlight.color[0] * cscale, light->rtlight.color[1] * cscale, light->rtlight.color[2] * cscale, 1);
-		}
+		rtlight = &light->rtlight;
+		if (!(rtlight->flags & flag))
+			continue;
+		if (rtlight->corona * r_coronas.value <= 0)
+			continue;
+		if (r_shadow_debuglight.integer >= 0 && r_shadow_debuglight.integer != lnum)
+			continue;
+		cscale = rtlight->corona * r_coronas.value* 0.25f;
+		scale = rtlight->radius * rtlight->coronasizescale;
+		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)
+			continue;
+		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++)
 	{
 		rtlight = &r_refdef.lights[i];
-		if ((rtlight->flags & flag) && rtlight->corona * r_coronas.value > 0 && (dist = (DotProduct(rtlight->shadoworigin, r_view.forward) - viewdist)) >= 24.0f && CL_TraceBox(rtlight->shadoworigin, vec3_origin, vec3_origin, r_view.origin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1)
+		if (!(rtlight->flags & flag))
+			continue;
+		if (rtlight->corona <= 0)
+			continue;
+		if (VectorDistance2(rtlight->shadoworigin, r_view.origin) < 32.0f * 32.0f)
+			continue;
+		if (gl_flashblend.integer)
+		{
+			cscale = rtlight->corona * 1.0f;
+			scale = rtlight->radius * rtlight->coronasizescale * 2.0f;
+		}
+		else
 		{
-			cscale = rtlight->corona * r_coronas.value * 0.25f;
+			cscale = rtlight->corona * r_coronas.value* 0.25f;
 			scale = rtlight->radius * rtlight->coronasizescale;
-			if (gl_flashblend.integer)
-			{
-				cscale *= 4.0f;
-				scale *= 2.0f;
-			}
-			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);
 		}
+		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)
+			continue;
+		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);
 	}
 }
 
@@ -140,7 +158,7 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu
 			light = &r_refdef.lights[i];
 			Matrix4x4_Transform(&light->matrix_worldtolight, p, v);
 			f = 1 - VectorLength2(v);
-			if (f > 0 && CL_TraceBox(p, vec3_origin, vec3_origin, light->shadoworigin, false, NULL, SUPERCONTENTS_SOLID, false).fraction == 1)
+			if (f > 0 && CL_Move(p, vec3_origin, vec3_origin, light->shadoworigin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false).fraction == 1)
 				VectorMA(ambientcolor, f, light->currentcolor, ambientcolor);
 		}
 	}