X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=f06c41e0208bb07d7cae921c4a8c7aaa69bdb284;hb=d3e2f7e92ec8883147b70a7bc0971a7b4561d3d5;hp=272eed2aecfcfccfadcfcaca4e0da20fc8843504;hpb=a6921ceb0abd7125dace5eb2b418ff1770504a44;p=xonotic%2Fdarkplaces.git diff --git a/r_light.c b/r_light.c index 272eed2a..f06c41e0 100644 --- a/r_light.c +++ b/r_light.c @@ -23,13 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cl_collision.h" #include "r_shadow.h" -dlight_t r_dlight[MAX_DLIGHTS]; -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", "0"}; +cvar_t r_modellights = {CVAR_SAVE, "r_modellights", "4", "how many lights from a .lights file (produced by hlight) are worthy of directional shading on a model (others are applied to the whole model as ambient lighting)"}; +cvar_t r_coronas = {CVAR_SAVE, "r_coronas", "1", "brightness of corona flare effects around certain lights, 0 disables corona effects"}; +cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0", "render bright coronas for dynamic lights instead of actual lighting, fast but ugly"}; static rtexture_t *lightcorona; static rtexturepool_t *lighttexturepool; @@ -38,7 +34,7 @@ void r_light_start(void) { float dx, dy; int x, y, a; - qbyte pixels[32][32][4]; + unsigned char pixels[32][32][4]; lighttexturepool = R_AllocTexturePool(); for (y = 0;y < 32;y++) { @@ -67,65 +63,17 @@ void r_light_newmap(void) { int i; for (i = 0;i < 256;i++) - d_lightstylevalue[i] = 264; // normal light value + r_refdef.lightstylevalue[i] = 264; // normal light value } void R_Light_Init(void) { Cvar_RegisterVariable(&r_modellights); - Cvar_RegisterVariable(&r_vismarklights); Cvar_RegisterVariable(&r_coronas); Cvar_RegisterVariable(&gl_flashblend); R_RegisterModule("R_Light", r_light_start, r_light_shutdown, r_light_newmap); } -/* -================== -R_UpdateLights -================== -*/ -void R_UpdateLights(void) -{ - float frac; - int i, j, k, l; - -// light animations -// 'm' is normal light, 'a' is no light, 'z' is double bright - i = (int)(cl.time * 10); - frac = (cl.time * 10) - i; - for (j = 0;j < MAX_LIGHTSTYLES;j++) - { - if (!cl_lightstyle || !cl_lightstyle[j].length) - { - d_lightstylevalue[j] = 256; - continue; - } - k = i % cl_lightstyle[j].length; - l = (i-1) % cl_lightstyle[j].length; - k = cl_lightstyle[j].map[k] - 'a'; - l = cl_lightstyle[j].map[l] - 'a'; - d_lightstylevalue[j] = ((k*frac)+(l*(1-frac)))*22; - } - - r_numdlights = 0; - c_dlights = 0; - - if (!r_dynamic.integer || !cl_dlights) - return; - - // TODO: optimize to not scan whole cl_dlights array if possible - for (i = 0;i < MAX_DLIGHTS;i++) - { - if (cl_dlights[i].radius > 0) - { - R_RTLight_UpdateFromDLight(&cl_dlights[i].rtlight, &cl_dlights[i], false); - // FIXME: use pointer instead of copy - r_dlight[r_numdlights++] = cl_dlights[i]; - c_dlights++; // count every dlight in use - } - } -} - void R_DrawCoronas(void) { int i, lnum, flag; @@ -138,16 +86,17 @@ 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; - 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); + R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, 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++) + for (i = 0;i < r_refdef.numlights;i++) { - 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) + light = r_refdef.lights[i]; + 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; @@ -156,117 +105,7 @@ void R_DrawCoronas(void) cscale *= 4.0f; scale *= 2.0f; } - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, light->origin, r_viewright, r_viewup, scale, -scale, -scale, scale, light->color[0] * cscale, light->color[1] * cscale, light->color[2] * cscale, 1); - } - } -} - -/* -============================================================================= - -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], planenormal[3], planedist; - 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->brush.data_surfaces + leaf->firstleafsurface[i]; - VectorCopy(surface->mesh.data_normal3f, planenormal); - planedist = DotProduct(surface->mesh.data_vertex3f, surface->mesh.data_normal3f); - 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, 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)); + R_DrawSprite(GL_ONE, GL_ONE, lightcorona, NULL, true, light->origin, r_viewright, r_viewup, scale, -scale, -scale, scale, light->color[0] * cscale, light->color[1] * cscale, light->color[2] * cscale, 1); } } } @@ -279,7 +118,7 @@ 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); @@ -302,14 +141,15 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu for (i = 0;i < r_refdef.worldmodel->brushq1.numlights;i++) { sl = r_refdef.worldmodel->brushq1.lights + i; - if (d_lightstylevalue[sl->style] > 0) + if (r_refdef.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); + f *= r_refdef.lightstylevalue[sl->style] * (1.0f / 65536.0f); + if (f > 0) + VectorMA(ambientcolor, f, sl->light, ambientcolor); } } } @@ -321,21 +161,23 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu float f, v[3]; dlight_t *light; // FIXME: this really should handle dlights as diffusecolor/diffusenormal somehow - for (i = 0;i < r_numdlights;i++) + // FIXME: this should be updated to match rtlight falloff! + for (i = 0;i < r_refdef.numlights;i++) { - light = r_dlight + i; + light = r_refdef.lights[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); + if (f > 0) + VectorMA(ambientcolor, f, light->rtlight.lightmap_light, ambientcolor); } } } } -typedef struct +typedef struct nearlight_s { vec3_t origin; //vec_t cullradius2; @@ -359,7 +201,6 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co float v[3], f, mscale, stylescale, intensity, ambientcolor[3], tempdiffusenormal[3]; nearlight_t *nl; mlight_t *sl; - dlight_t *light; nearlights = 0; maxnearlights = r_modellights.integer; @@ -372,7 +213,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co VectorSet(ambient4f, 1, 1, 1); maxnearlights = 0; } - else if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT)) + else if (r_lightmapintensity <= 0) maxnearlights = 0; else { @@ -394,7 +235,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co for (i = 0;i < ent->numentlights;i++) { sl = r_refdef.worldmodel->brushq1.lights + ent->entlights[i]; - stylescale = d_lightstylevalue[sl->style] * (1.0f / 65536.0f); + stylescale = r_refdef.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; VectorScale(sl->light, f, ambientcolor); @@ -441,81 +282,6 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co nl->offset = sl->distbias; } } - if (!r_rtdlight || (ent->flags & RENDER_TRANSPARENT)) - { - // FIXME: this dlighting doesn't look like rtlights - for (i = 0;i < r_numdlights;i++) - { - light = r_dlight + i; - VectorCopy(light->origin, v); - if (v[0] < ent->mins[0]) v[0] = ent->mins[0];if (v[0] > ent->maxs[0]) v[0] = ent->maxs[0]; - if (v[1] < ent->mins[1]) v[1] = ent->mins[1];if (v[1] > ent->maxs[1]) v[1] = ent->maxs[1]; - if (v[2] < ent->mins[2]) v[2] = ent->mins[2];if (v[2] > ent->maxs[2]) v[2] = ent->maxs[2]; - 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) - continue; - VectorSubtract (ent->origin, light->origin, v); - f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - light->rtlight.lightmap_subtract); - VectorScale(light->rtlight.lightmap_light, f, ambientcolor); - intensity = DotProduct(ambientcolor, ambientcolor); - if (f < 0) - intensity *= -1.0f; - if (nearlights < maxnearlights) - j = nearlights++; - else - { - for (j = 0;j < maxnearlights;j++) - { - if (nearlight[j].intensity < intensity) - { - if (nearlight[j].intensity > 0) - VectorAdd(ambient4f, nearlight[j].ambientlight, ambient4f); - break; - } - } - } - if (j >= maxnearlights) - { - // this light is less significant than all others, - // add it to ambient - if (intensity > 0) - VectorAdd(ambient4f, ambientcolor, ambient4f); - } - else - { - nl = nearlight + j; - nl->intensity = intensity; - // transform the light into the model's coordinate system - if (worldcoords) - VectorCopy(light->origin, nl->origin); - else - { - Matrix4x4_Transform(&ent->inversematrix, light->origin, nl->origin); - /* - Con_Printf("%i %s : %f %f %f : %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n" - , rd - r_dlight, ent->model->name - , light->origin[0], light->origin[1], light->origin[2] - , nl->origin[0], nl->origin[1], nl->origin[2] - , ent->inversematrix.m[0][0], ent->inversematrix.m[0][1], ent->inversematrix.m[0][2], ent->inversematrix.m[0][3] - , ent->inversematrix.m[1][0], ent->inversematrix.m[1][1], ent->inversematrix.m[1][2], ent->inversematrix.m[1][3] - , ent->inversematrix.m[2][0], ent->inversematrix.m[2][1], ent->inversematrix.m[2][2], ent->inversematrix.m[2][3] - , ent->inversematrix.m[3][0], ent->inversematrix.m[3][1], ent->inversematrix.m[3][2], ent->inversematrix.m[3][3]); - */ - } - // integrate mscale into falloff, for maximum speed - nl->falloff = mscale; - VectorCopy(ambientcolor, nl->ambientlight); - nl->light[0] = light->rtlight.lightmap_light[0] * colorr * 4.0f; - nl->light[1] = light->rtlight.lightmap_light[1] * colorg * 4.0f; - nl->light[2] = light->rtlight.lightmap_light[2] * colorb * 4.0f; - nl->subtract = light->rtlight.lightmap_subtract; - nl->offset = LIGHTOFFSET; - } - } - } - } ambient4f[0] *= colorr; ambient4f[1] *= colorg; ambient4f[2] *= colorb; @@ -545,9 +311,11 @@ void R_LightModel_CalcVertexColors(const float *ambientcolor4f, const float *dif // silly directional diffuse shading if (usediffuse) { + // we have to negate this result because it is the incoming light + // direction, not simply the normal to dotproduct with. dot = DotProduct(normal3f, dnormal); - if (dot > 0) - VectorMA(color, dot, diffusecolor, color); + if (dot < 0) + VectorMA(color, -dot, diffusecolor, color); } // pretty good lighting @@ -583,7 +351,7 @@ void R_UpdateEntLights(entity_render_t *ent) int i; const mlight_t *sl; vec3_t v; - if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT)) + if (r_lightmapintensity <= 0) return; VectorSubtract(ent->origin, ent->entlightsorigin, v); if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f)) @@ -593,7 +361,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;