X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_light.c;h=83d9630332d4df5b781367afba412facf193eaef;hp=908b5aa62e7346888dcc7ea2facd7d4770fca010;hb=d3cbe906d0eedcff735096a08340d8ca90457fa9;hpb=ea4fc545e8444f579d88d8f096b054dcd7bc482f diff --git a/r_light.c b/r_light.c index 908b5aa6..83d96303 100644 --- 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; @@ -128,31 +128,29 @@ void R_UpdateLights(void) void R_DrawCoronas(void) { - int i, lnum; + int i, lnum, flag; float cscale, scale, viewdist, dist; dlight_t *light; if (r_coronas.value < 0.01) return; R_Mesh_Matrix(&r_identitymatrix); viewdist = DotProduct(r_vieworigin, r_viewforward); - if (r_rtworld) + flag = r_rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE; + for (lnum = 0, light = r_shadow_worldlightchain;light;light = light->next, lnum++) { - 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_TraceBox(light->rtlight.shadoworigin, vec3_origin, vec3_origin, r_vieworigin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1) { - if (light->rtlight.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) - { - cscale = light->rtlight.corona * r_coronas.value * 0.25f; - scale = light->rtlight.radius * 0.25f; - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, light->rtlight.shadoworigin, r_viewright, r_viewup, scale, -scale, -scale, scale, light->rtlight.color[0] * cscale, light->rtlight.color[1] * cscale, light->rtlight.color[2] * cscale, 1); - } + cscale = light->rtlight.corona * r_coronas.value * 0.25f; + scale = light->rtlight.radius * light->rtlight.coronasizescale; + R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, light->rtlight.shadoworigin, r_viewright, r_viewup, scale, -scale, -scale, scale, light->rtlight.color[0] * cscale, light->rtlight.color[1] * cscale, light->rtlight.color[2] * cscale, 1); } } for (i = 0, light = r_dlight;i < r_numdlights;i++, light++) { - if (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->radius * 0.25f; + scale = light->rtlight.radius * light->rtlight.coronasizescale; if (gl_flashblend.integer) { cscale *= 4.0f; @@ -166,153 +164,39 @@ 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 ============================================================================= */ -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); - if (!r_fullbright.integer && cl.worldmodel && cl.worldmodel->brush.LightPoint) + if (!r_fullbright.integer && r_refdef.worldmodel && r_refdef.worldmodel->brush.LightPoint) { ambientcolor[0] = ambientcolor[1] = ambientcolor[2] = r_ambient.value * (2.0f / 128.0f); - cl.worldmodel->brush.LightPoint(cl.worldmodel, p, ambientcolor, diffusecolor, diffusenormal); + r_refdef.worldmodel->brush.LightPoint(r_refdef.worldmodel, p, ambientcolor, diffusecolor, diffusenormal); } else VectorSet(ambientcolor, 1, 1, 1); // FIXME: this .lights related stuff needs to be ported into the Mod_Q1BSP code - if (cl.worldmodel->brushq1.numlights) + if (r_refdef.worldmodel->brushq1.numlights) { int i; vec3_t v; float f; mlight_t *sl; - for (i = 0;i < cl.worldmodel->brushq1.numlights;i++) + for (i = 0;i < r_refdef.worldmodel->brushq1.numlights;i++) { - sl = cl.worldmodel->brushq1.lights + i; + sl = r_refdef.worldmodel->brushq1.lights + i; if (d_lightstylevalue[sl->style] > 0) { 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); @@ -332,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); @@ -382,9 +266,9 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co maxnearlights = 0; else { - if (cl.worldmodel && cl.worldmodel->brush.LightPoint) + if (r_refdef.worldmodel && r_refdef.worldmodel->brush.LightPoint) { - cl.worldmodel->brush.LightPoint(cl.worldmodel, ent->origin, ambient4f, diffusecolor, tempdiffusenormal); + r_refdef.worldmodel->brush.LightPoint(r_refdef.worldmodel, ent->origin, ambient4f, diffusecolor, tempdiffusenormal); Matrix4x4_Transform3x3(&ent->inversematrix, tempdiffusenormal, diffusenormal); VectorNormalize(diffusenormal); } @@ -399,7 +283,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co nl = &nearlight[0]; for (i = 0;i < ent->numentlights;i++) { - sl = cl.worldmodel->brushq1.lights + ent->entlights[i]; + sl = r_refdef.worldmodel->brushq1.lights + ent->entlights[i]; stylescale = d_lightstylevalue[sl->style] * (1.0f / 65536.0f); VectorSubtract (ent->origin, sl->origin, v); f = ((1.0f / (DotProduct(v, v) * sl->falloff + sl->distbias)) - sl->subtract) * stylescale; @@ -447,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++) @@ -460,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); @@ -597,9 +481,9 @@ void R_UpdateEntLights(entity_render_t *ent) ent->entlightstime = realtime + 0.1; VectorCopy(ent->origin, ent->entlightsorigin); ent->numentlights = 0; - if (cl.worldmodel) - for (i = 0, sl = cl.worldmodel->brushq1.lights;i < cl.worldmodel->brushq1.numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++) - if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) == 1) + 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_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;