X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_light.c;h=83d9630332d4df5b781367afba412facf193eaef;hp=b24c4d3d0153087735107d0ffd75871de3c5f9bc;hb=af0dcabc0e2b5e187cc9182015b612d5ae4efb0b;hpb=b49e92062e402ecdc1a7407d942bfd7252c4426d diff --git a/r_light.c b/r_light.c index b24c4d3d..83d96303 100644 --- a/r_light.c +++ b/r_light.c @@ -138,7 +138,7 @@ void R_DrawCoronas(void) flag = r_rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE; 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_viewforward) - viewdist)) >= 24.0f && CL_TraceLine(light->rtlight.shadoworigin, r_vieworigin, NULL, NULL, true, NULL, SUPERCONTENTS_SOLID) == 1) + 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_viewforward) - viewdist)) >= 24.0f && CL_TraceBox(light->rtlight.shadoworigin, vec3_origin, vec3_origin, r_vieworigin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1) { cscale = light->rtlight.corona * r_coronas.value * 0.25f; scale = light->rtlight.radius * light->rtlight.coronasizescale; @@ -147,7 +147,7 @@ void R_DrawCoronas(void) } for (i = 0, light = r_dlight;i < r_numdlights;i++, light++) { - if ((light->flags & flag) && light->corona * r_coronas.value > 0 && (dist = (DotProduct(light->origin, r_viewforward) - viewdist)) >= 24.0f && CL_TraceLine(light->origin, r_vieworigin, NULL, NULL, true, NULL, SUPERCONTENTS_SOLID) == 1) + if ((light->flags & flag) && light->corona * r_coronas.value > 0 && (dist = (DotProduct(light->origin, r_viewforward) - viewdist)) >= 24.0f && CL_TraceBox(light->origin, vec3_origin, vec3_origin, r_vieworigin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1) { cscale = light->corona * r_coronas.value * 0.25f; scale = light->rtlight.radius * light->rtlight.coronasizescale; @@ -164,125 +164,12 @@ 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->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, 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]; - msurface_t *surface; - // mark the polygons - maxdist = light->rtlight.lightmap_cullradius2; - for (i = 0;i < leaf->numleafsurfaces;i++) - { - if (ent == r_refdef.worldentity && !r_worldsurfacevisible[leaf->firstleafsurface[i]]) - continue; - surface = ent->model->brushq1.surfaces + leaf->firstleafsurface[i]; - dist = sdist = PlaneDiff(lightorigin, surface->plane); - if (surface->flags & SURF_PLANEBACK) - dist = -dist; - - if (dist < -0.25f && !(surface->flags & SURF_LIGHTBOTHSIDES)) - continue; - - dist2 = dist * dist; - if (dist2 >= maxdist) - continue; - - VectorCopy(lightorigin, impact); - if (surface->plane->type >= 3) - VectorMA(impact, -sdist, surface->plane->normal, impact); - else - impact[surface->plane->type] -= sdist; - - 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, bit, bitindex; - dlight_t *light; - vec3_t lightorigin; - 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); - 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->brush.data_nodes + ent->model->brushq1.hulls[0].firstclipnode, lightpvs, min(lightpvsbytes * 8, ent->model->brush.num_pvsclusters)); - } - } -} - -/* -============================================================================= - LIGHT SAMPLING ============================================================================= */ -void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic, const mleaf_t *leaf) +void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic) { VectorClear(diffusecolor); VectorClear(diffusenormal); @@ -309,7 +196,7 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu { VectorSubtract (p, sl->origin, v); f = ((1.0f / (DotProduct(v, v) * sl->falloff + sl->distbias)) - sl->subtract); - if (f > 0 && CL_TraceLine(p, sl->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) == 1) + if (f > 0 && CL_TraceBox(p, vec3_origin, vec3_origin, sl->origin, false, NULL, SUPERCONTENTS_SOLID, false).fraction == 1) { f *= d_lightstylevalue[sl->style] * (1.0f / 65536.0f); VectorMA(ambientcolor, f, sl->light, ambientcolor); @@ -329,7 +216,7 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu light = r_dlight + i; VectorSubtract(p, light->origin, v); f = DotProduct(v, v); - if (f < light->rtlight.lightmap_cullradius2 && CL_TraceLine(p, light->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) == 1) + if (f < light->rtlight.lightmap_cullradius2 && CL_TraceBox(p, vec3_origin, vec3_origin, light->origin, false, NULL, SUPERCONTENTS_SOLID, false).fraction == 1) { f = (1.0f / (f + LIGHTOFFSET)) - light->rtlight.lightmap_subtract; VectorMA(ambientcolor, f, light->rtlight.lightmap_light, ambientcolor); @@ -444,7 +331,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co nl->offset = sl->distbias; } } - if (!r_rtdlight || (ent->flags & RENDER_TRANSPARENT)) + if (ent->flags & RENDER_TRANSPARENT) { // FIXME: this dlighting doesn't look like rtlights for (i = 0;i < r_numdlights;i++) @@ -457,7 +344,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co VectorSubtract (v, light->origin, v); if (DotProduct(v, v) < light->rtlight.lightmap_cullradius2) { - if (CL_TraceLine(ent->origin, light->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) != 1) + if (CL_TraceBox(ent->origin, vec3_origin, vec3_origin, light->origin, false, NULL, SUPERCONTENTS_SOLID, false).fraction != 1) continue; VectorSubtract (ent->origin, light->origin, v); f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - light->rtlight.lightmap_subtract); @@ -596,7 +483,7 @@ void R_UpdateEntLights(entity_render_t *ent) ent->numentlights = 0; if (r_refdef.worldmodel) for (i = 0, sl = r_refdef.worldmodel->brushq1.lights;i < r_refdef.worldmodel->brushq1.numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++) - if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) == 1) + if (CL_TraceBox(ent->origin, vec3_origin, vec3_origin, sl->origin, false, NULL, SUPERCONTENTS_SOLID, false).fraction == 1) ent->entlights[ent->numentlights++] = i; } ent->entlightsframe = r_framecount;