X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=395af9ec520b35648e3105d125effeb9a3849932;hb=32d22283d65a73d16f420db3e38379085a159bc3;hp=aa35da8ef81bab35d205918b4bc6f54889303df0;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849;p=xonotic%2Fdarkplaces.git diff --git a/r_light.c b/r_light.c index aa35da8e..395af9ec 100644 --- a/r_light.c +++ b/r_light.c @@ -20,13 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // r_light.c #include "quakedef.h" +#include "cl_collision.h" +#include "r_shadow.h" rdlight_t r_dlight[MAX_DLIGHTS]; int r_numdlights = 0; -cvar_t r_lightmodels = {CVAR_SAVE, "r_lightmodels", "1"}; +cvar_t r_modellights = {CVAR_SAVE, "r_modellights", "4"}; cvar_t r_vismarklights = {0, "r_vismarklights", "1"}; -cvar_t r_lightmodelhardness = {CVAR_SAVE, "r_lightmodelhardness", "0.9"}; +cvar_t r_coronas = {CVAR_SAVE, "r_coronas", "1"}; +cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "1"}; static rtexture_t *lightcorona; static rtexturepool_t *lighttexturepool; @@ -43,15 +46,15 @@ void r_light_start(void) for (x = 0;x < 32;x++) { dx = (x - 15.5f) * (1.0f / 16.0f); - a = ((1.0f / (dx * dx + dy * dy + 0.2f)) - (1.0f / (1.0f + 0.2))) * 64.0f / (1.0f / (1.0f + 0.2)); + a = ((1.0f / (dx * dx + dy * dy + 0.2f)) - (1.0f / (1.0f + 0.2))) * 32.0f / (1.0f / (1.0f + 0.2)); a = bound(0, a, 255); - pixels[y][x][0] = 255; - pixels[y][x][1] = 255; - pixels[y][x][2] = 255; - pixels[y][x][3] = a; + pixels[y][x][0] = a; + pixels[y][x][1] = a; + pixels[y][x][2] = a; + pixels[y][x][3] = 255; } } - lightcorona = R_LoadTexture (lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE | TEXF_ALPHA); + lightcorona = R_LoadTexture2D(lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL); } void r_light_shutdown(void) @@ -62,13 +65,17 @@ void r_light_shutdown(void) void r_light_newmap(void) { + int i; + for (i = 0;i < 256;i++) + d_lightstylevalue[i] = 264; // normal light value } void R_Light_Init(void) { - Cvar_RegisterVariable(&r_lightmodels); - Cvar_RegisterVariable(&r_lightmodelhardness); + 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); } @@ -87,7 +94,7 @@ void R_AnimateLight (void) i = (int)(cl.time * 10); for (j = 0;j < MAX_LIGHTSTYLES;j++) { - if (!cl_lightstyle[j].length) + if (!cl_lightstyle || !cl_lightstyle[j].length) { d_lightstylevalue[j] = 256; continue; @@ -102,14 +109,14 @@ void R_AnimateLight (void) void R_BuildLightList(void) { - int i; - dlight_t *cd; - rdlight_t *rd; + int i; + dlight_t *cd; + rdlight_t *rd; r_numdlights = 0; c_dlights = 0; - if (!r_dynamic.integer) + if (!r_dynamic.integer || !cl_dlights) return; for (i = 0;i < MAX_DLIGHTS;i++) @@ -119,85 +126,53 @@ void R_BuildLightList(void) continue; rd = &r_dlight[r_numdlights++]; VectorCopy(cd->origin, rd->origin); - VectorScale(cd->color, cd->radius * 128.0f, rd->light); - rd->cullradius = (1.0f / 128.0f) * sqrt(DotProduct(rd->light, rd->light)); + 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->cullradius > 2048.0f) - rd->cullradius = 2048.0f; - rd->cullradius2 = rd->cullradius * rd->cullradius; - rd->lightsubtract = 1.0f / rd->cullradius2; + 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; - r_numdlights++; c_dlights++; // count every dlight in use } } -static int coronapolyindex[6] = {0, 1, 2, 0, 2, 3}; - void R_DrawCoronas(void) { int i; - rmeshinfo_t m; - float tvxyz[4][4], tvst[4][2], scale, viewdist, diff[3], dist; + rmeshstate_t m; + float scale, viewdist, diff[3], dist; rdlight_t *rd; + if (!r_coronas.integer) + return; memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ONE; m.depthdisable = true; // magic - m.numtriangles = 2; - m.numverts = 4; - m.index = coronapolyindex; - m.vertex = &tvxyz[0][0]; - m.vertexstep = sizeof(float[4]); m.tex[0] = R_GetTexture(lightcorona); - m.texcoords[0] = &tvst[0][0]; - m.texcoordstep[0] = sizeof(float[2]); - tvst[0][0] = 0; - tvst[0][1] = 0; - tvst[1][0] = 0; - tvst[1][1] = 1; - tvst[2][0] = 1; - tvst[2][1] = 1; - tvst[3][0] = 1; - tvst[3][1] = 0; + R_Mesh_Matrix(&r_identitymatrix); + R_Mesh_State(&m); viewdist = DotProduct(r_origin, vpn); for (i = 0;i < r_numdlights;i++) { rd = r_dlight + i; dist = (DotProduct(rd->origin, vpn) - viewdist); - if (dist >= 24.0f) + if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true, NULL) == 1) { - // trace to a point just barely closer to the eye - VectorSubtract(rd->origin, vpn, diff); - if (TraceLine(r_origin, diff, NULL, NULL, 0, true) == 1) + scale = r_colorscale * (1.0f / 131072.0f); + if (gl_flashblend.integer) + scale *= 4.0f; + if (fogenabled) { - scale = 1.0f / 262144.0f; - //scale = 64.0f / (DotProduct(diff,diff) + 1024.0f); - m.cr = rd->light[0] * scale; - m.cg = rd->light[1] * scale; - m.cb = rd->light[2] * scale; - m.ca = 1; - if (fogenabled) - { - VectorSubtract(rd->origin, r_origin, diff); - m.ca *= 1 - exp(fogdensity/DotProduct(diff,diff)); - } - scale = rd->cullradius * 0.25f; - tvxyz[0][0] = rd->origin[0] - vright[0] * scale - vup[0] * scale; - tvxyz[0][1] = rd->origin[1] - vright[1] * scale - vup[1] * scale; - tvxyz[0][2] = rd->origin[2] - vright[2] * scale - vup[2] * scale; - tvxyz[1][0] = rd->origin[0] - vright[0] * scale + vup[0] * scale; - tvxyz[1][1] = rd->origin[1] - vright[1] * scale + vup[1] * scale; - tvxyz[1][2] = rd->origin[2] - vright[2] * scale + vup[2] * scale; - tvxyz[2][0] = rd->origin[0] + vright[0] * scale + vup[0] * scale; - tvxyz[2][1] = rd->origin[1] + vright[1] * scale + vup[1] * scale; - tvxyz[2][2] = rd->origin[2] + vright[2] * scale + vup[2] * scale; - tvxyz[3][0] = rd->origin[0] + vright[0] * scale - vup[0] * scale; - tvxyz[3][1] = rd->origin[1] + vright[1] * scale - vup[1] * scale; - tvxyz[3][2] = rd->origin[2] + vright[2] * scale - vup[2] * scale; - R_Mesh_Draw(&m); + VectorSubtract(rd->origin, r_origin, diff); + scale *= 1 - exp(fogdensity/DotProduct(diff,diff)); } + GL_Color(rd->light[0] * scale, rd->light[1] * scale, rd->light[2] * scale, 1); + scale = rd->cullradius * 0.25f; + if (gl_flashblend.integer) + scale *= 2.0f; + R_DrawSpriteMesh(rd->origin, vright, vup, scale, -scale, -scale, scale); } } } @@ -215,12 +190,13 @@ DYNAMIC LIGHTS R_MarkLights ============= */ -static void R_OldMarkLights (vec3_t lightorigin, rdlight_t *rd, int bit, int bitindex, mnode_t *node) +static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t *rd, int bit, int bitindex, mnode_t *node) { - float ndist, maxdist; - msurface_t *surf; - mleaf_t *leaf; - int i; + float ndist, maxdist; + msurface_t *surf; + int i, *surfacepvsframes; + int d, impacts, impactt; + float dist, dist2, impact[3]; if (!r_dynamic.integer) return; @@ -228,21 +204,10 @@ static void R_OldMarkLights (vec3_t lightorigin, rdlight_t *rd, int bit, int bit // for comparisons to minimum acceptable light maxdist = rd->cullradius2; + surfacepvsframes = ent->model->surfacepvsframes; loc0: if (node->contents < 0) - { - if (node->contents != CONTENTS_SOLID) - { - leaf = (mleaf_t *)node; - if (leaf->dlightframe != r_framecount) // not dynamic until now - { - leaf->dlightbits[0] = leaf->dlightbits[1] = leaf->dlightbits[2] = leaf->dlightbits[3] = leaf->dlightbits[4] = leaf->dlightbits[5] = leaf->dlightbits[6] = leaf->dlightbits[7] = 0; - leaf->dlightframe = r_framecount; - } - leaf->dlightbits[bitindex] |= bit; - } return; - } ndist = PlaneDiff(lightorigin, node->plane); @@ -258,12 +223,10 @@ loc0: } // mark the polygons - surf = currentrenderentity->model->surfaces + node->firstsurface; - for (i=0 ; inumsurfaces ; i++, surf++) + surf = ent->model->surfaces + node->firstsurface; + for (i = 0;i < node->numsurfaces;i++, surf++) { - int d, impacts, impactt; - float dist, dist2, impact[3]; - if (surf->visframe != r_framecount) + if (surfacepvsframes[surf->number] != ent->model->pvsframecount) continue; dist = ndist; if (surf->flags & SURF_PLANEBACK) @@ -276,9 +239,17 @@ loc0: if (dist2 >= maxdist) continue; - impact[0] = rd->origin[0] - surf->plane->normal[0] * dist; - impact[1] = rd->origin[1] - surf->plane->normal[1] * dist; - impact[2] = rd->origin[2] - surf->plane->normal[2] * dist; + if (node->plane->type < 3) + { + VectorCopy(lightorigin, impact); + impact[node->plane->type] -= dist; + } + else + { + impact[0] = lightorigin[0] - surf->plane->normal[0] * dist; + impact[1] = lightorigin[1] - surf->plane->normal[1] * dist; + impact[2] = lightorigin[2] - surf->plane->normal[2] * dist; + } impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; @@ -294,72 +265,21 @@ loc0: if (dist2 > maxdist) continue; - - /* - d = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; - - if (d < 0) - { - dist2 += d * d; - if (dist2 >= maxdist) - continue; - } - else - { - d -= surf->extents[0] + 16; - if (d > 0) - { - dist2 += d * d; - if (dist2 >= maxdist) - continue; - } - } - - d = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; - - if (d < 0) - { - dist2 += d * d; - if (dist2 >= maxdist) - continue; - } - else - { - d -= surf->extents[1] + 16; - if (d > 0) - { - 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; + if (r_dlightmap.integer) + surf->cached_dlight = true; } surf->dlightbits[bitindex] |= bit; - - /* - if (((surf->flags & SURF_PLANEBACK) == 0) == ((PlaneDist(lightorigin, surf->plane)) >= surf->plane->dist)) - { - 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->dlightbits[bitindex] |= bit; - } - */ } if (node->children[0]->contents >= 0) { if (node->children[1]->contents >= 0) { - R_OldMarkLights (lightorigin, rd, bit, bitindex, node->children[0]); + R_OldMarkLights (ent, lightorigin, rd, bit, bitindex, node->children[0]); node = node->children[1]; goto loc0; } @@ -376,54 +296,35 @@ loc0: } } -/* -static void R_NoVisMarkLights (rdlight_t *rd, int bit, int bitindex) -{ - vec3_t lightorigin; - softwareuntransform(rd->origin, lightorigin); - R_OldMarkLights(lightorigin, rd, bit, bitindex, currentrenderentity->model->nodes + currentrenderentity->model->hulls[0].firstclipnode); -} -*/ - -static void R_VisMarkLights (rdlight_t *rd, int bit, int bitindex) +static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int bitindex) { static int lightframe = 0; mleaf_t *pvsleaf; vec3_t lightorigin; model_t *model; - int i, k, m, c, leafnum; - msurface_t *surf, **mark; + int i, k, m, c, leafnum, *surfacepvsframes, *mark; + msurface_t *surf; mleaf_t *leaf; - qbyte *in; - int row; - float low[3], high[3], dist, maxdist; + qbyte *in; + int row; + float low[3], high[3], dist, maxdist; if (!r_dynamic.integer) return; - model = currentrenderentity->model; - softwareuntransform(rd->origin, lightorigin); - - if (!r_vismarklights.integer) - { - R_OldMarkLights(lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode); - return; - } + Matrix4x4_Transform(&ent->inversematrix, rd->origin, lightorigin); + model = ent->model; pvsleaf = Mod_PointInLeaf (lightorigin, model); if (pvsleaf == NULL) - { - Con_Printf("R_VisMarkLights: NULL leaf??\n"); - R_OldMarkLights(lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode); return; - } in = pvsleaf->compressed_vis; - if (!in) + if (!r_vismarklights.integer || !in) { - // no vis info, so make all visible - R_OldMarkLights(lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode); + // told not to use pvs, or there's no pvs to use + R_OldMarkLights(ent, lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode); return; } @@ -436,6 +337,7 @@ static void R_VisMarkLights (rdlight_t *rd, int bit, int bitindex) maxdist = rd->cullradius2; row = (model->numleafs+7)>>3; + surfacepvsframes = model->surfacepvsframes; k = 0; while (k < row) @@ -452,30 +354,21 @@ static void R_VisMarkLights (rdlight_t *rd, int bit, int bitindex) if (leafnum > model->numleafs) return; leaf = &model->leafs[leafnum]; - if (leaf->visframe != r_framecount - || leaf->contents == CONTENTS_SOLID - || leaf->mins[0] > high[0] || leaf->maxs[0] < low[0] + if (leaf->mins[0] > high[0] || leaf->maxs[0] < low[0] || leaf->mins[1] > high[1] || leaf->maxs[1] < low[1] || leaf->mins[2] > high[2] || leaf->maxs[2] < low[2]) continue; - if (leaf->dlightframe != r_framecount) - { - // not dynamic until now - leaf->dlightbits[0] = leaf->dlightbits[1] = leaf->dlightbits[2] = leaf->dlightbits[3] = leaf->dlightbits[4] = leaf->dlightbits[5] = leaf->dlightbits[6] = leaf->dlightbits[7] = 0; - leaf->dlightframe = r_framecount; - } - leaf->dlightbits[bitindex] |= bit; if ((m = leaf->nummarksurfaces)) { mark = leaf->firstmarksurface; do { - surf = *mark++; + surf = model->surfaces + *mark++; // if not visible in current frame, or already marked because it was in another leaf we passed, skip if (surf->lightframe == lightframe) continue; surf->lightframe = lightframe; - if (surf->visframe != r_framecount) + if (surfacepvsframes[surf->number] != model->pvsframecount) continue; dist = PlaneDiff(lightorigin, surf->plane); if (surf->flags & SURF_PLANEBACK) @@ -489,49 +382,18 @@ static void R_VisMarkLights (rdlight_t *rd, int bit, int bitindex) dist2 = dist * dist; - impact[0] = rd->origin[0] - surf->plane->normal[0] * dist; - impact[1] = rd->origin[1] - surf->plane->normal[1] * dist; - impact[2] = rd->origin[2] - surf->plane->normal[2] * dist; - -#if 0 - d = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; - if (d < 0) - { - dist2 += d * d; - if (dist2 > maxdist) - continue; - } - else - { - d -= surf->extents[0]; - if (d < 0) - { - dist2 += d * d; - if (dist2 > maxdist) - continue; - } - } - - d = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; - if (d < 0) + if (surf->plane->type < 3) { - dist2 += d * d; - if (dist2 > maxdist) - continue; + VectorCopy(lightorigin, impact); + impact[surf->plane->type] -= dist; } else { - d -= surf->extents[1]; - if (d < 0) - { - dist2 += d * d; - if (dist2 > maxdist) - continue; - } + impact[0] = lightorigin[0] - surf->plane->normal[0] * dist; + impact[1] = lightorigin[1] - surf->plane->normal[1] * dist; + impact[2] = lightorigin[2] - surf->plane->normal[2] * dist; } -#else - 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; @@ -544,12 +406,12 @@ static void R_VisMarkLights (rdlight_t *rd, int bit, int bitindex) if (dist2 > maxdist) continue; -#endif - 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; + if (r_dlightmap.integer) + surf->cached_dlight = true; } surf->dlightbits[bitindex] |= bit; } @@ -566,11 +428,12 @@ static void R_VisMarkLights (rdlight_t *rd, int bit, int bitindex) } } -void R_MarkLights(void) +void R_MarkLights(entity_render_t *ent) { int i; - for (i = 0;i < r_numdlights;i++) - R_VisMarkLights (r_dlight + i, 1 << (i & 31), i >> 5); + if (!gl_flashblend.integer) + for (i = 0;i < r_numdlights;i++) + R_VisMarkLights (ent, r_dlight + i, 1 << (i & 31), i >> 5); } /* @@ -581,11 +444,11 @@ LIGHT SAMPLING ============================================================================= */ -static int RecursiveLightPoint (vec3_t color, mnode_t *node, float x, float y, float startz, float endz) +static int RecursiveLightPoint (vec3_t color, const mnode_t *node, float x, float y, float startz, float endz) { - int side, distz = endz - startz; - float front, back; - float mid; + int side, distz = endz - startz; + float front, back; + float mid; loc0: if (node->contents < 0) @@ -607,11 +470,6 @@ loc0: goto loc0; } // found an intersection -// mid = startz + (endz - startz) * (startz - node->plane->dist) / (startz - endz); -// mid = startz + distz * (startz - node->plane->dist) / (-distz); -// mid = startz + (-(startz - node->plane->dist)); -// mid = startz - (startz - node->plane->dist); -// mid = startz + node->plane->dist - startz; mid = node->plane->dist; break; default: @@ -625,8 +483,6 @@ loc0: goto loc0; } // found an intersection -// mid = startz + (endz - startz) * ((front - node->plane->dist) / ((front - node->plane->dist) - (back - node->plane->dist))); -// mid = startz + (endz - startz) * ((front - node->plane->dist) / (front - back)); mid = startz + distz * (front - node->plane->dist) / (front - back); break; } @@ -679,33 +535,38 @@ loc0: lightmap += size3; } - /* - // LordHavoc: here's the readable version of the interpolation - // code, not quite as easy for the compiler to optimize... - - // dsfrac is the X position in the lightmap pixel, * 16 - // dtfrac is the Y position in the lightmap pixel, * 16 - // r00 is top left corner, r01 is top right corner - // r10 is bottom left corner, r11 is bottom right corner - // g and b are the same layout. - // r0 and r1 are the top and bottom intermediate results - - // first we interpolate the top two points, to get the top - // edge sample - r0 = (((r01-r00) * dsfrac) >> 4) + r00; - g0 = (((g01-g00) * dsfrac) >> 4) + g00; - b0 = (((b01-b00) * dsfrac) >> 4) + b00; - // then we interpolate the bottom two points, to get the - // bottom edge sample - r1 = (((r11-r10) * dsfrac) >> 4) + r10; - g1 = (((g11-g10) * dsfrac) >> 4) + g10; - b1 = (((b11-b10) * dsfrac) >> 4) + b10; - // then we interpolate the top and bottom samples to get the - // middle sample (the one which was requested) - r = (((r1-r0) * dtfrac) >> 4) + r0; - g = (((g1-g0) * dtfrac) >> 4) + g0; - b = (((b1-b0) * dtfrac) >> 4) + b0; - */ +/* +LordHavoc: here's the readable version of the interpolation +code, not quite as easy for the compiler to optimize... + +dsfrac is the X position in the lightmap pixel, * 16 +dtfrac is the Y position in the lightmap pixel, * 16 +r00 is top left corner, r01 is top right corner +r10 is bottom left corner, r11 is bottom right corner +g and b are the same layout. +r0 and r1 are the top and bottom intermediate results + +first we interpolate the top two points, to get the top +edge sample + + r0 = (((r01-r00) * dsfrac) >> 4) + r00; + g0 = (((g01-g00) * dsfrac) >> 4) + g00; + b0 = (((b01-b00) * dsfrac) >> 4) + b00; + +then we interpolate the bottom two points, to get the +bottom edge sample + + r1 = (((r11-r10) * dsfrac) >> 4) + r10; + g1 = (((g11-g10) * dsfrac) >> 4) + g10; + b1 = (((b11-b10) * dsfrac) >> 4) + b10; + +then we interpolate the top and bottom samples to get the +middle sample (the one which was requested) + + r = (((r1-r0) * dtfrac) >> 4) + r0; + g = (((g1-g0) * dtfrac) >> 4) + g0; + b = (((b1-b0) * dtfrac) >> 4) + b0; +*/ color[0] += (float) ((((((((r11-r10) * dsfrac) >> 4) + r10)-((((r01-r00) * dsfrac) >> 4) + r00)) * dtfrac) >> 4) + ((((r01-r00) * dsfrac) >> 4) + r00)) * (1.0f / 32768.0f); color[1] += (float) ((((((((g11-g10) * dsfrac) >> 4) + g10)-((((g01-g00) * dsfrac) >> 4) + g00)) * dtfrac) >> 4) + ((((g01-g00) * dsfrac) >> 4) + g00)) * (1.0f / 32768.0f); @@ -720,197 +581,271 @@ loc0: startz = mid; distz = endz - startz; goto loc0; -// return RecursiveLightPoint (color, node->children[side ^ 1], x, y, mid, endz); } } -void R_CompleteLightPoint (vec3_t color, vec3_t p, int dynamic, mleaf_t *leaf) +void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mleaf_t *leaf) { - int i, *dlightbits; - vec3_t dist; + int i; + vec3_t v; float f; rdlight_t *rd; + mlight_t *sl; if (leaf == NULL) leaf = Mod_PointInLeaf(p, cl.worldmodel); - - if (leaf->contents == CONTENTS_SOLID) + if (!leaf || leaf->contents == CONTENTS_SOLID || r_fullbright.integer || !cl.worldmodel->lightdata) { - color[0] = color[1] = color[2] = 0; + color[0] = color[1] = color[2] = 1; return; } - if (r_fullbright.integer || !cl.worldmodel->lightdata) + color[0] = color[1] = color[2] = r_ambient.value * (2.0f / 128.0f); + if (cl.worldmodel->numlights) { - color[0] = color[1] = color[2] = 2; - return; + for (i = 0;i < cl.worldmodel->numlights;i++) + { + sl = cl.worldmodel->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, 0, false, NULL) == 1) + { + f *= d_lightstylevalue[sl->style] * (1.0f / 65536.0f); + VectorMA(color, f, sl->light, color); + } + } + } } + else + RecursiveLightPoint (color, cl.worldmodel->nodes, p[0], p[1], p[2], p[2] - 65536); - color[0] = color[1] = color[2] = r_ambient.value * (2.0f / 128.0f); - RecursiveLightPoint (color, cl.worldmodel->nodes, p[0], p[1], p[2], p[2] - 65536); - - if (dynamic && leaf->dlightframe == r_framecount) + if (dynamic) { - dlightbits = leaf->dlightbits; for (i = 0;i < r_numdlights;i++) { - if (!(dlightbits[i >> 5] & (1 << (i & 31)))) - continue; rd = r_dlight + i; - VectorSubtract (p, rd->origin, dist); - f = DotProduct(dist, dist) + LIGHTOFFSET; - if (f < rd->cullradius2) + VectorSubtract (p, rd->origin, v); + f = DotProduct(v, v); + if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, 0, false, NULL) == 1) { - f = (1.0f / f) - rd->lightsubtract; - if (f > 0) - VectorMA(color, f, rd->light, color); + f = (1.0f / (f + LIGHTOFFSET)) - rd->subtract; + VectorMA(color, f, rd->light, color); } } } } -void R_ModelLightPoint (vec3_t color, vec3_t p, int *dlightbits) +void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, float *normals, float *colors, float colorr, float colorg, float colorb, int worldcoords) { - mleaf_t *leaf; - leaf = Mod_PointInLeaf(p, cl.worldmodel); - if (leaf->contents == CONTENTS_SOLID) - { - color[0] = color[1] = color[2] = 0; - dlightbits[0] = dlightbits[1] = dlightbits[2] = dlightbits[3] = dlightbits[4] = dlightbits[5] = dlightbits[6] = dlightbits[7] = 0; - return; - } - - if (r_fullbright.integer || !cl.worldmodel->lightdata) - { - color[0] = color[1] = color[2] = 2; - dlightbits[0] = dlightbits[1] = dlightbits[2] = dlightbits[3] = dlightbits[4] = dlightbits[5] = dlightbits[6] = dlightbits[7] = 0; - return; - } - - color[0] = color[1] = color[2] = r_ambient.value * (2.0f / 128.0f); - RecursiveLightPoint (color, cl.worldmodel->nodes, p[0], p[1], p[2], p[2] - 65536); - - if (leaf->dlightframe == r_framecount) - { - dlightbits[0] = leaf->dlightbits[0]; - dlightbits[1] = leaf->dlightbits[1]; - dlightbits[2] = leaf->dlightbits[2]; - dlightbits[3] = leaf->dlightbits[3]; - dlightbits[4] = leaf->dlightbits[4]; - dlightbits[5] = leaf->dlightbits[5]; - dlightbits[6] = leaf->dlightbits[6]; - dlightbits[7] = leaf->dlightbits[7]; - } - else - dlightbits[0] = dlightbits[1] = dlightbits[2] = dlightbits[3] = dlightbits[4] = dlightbits[5] = dlightbits[6] = dlightbits[7] = 0; -} - -void R_LightModel(int numverts) -{ - int i, j, nearlights = 0; - float color[3], basecolor[3], v[3], t, *av, *avn, *avc, a, number, f, hardness, hardnessoffset, dist2; + int i, j, nearlights = 0, maxnearlights = r_modellights.integer; + float color[3], basecolor[3], v[3], t, *av, *avn, *avc, a, f, dist2, mscale, dot, stylescale, intensity, ambientcolor[3]; struct { vec3_t origin; - vec_t cullradius2; + //vec_t cullradius2; vec3_t light; - vec_t lightsubtract; + // how much this light would contribute to ambient if replaced + vec3_t ambientlight; + vec_t subtract; + vec_t falloff; + vec_t offset; + // used for choosing only the brightest lights + vec_t intensity; } nearlight[MAX_DLIGHTS], *nl; - int modeldlightbits[8]; - //staticlight_t *sl; - a = currentrenderentity->alpha; - if (currentrenderentity->effects & EF_FULLBRIGHT) - basecolor[0] = basecolor[1] = basecolor[2] = 1; + mlight_t *sl; + rdlight_t *rd; + mleaf_t *leaf; + a = ent->alpha; + // scale of the model's coordinate space, to alter light attenuation to match + // make the mscale squared so it can scale the squared distance results + mscale = ent->scale * ent->scale; + if (r_fullbright.integer || (ent->effects & EF_FULLBRIGHT)) + basecolor[0] = basecolor[1] = basecolor[2] = 1.0f; + else if (r_shadow_realtime_world.integer) + basecolor[0] = basecolor[1] = basecolor[2] = r_ambient.value * (2.0f / 128.0f); + else if (maxnearlights == 0) + R_CompleteLightPoint (basecolor, ent->origin, true, NULL); else { - if (r_lightmodels.integer) + leaf = Mod_PointInLeaf(ent->origin, cl.worldmodel); + if (!leaf || leaf->contents == CONTENTS_SOLID || !cl.worldmodel->lightdata) + basecolor[0] = basecolor[1] = basecolor[2] = 1; + else { - R_ModelLightPoint(basecolor, currentrenderentity->origin, modeldlightbits); - - nl = &nearlight[0]; - /* - // this code is unused for now - for (i = 0, sl = staticlight;i < staticlights && nearlights < MAX_DLIGHTS;i++, sl++) + basecolor[0] = basecolor[1] = basecolor[2] = r_ambient.value * (2.0f / 128.0f); + if (!cl.worldmodel->numlights) + RecursiveLightPoint (basecolor, cl.worldmodel->nodes, ent->origin[0], ent->origin[1], ent->origin[2], ent->origin[2] - 65536); + } + nl = &nearlight[0]; + for (i = 0;i < ent->numentlights;i++) + { + sl = cl.worldmodel->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; + VectorScale(sl->light, f, ambientcolor); + intensity = DotProduct(ambientcolor, ambientcolor); + if (f < 0) + intensity *= -1.0f; + if (nearlights < maxnearlights) + j = nearlights++; + else { - if (TraceLine(currentrenderentity->origin, sl->origin, NULL, NULL, 0) == 1) + for (j = 0;j < maxnearlights;j++) { - nl->fadetype = sl->fadetype; - nl->distancescale = sl->distancescale; - nl->radius = sl->radius; - VectorCopy(sl->origin, nl->origin); - VectorCopy(sl->color, nl->light); - nl->cullradius2 = 99999999; - nl->lightsubtract = 0; - nl++; - nearlights++; + if (nearlight[j].intensity < intensity) + { + if (nearlight[j].intensity > 0) + VectorAdd(basecolor, nearlight[j].ambientlight, basecolor); + break; + } } } - */ - for (i = 0;i < r_numdlights && nearlights < MAX_DLIGHTS;i++) + if (j >= maxnearlights) { - if (!(modeldlightbits[i >> 5] & (1 << (i & 31)))) - continue; - if (currentrenderentity == r_dlight[i].ent) - { - f = (1.0f / LIGHTOFFSET) - nl->lightsubtract; - if (f > 0) - VectorMA(basecolor, f, r_dlight[i].light, basecolor); - } + // this light is less significant than all others, + // add it to ambient + if (intensity > 0) + VectorAdd(basecolor, ambientcolor, basecolor); + } + else + { + nl = nearlight + j; + nl->intensity = intensity; + // transform the light into the model's coordinate system + if (worldcoords) + VectorCopy(sl->origin, nl->origin); else + Matrix4x4_Transform(&ent->inversematrix, sl->origin, nl->origin); + // integrate mscale into falloff, for maximum speed + nl->falloff = sl->falloff * mscale; + VectorCopy(ambientcolor, nl->ambientlight); + nl->light[0] = sl->light[0] * stylescale * colorr * 4.0f; + nl->light[1] = sl->light[1] * stylescale * colorg * 4.0f; + nl->light[2] = sl->light[2] * stylescale * colorb * 4.0f; + nl->subtract = sl->subtract; + nl->offset = sl->distbias; + } + } + if (!r_shadow_realtime_dlight.integer) + { + for (i = 0;i < r_numdlights;i++) + { + rd = r_dlight + i; + VectorCopy(rd->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) { - // convert 0-255 radius coloring to 0-1, while also amplifying the brightness by 16 - //if (TraceLine(currentrenderentity->origin, r_dlight[i].origin, NULL, NULL, 0) == 1) + if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, 0, false, NULL) != 1) + continue; + VectorSubtract (ent->origin, rd->origin, v); + f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - rd->subtract); + VectorScale(rd->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(basecolor, nearlight[j].ambientlight, basecolor); + break; + } + } + } + if (j >= maxnearlights) + { + // this light is less significant than all others, + // add it to ambient + if (intensity > 0) + VectorAdd(basecolor, ambientcolor, basecolor); + } + else { + nl = nearlight + j; + nl->intensity = intensity; // transform the light into the model's coordinate system - //if (gl_transform.integer) - // softwareuntransform(r_dlight[i].origin, nl->origin); - //else - VectorCopy(r_dlight[i].origin, nl->origin); - nl->cullradius2 = r_dlight[i].cullradius2; - VectorCopy(r_dlight[i].light, nl->light); - nl->lightsubtract = r_dlight[i].lightsubtract; - nl++; - nearlights++; + if (worldcoords) + VectorCopy(rd->origin, nl->origin); + else + { + Matrix4x4_Transform(&ent->inversematrix, rd->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] + , 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] = 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->offset = LIGHTOFFSET; } } } } - else - R_CompleteLightPoint (basecolor, currentrenderentity->origin, true, NULL); } - avc = aliasvertcolor; + basecolor[0] *= colorr; + basecolor[1] *= colorg; + basecolor[2] *= colorb; + avc = colors; if (nearlights) { - av = aliasvert; - avn = aliasvertnorm; - hardness = r_lightmodelhardness.value; - hardnessoffset = (1.0f - hardness); + GL_UseColorArray(); + av = vertices; + avn = normals; for (i = 0;i < numverts;i++) { VectorCopy(basecolor, color); for (j = 0, nl = &nearlight[0];j < nearlights;j++, nl++) { - // distance attenuation - VectorSubtract(nl->origin, av, v); - dist2 = DotProduct(v,v); - if (dist2 < nl->cullradius2) + VectorSubtract(av, nl->origin, v); + // directional shading + dot = DotProduct(avn,v); + if (dot > 0) { - f = (1.0f / (dist2 + LIGHTOFFSET)) - nl->lightsubtract; + // the vertex normal faces the light + + // do the distance attenuation + dist2 = DotProduct(v,v); + f = (1.0f / (dist2 * nl->falloff + nl->offset)) - nl->subtract; if (f > 0) { - // directional shading - #if SLOWMATH + //#if SLOWMATH t = 1.0f / sqrt(dist2); - #else - number = DotProduct(v, v); - *((long *)&t) = 0x5f3759df - ((* (long *) &number) >> 1); - t = t * (1.5f - (number * 0.5f * t * t)); - #endif - // DotProduct(avn,v) * t is dotproduct with a normalized v, + //#else + //*((int *)&t) = 0x5f3759df - ((* (int *) &dist2) >> 1); + //t = t * (1.5f - (dist2 * 0.5f * t * t)); + //#endif + + // dot * t is dotproduct with a normalized v. + // (the result would be -1 to +1, but we already + // eliminated the <= 0 case, so it is 0 to 1) + // the hardness variables are for backlighting/shinyness - f *= DotProduct(avn,v) * t * hardness + hardnessoffset; - if (f > 0) - VectorMA(color, f, nl->light, color); + // these have been hardwired at * 0.5 + 0.5 to match + // the quake map lighting utility's equations + f *= dot * t;// * 0.5f + 0.5f;// * hardness + hardnessoffset; + VectorMA(color, f, nl->light, color); } } } @@ -918,17 +853,31 @@ void R_LightModel(int numverts) VectorCopy(color, avc); avc[3] = a; avc += 4; - av += 4; + av += 3; avn += 3; } } else + GL_Color(basecolor[0], basecolor[1], basecolor[2], a); +} + +void R_UpdateEntLights(entity_render_t *ent) +{ + int i; + const mlight_t *sl; + vec3_t v; + if (r_shadow_realtime_dlight.integer) + return; + VectorSubtract(ent->origin, ent->entlightsorigin, v); + if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f)) { - for (i = 0;i < numverts;i++) - { - VectorCopy(basecolor, avc); - avc[3] = a; - avc += 4; - } + ent->entlightstime = realtime + 0.1; + VectorCopy(ent->origin, ent->entlightsorigin); + ent->numentlights = 0; + if (cl.worldmodel) + for (i = 0, sl = cl.worldmodel->lights;i < cl.worldmodel->numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++) + if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, 0, false, NULL) == 1) + ent->entlights[ent->numentlights++] = i; } + ent->entlightsframe = r_framecount; }