changed cl_brushmodel_entities array from entity_render_t * to int, to fix a crash...

[xonotic/darkplaces.git] / r_light.c

diff --git a/r_light.c b/r_light.c
index 0dc8bee068c68829de1e25168317985353f2b90e..42a50e308aefc29edac4c6613f009ee7a750070b 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -29,7 +29,7 @@ int r_numdlights = 0;
 cvar_t r_modellights = {CVAR_SAVE, "r_modellights", "4"};
 cvar_t r_vismarklights = {0, "r_vismarklights", "1"};
 cvar_t r_coronas = {CVAR_SAVE, "r_coronas", "1"};
-cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "1"};
+cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0"};
 
 static rtexture_t *lightcorona;
 static rtexturepool_t *lighttexturepool;
@@ -164,120 +164,6 @@ void R_DrawCoronas(void)
 /*
 =============================================================================
 
-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, 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->contents >= 0)
-       {
-               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, 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->nummarksurfaces && (i >= pvsbits || CHECKPVSBIT(pvs, i)))
-       {
-               int *surfacepvsframes, d, impacts, impactt;
-               float sdist, maxdist, dist2, impact[3];
-               msurface_t *surf;
-               // mark the polygons
-               maxdist = light->rtlight.lightmap_cullradius2;
-               surfacepvsframes = ent->model->brushq1.surfacepvsframes;
-               for (i = 0;i < leaf->nummarksurfaces;i++)
-               {
-                       if (surfacepvsframes[leaf->firstmarksurface[i]] != ent->model->brushq1.pvsframecount)
-                               continue;
-                       surf = ent->model->brushq1.surfaces + leaf->firstmarksurface[i];
-                       dist = sdist = PlaneDiff(lightorigin, surf->plane);
-                       if (surf->flags & SURF_PLANEBACK)
-                               dist = -dist;
-
-                       if (dist < -0.25f && !(surf->flags & SURF_LIGHTBOTHSIDES))
-                               continue;
-
-                       dist2 = dist * dist;
-                       if (dist2 >= maxdist)
-                               continue;
-
-                       VectorCopy(lightorigin, impact);
-                       if (surf->plane->type >= 3)
-                               VectorMA(impact, -sdist, surf->plane->normal, impact);
-                       else
-                               impact[surf->plane->type] -= sdist;
-
-                       impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
-
-                       d = bound(0, impacts, surf->extents[0] + 16) - impacts;
-                       dist2 += d * d;
-                       if (dist2 > maxdist)
-                               continue;
-
-                       impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
-
-                       d = bound(0, impactt, surf->extents[1] + 16) - impactt;
-                       dist2 += d * d;
-                       if (dist2 > maxdist)
-                               continue;
-
-                       if (surf->dlightframe != r_framecount) // not dynamic until now
-                       {
-                               surf->dlightbits[0] = surf->dlightbits[1] = surf->dlightbits[2] = surf->dlightbits[3] = surf->dlightbits[4] = surf->dlightbits[5] = surf->dlightbits[6] = surf->dlightbits[7] = 0;
-                               surf->dlightframe = r_framecount;
-                               surf->cached_dlight = true;
-                       }
-                       surf->dlightbits[bitindex] |= bit;
-               }
-       }
-}
-
-void R_MarkLights(entity_render_t *ent)
-{
-       int i, bit, bitindex;
-       dlight_t *light;
-       vec3_t lightorigin;
-       if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brushq1.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);
-                       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, light, bit, bitindex, ent->model->brushq1.nodes + ent->model->brushq1.hulls[0].firstclipnode, lightpvs, min(lightpvsbytes * 8, ent->model->brush.num_pvsclusters));
-               }
-       }
-}
-
-/*
-=============================================================================
-
 LIGHT SAMPLING
 
 =============================================================================