X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=c845217d1d08f20b9ae3a91dbad594c36eaf6a94;hb=270f020888c5a03b98cc7752957243e6123c1132;hp=d164550d78b37c7f6c266d90ddeb29254df53a48;hpb=f847004b9818defbfd4bf15fe7b891fee2706079;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmain.c b/gl_rmain.c
index d164550d..c845217d 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -191,6 +191,7 @@ cvar_t r_glsl_postprocess_uservec2_enable = {CF_CLIENT | CF_ARCHIVE, "r_glsl_pos
 cvar_t r_glsl_postprocess_uservec3_enable = {CF_CLIENT | CF_ARCHIVE, "r_glsl_postprocess_uservec3_enable", "1", "enables postprocessing uservec3 usage, creates USERVEC1 define (only useful if default.glsl has been customized)"};
 cvar_t r_glsl_postprocess_uservec4_enable = {CF_CLIENT | CF_ARCHIVE, "r_glsl_postprocess_uservec4_enable", "1", "enables postprocessing uservec4 usage, creates USERVEC1 define (only useful if default.glsl has been customized)"};
 cvar_t r_colorfringe = {CF_CLIENT | CF_ARCHIVE, "r_colorfringe", "0", "Chromatic aberration. Values higher than 0.025 will noticeably distort the image"};
+cvar_t r_fxaa = {CF_CLIENT | CF_ARCHIVE, "r_fxaa", "0", "fast approximate anti aliasing"};
 
 cvar_t r_water = {CF_CLIENT | CF_ARCHIVE, "r_water", "0", "whether to use reflections and refraction on water surfaces (note: r_wateralpha must be set below 1)"};
 cvar_t r_water_cameraentitiesonly = {CF_CLIENT | CF_ARCHIVE, "r_water_cameraentitiesonly", "0", "whether to only show QC-defined reflections/refractions (typically used for camera- or portal-like effects)"};
@@ -3368,6 +3369,7 @@ void GL_Main_Init(void)
 	Cvar_RegisterVariable(&r_glsl_postprocess_uservec4_enable);
 	Cvar_RegisterVariable(&r_celshading);
 	Cvar_RegisterVariable(&r_celoutlines);
+	Cvar_RegisterVariable(&r_fxaa);
 
 	Cvar_RegisterVariable(&r_water);
 	Cvar_RegisterVariable(&r_water_cameraentitiesonly);
@@ -3447,6 +3449,7 @@ void Render_Init(void)
 	R_Particles_Init();
 	R_Explosion_Init();
 	R_LightningBeams_Init();
+	CL_MeshEntities_Init();
 	Mod_RenderInit();
 }
 
@@ -3959,13 +3962,13 @@ qbool R_CanSeeBox(int numsamples, vec_t eyejitter, vec_t entboxenlarge, vec_t en
 	if (BoxesOverlap(boxmins, boxmaxs, eyemins, eyemaxs))
 		return true;
 
+	VectorCopy(eye, start);
 	// try specific positions in the box first - note that these can be cached
 	if (r_cullentities_trace_entityocclusion.integer)
 	{
 		for (i = 0; i < sizeof(positions) / sizeof(positions[0]); i++)
 		{
 			trace_t trace;
-			VectorCopy(eye, start);
 			end[0] = boxmins[0] + (boxmaxs[0] - boxmins[0]) * positions[i][0];
 			end[1] = boxmins[1] + (boxmaxs[1] - boxmins[1]) * positions[i][1];
 			end[2] = boxmins[2] + (boxmaxs[2] - boxmins[2]) * positions[i][2];
@@ -3976,8 +3979,13 @@ qbool R_CanSeeBox(int numsamples, vec_t eyejitter, vec_t entboxenlarge, vec_t en
 				return true;
 		}
 	}
-	else if (model->brush.TraceLineOfSight(model, start, end, padmins, padmaxs))
-		return true;
+	else
+	{
+		// try center
+		VectorMAM(0.5f, boxmins, 0.5f, boxmaxs, end);
+		if (model->brush.TraceLineOfSight(model, start, end, padmins, padmaxs))
+			return true;
+	}
 
 	// try various random positions
 	for (j = 0; j < numsamples; j++)