X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=42a50e308aefc29edac4c6613f009ee7a750070b;hb=ea1a30a140048d0ef4c9023d4804bfa57eba9fa8;hp=4e7d51fa5b44ae5c8aac96ca3909c2a483010c85;hpb=c651b263f8a63fa5846df832051d4f5658680a03;p=xonotic%2Fdarkplaces.git

diff --git a/r_light.c b/r_light.c
index 4e7d51fa..42a50e30 100644
--- a/r_light.c
+++ b/r_light.c
@@ -161,152 +161,6 @@ void R_DrawCoronas(void)
 	}
 }
 
-#ifdef LHREMOVESOON
-/*
-=============================================================================
-
-DYNAMIC LIGHTS
-
-=============================================================================
-*/
-
-static int lightpvsbytes;
-static qbyte lightpvs[(MAX_MAP_LEAFS+7)>>3];
-
-/*
-=============
-R_MarkLights
-=============
-*/
-static void R_RecursiveMarkLights(entity_render_t *ent, vec3_t lightorigin, vec3_t lightmins, vec3_t lightmaxs, dlight_t *light, int bit, int bitindex, mnode_t *node, qbyte *pvs, int pvsbits)
-{
-	int i;
-	mleaf_t *leaf;
-	float dist;
-
-	// for comparisons to minimum acceptable light
-	while(node->plane)
-	{
-		dist = PlaneDiff(lightorigin, node->plane);
-		if (dist > light->rtlight.lightmap_cullradius)
-			node = node->children[0];
-		else
-		{
-			if (dist >= -light->rtlight.lightmap_cullradius)
-				R_RecursiveMarkLights(ent, lightorigin, lightmins, lightmaxs, light, bit, bitindex, node->children[0], pvs, pvsbits);
-			node = node->children[1];
-		}
-	}
-
-	// check if leaf is visible according to pvs
-	leaf = (mleaf_t *)node;
-	i = leaf->clusterindex;
-	if (leaf->numleafsurfaces && (i >= pvsbits || CHECKPVSBIT(pvs, i)))
-	{
-		int d, impacts, impactt;
-		float sdist, maxdist, dist2, impact[3], planenormal[3], planedist;
-		msurface_t *surface;
-		// mark the polygons
-		maxdist = light->rtlight.lightmap_cullradius2;
-		for (i = 0;i < leaf->numleafsurfaces;i++)
-		{
-			// note: this is only called on the worldmodel
-			if (r_worldsurfacevisible[leaf->firstleafsurface[i]])
-				continue;
-			surface = ent->model->brush.data_surfaces + leaf->firstleafsurface[i];
-			if (!BoxesOverlap(surface->mins, surface->maxs, lightmins, lightmaxs))
-				continue;
-
-			// do q1bsp culling checks only if it is a q1bsp surface
-			if (surface->samples && surface->texinfo)
-			{
-				VectorNegate(surface->mesh.data_normal3f, planenormal);
-				planedist = DotProduct(surface->mesh.data_vertex3f, planenormal);
-				dist = sdist = DotProduct(lightorigin, planenormal) - planedist;
-
-				if (dist < -0.25f && !(surface->texture->currentmaterialflags & MATERIALFLAG_LIGHTBOTHSIDES))
-					continue;
-
-				dist2 = dist * dist;
-				if (dist2 >= maxdist)
-					continue;
-
-				VectorCopy(lightorigin, impact);
-				VectorMA(impact, -sdist, planenormal, impact);
-
-				impacts = DotProduct (impact, surface->texinfo->vecs[0]) + surface->texinfo->vecs[0][3] - surface->texturemins[0];
-
-				d = bound(0, impacts, surface->extents[0] + 16) - impacts;
-				dist2 += d * d;
-				if (dist2 > maxdist)
-					continue;
-
-				impactt = DotProduct (impact, surface->texinfo->vecs[1]) + surface->texinfo->vecs[1][3] - surface->texturemins[1];
-
-				d = bound(0, impactt, surface->extents[1] + 16) - impactt;
-				dist2 += d * d;
-				if (dist2 > maxdist)
-					continue;
-			}
-
-			if (surface->dlightframe != r_framecount) // not dynamic until now
-			{
-				surface->dlightbits[0] = surface->dlightbits[1] = surface->dlightbits[2] = surface->dlightbits[3] = surface->dlightbits[4] = surface->dlightbits[5] = surface->dlightbits[6] = surface->dlightbits[7] = 0;
-				surface->dlightframe = r_framecount;
-				surface->cached_dlight = true;
-			}
-			surface->dlightbits[bitindex] |= bit;
-		}
-	}
-}
-
-void R_MarkLights(entity_render_t *ent)
-{
-	int i, j, bit, bitindex;
-	dlight_t *light;
-	vec3_t lightorigin, lightmins, lightmaxs;
-	if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brush.num_leafs)
-	{
-		for (i = 0, light = r_dlight;i < r_numdlights;i++, light++)
-		{
-			bit = 1 << (i & 31);
-			bitindex = i >> 5;
-			Matrix4x4_Transform(&ent->inversematrix, light->origin, lightorigin);
-			lightmins[0] = lightorigin[0] - light->rtlight.lightmap_cullradius;
-			lightmins[1] = lightorigin[1] - light->rtlight.lightmap_cullradius;
-			lightmins[2] = lightorigin[2] - light->rtlight.lightmap_cullradius;
-			lightmaxs[0] = lightorigin[0] + light->rtlight.lightmap_cullradius;
-			lightmaxs[1] = lightorigin[1] + light->rtlight.lightmap_cullradius;
-			lightmaxs[2] = lightorigin[2] + light->rtlight.lightmap_cullradius;
-			if (ent == r_refdef.worldentity)
-			{
-				lightpvsbytes = 0;
-				if (r_vismarklights.integer && ent->model->brush.FatPVS)
-					lightpvsbytes = ent->model->brush.FatPVS(ent->model, lightorigin, 0, lightpvs, sizeof(lightpvs));
-				R_RecursiveMarkLights(ent, lightorigin, lightmins, lightmaxs, light, bit, bitindex, ent->model->brush.data_nodes, lightpvs, min(lightpvsbytes * 8, ent->model->brush.num_pvsclusters));
-			}
-			else
-			{
-				msurface_t *surface;
-				for (j = 0, surface = ent->model->brush.data_surfaces + ent->model->firstmodelsurface;j < ent->model->nummodelsurfaces;j++, surface++)
-				{
-					if (BoxesOverlap(surface->mins, surface->maxs, lightmins, lightmaxs))
-					{
-						if (surface->dlightframe != r_framecount) // not dynamic until now
-						{
-							surface->dlightbits[0] = surface->dlightbits[1] = surface->dlightbits[2] = surface->dlightbits[3] = surface->dlightbits[4] = surface->dlightbits[5] = surface->dlightbits[6] = surface->dlightbits[7] = 0;
-							surface->dlightframe = r_framecount;
-							surface->cached_dlight = true;
-						}
-						surface->dlightbits[bitindex] |= bit;
-					}
-				}
-			}
-		}
-	}
-}
-#endif
-
 /*
 =============================================================================