X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_light.c;h=f8b99601c03d32d1818b71b75f64deb8c7225b6d;hp=5cc2697948a874ac0fd021b97ea179db61d80b51;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hpb=d3b158411b1d81181e05f750d9a7b0b2268438e2 diff --git a/r_light.c b/r_light.c index 5cc26979..f8b99601 100644 --- a/r_light.c +++ b/r_light.c @@ -23,13 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cl_collision.h" #include "r_shadow.h" -rdlight_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", "1"}; +cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0"}; static rtexture_t *lightcorona; static rtexturepool_t *lighttexturepool; @@ -38,7 +35,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,7 +64,7 @@ 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) @@ -79,203 +76,38 @@ void R_Light_Init(void) R_RegisterModule("R_Light", r_light_start, r_light_shutdown, r_light_newmap); } -/* -================== -R_AnimateLight -================== -*/ -void R_AnimateLight (void) -{ - int i, j, k; - -// -// light animations -// 'm' is normal light, 'a' is no light, 'z' is double bright - i = (int)(cl.time * 10); - 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; - k = cl_lightstyle[j].map[k] - 'a'; - k = k*22; - d_lightstylevalue[j] = k; - } -} - - -void R_BuildLightList(void) -{ - int i; - dlight_t *cd; - rdlight_t *rd; - - r_numdlights = 0; - c_dlights = 0; - - if (!r_dynamic.integer || !cl_dlights) - return; - - for (i = 0;i < MAX_DLIGHTS;i++) - { - cd = cl_dlights + i; - if (cd->radius <= 0) - continue; - rd = &r_dlight[r_numdlights++]; - VectorCopy(cd->origin, rd->origin); - VectorScale(cd->color, cd->radius * 64.0f, rd->light); - rd->cullradius2 = DotProduct(rd->light, rd->light) * (0.25f / (64.0f * 64.0f)) + 4096.0f; - // clamp radius to avoid overflowing division table in lightmap code - if (rd->cullradius2 > (2048.0f * 2048.0f)) - rd->cullradius2 = (2048.0f * 2048.0f); - rd->cullradius = sqrt(rd->cullradius2); - rd->subtract = 1.0f / rd->cullradius2; - rd->ent = cd->ent; - c_dlights++; // count every dlight in use - } -} - void R_DrawCoronas(void) { - int i; + int i, lnum, flag; float cscale, scale, viewdist, dist; - rdlight_t *rd; - if (!r_coronas.integer) + dlight_t *light; + if (r_coronas.value < 0.01) return; R_Mesh_Matrix(&r_identitymatrix); - viewdist = DotProduct(r_origin, vpn); - for (i = 0;i < r_numdlights;i++) + viewdist = DotProduct(r_vieworigin, r_viewforward); + flag = r_rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE; + for (lnum = 0, light = r_shadow_worldlightchain;light;light = light->next, lnum++) { - rd = r_dlight + i; - dist = (DotProduct(rd->origin, vpn) - viewdist); - if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true, NULL) == 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 = (1.0f / 131072.0f); - scale = rd->cullradius * 0.25f; - if (gl_flashblend.integer) - { - cscale *= 4.0f; - scale *= 2.0f; - } - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, rd->origin, vright, vup, scale, -scale, -scale, scale, rd->light[0] * cscale, rd->light[1] * cscale, rd->light[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, 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); } } -} - -/* -============================================================================= - -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, rdlight_t *rd, 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 > rd->cullradius) - node = node->children[0]; - else - { - if (dist >= -rd->cullradius) - R_RecursiveMarkLights(ent, lightorigin, rd, 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 - ent->model->brushq1.leafs) - 1; - if (leaf->nummarksurfaces && (i >= pvsbits || pvs[i >> 3] & (1 << (i & 7)))) + for (i = 0;i < r_refdef.numlights;i++) { - int *surfacepvsframes, d, impacts, impactt; - float sdist, maxdist, dist2, impact[3]; - msurface_t *surf; - // mark the polygons - maxdist = rd->cullradius2; - surfacepvsframes = ent->model->brushq1.surfacepvsframes; - for (i = 0;i < leaf->nummarksurfaces;i++) + 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) { - 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 + cscale = light->corona * r_coronas.value * 0.25f; + scale = light->rtlight.radius * light->rtlight.coronasizescale; + if (gl_flashblend.integer) { - 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; - if (r_dlightmap.integer) - surf->cached_dlight = true; + cscale *= 4.0f; + scale *= 2.0f; } - surf->dlightbits[bitindex] |= bit; - } - } -} - -void R_MarkLights(entity_render_t *ent) -{ - int i, bit, bitindex; - rdlight_t *rd; - vec3_t lightorigin; - if (!gl_flashblend.integer && r_dynamic.integer && ent->model) - { - for (i = 0, rd = r_dlight;i < r_numdlights;i++, rd++) - { - bit = 1 << (i & 31); - bitindex = i >> 5; - Matrix4x4_Transform(&ent->inversematrix, rd->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, rd, bit, bitindex, ent->model->brushq1.nodes + ent->model->brushq1.hulls[0].firstclipnode, lightpvs, min(lightpvsbytes * 8, ent->model->brushq1.visleafs)); + 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); } } } @@ -288,37 +120,38 @@ 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; - if (d_lightstylevalue[sl->style] > 0) + sl = r_refdef.worldmodel->brushq1.lights + i; + 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, 0, false, NULL) == 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); } } } @@ -328,23 +161,25 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu { int i; float f, v[3]; - rdlight_t *rd; + 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++) { - rd = r_dlight + i; - VectorSubtract(p, rd->origin, v); + light = r_refdef.lights[i]; + VectorSubtract(p, light->origin, v); f = DotProduct(v, v); - if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, 0, false, NULL) == 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)) - rd->subtract; - VectorMA(ambientcolor, f, rd->light, ambientcolor); + f = (1.0f / (f + LIGHTOFFSET)) - light->rtlight.lightmap_subtract; + if (f > 0) + VectorMA(ambientcolor, f, light->rtlight.lightmap_light, ambientcolor); } } } } -typedef struct +typedef struct nearlight_s { vec3_t origin; //vec_t cullradius2; @@ -365,28 +200,32 @@ static nearlight_t nearlight[MAX_DLIGHTS]; int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, const entity_render_t *ent, float colorr, float colorg, float colorb, float colora, int worldcoords) { int i, j, maxnearlights; - float v[3], f, mscale, stylescale, intensity, ambientcolor[3]; + float v[3], f, mscale, stylescale, intensity, ambientcolor[3], tempdiffusenormal[3]; nearlight_t *nl; mlight_t *sl; - rdlight_t *rd; + dlight_t *light; nearlights = 0; maxnearlights = r_modellights.integer; ambient4f[0] = ambient4f[1] = ambient4f[2] = r_ambient.value * (2.0f / 128.0f); VectorClear(diffusecolor); VectorClear(diffusenormal); - if (r_fullbright.integer || (ent->effects & EF_FULLBRIGHT)) + if (!(ent->flags & RENDER_LIGHT)) { // highly rare VectorSet(ambient4f, 1, 1, 1); maxnearlights = 0; } - else if (r_shadow_realtime_world.integer) + else if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT)) maxnearlights = 0; else { - if (cl.worldmodel && cl.worldmodel->brush.LightPoint) - cl.worldmodel->brush.LightPoint(cl.worldmodel, ent->origin, ambient4f, diffusecolor, diffusenormal); + if (r_refdef.worldmodel && r_refdef.worldmodel->brush.LightPoint) + { + r_refdef.worldmodel->brush.LightPoint(r_refdef.worldmodel, ent->origin, ambient4f, diffusecolor, tempdiffusenormal); + Matrix4x4_Transform3x3(&ent->inversematrix, tempdiffusenormal, diffusenormal); + VectorNormalize(diffusenormal); + } else VectorSet(ambient4f, 1, 1, 1); } @@ -398,8 +237,8 @@ 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]; - stylescale = d_lightstylevalue[sl->style] * (1.0f / 65536.0f); + sl = r_refdef.worldmodel->brushq1.lights + ent->entlights[i]; + 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); @@ -446,23 +285,24 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co nl->offset = sl->distbias; } } - if (!r_shadow_realtime_dlight.integer) + if (ent->flags & RENDER_TRANSPARENT) { - for (i = 0;i < r_numdlights;i++) + // FIXME: this dlighting doesn't look like rtlights + for (i = 0;i < r_refdef.numlights;i++) { - rd = r_dlight + i; - VectorCopy(rd->origin, v); + light = r_refdef.lights[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, rd->origin, v); - if (DotProduct(v, v) < rd->cullradius2) + VectorSubtract (v, light->origin, v); + if (DotProduct(v, v) < light->rtlight.lightmap_cullradius2) { - if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, 0, false, NULL) != 1) + if (CL_TraceBox(ent->origin, vec3_origin, vec3_origin, light->origin, false, NULL, SUPERCONTENTS_SOLID, false).fraction != 1) continue; - VectorSubtract (ent->origin, rd->origin, v); - f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - rd->subtract); - VectorScale(rd->light, f, ambientcolor); + 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; @@ -493,14 +333,14 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co nl->intensity = intensity; // transform the light into the model's coordinate system if (worldcoords) - VectorCopy(rd->origin, nl->origin); + VectorCopy(light->origin, nl->origin); else { - Matrix4x4_Transform(&ent->inversematrix, rd->origin, nl->origin); + 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 - , rd->origin[0], rd->origin[1], rd->origin[2] + , rd - cl_dlights, 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] @@ -511,10 +351,10 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co // integrate mscale into falloff, for maximum speed nl->falloff = mscale; VectorCopy(ambientcolor, nl->ambientlight); - nl->light[0] = rd->light[0] * colorr * 4.0f; - nl->light[1] = rd->light[1] * colorg * 4.0f; - nl->light[2] = rd->light[2] * colorb * 4.0f; - nl->subtract = rd->subtract; + 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; } } @@ -536,7 +376,9 @@ void R_LightModel_CalcVertexColors(const float *ambientcolor4f, const float *dif float color[4], v[3], dot, dist2, f, dnormal[3]; nearlight_t *nl; usediffuse = DotProduct(diffusecolor, diffusecolor) > 0; - VectorCopy(diffusenormal, dnormal); + // negate the diffuse normal to avoid the need to negate the + // dotproduct on each vertex + VectorNegate(diffusenormal, dnormal); if (usediffuse) VectorNormalize(dnormal); // directional shading code here @@ -555,7 +397,7 @@ void R_LightModel_CalcVertexColors(const float *ambientcolor4f, const float *dif // pretty good lighting for (j = 0, nl = &nearlight[0];j < nearlights;j++, nl++) { - VectorSubtract(vertex3f, nl->origin, v); + VectorSubtract(nl->origin, vertex3f, v); // first eliminate negative lighting (back side) dot = DotProduct(normal3f, v); if (dot > 0) @@ -585,7 +427,7 @@ void R_UpdateEntLights(entity_render_t *ent) int i; const mlight_t *sl; vec3_t v; - if (r_shadow_realtime_dlight.integer || gl_flashblend.integer) + if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT)) return; VectorSubtract(ent->origin, ent->entlightsorigin, v); if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f)) @@ -593,9 +435,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, 0, false, NULL) == 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;