X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=86c2a0d4031f33e69c1a75315f5f62920e3d9736;hb=3474fdc002ec14ac862470cd9496e656e64e09c9;hp=57b9cc689609667c969b1484bb95707894032029;hpb=fedb845e665b669ff11df23ce713842bd89c4ec4;p=xonotic%2Fdarkplaces.git diff --git a/r_light.c b/r_light.c index 57b9cc68..86c2a0d4 100644 --- a/r_light.c +++ b/r_light.c @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "cl_collision.h" +#include "r_shadow.h" rdlight_t r_dlight[MAX_DLIGHTS]; int r_numdlights = 0; @@ -53,7 +54,7 @@ void r_light_start(void) pixels[y][x][3] = 255; } } - lightcorona = R_LoadTexture (lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE); + lightcorona = R_LoadTexture2D(lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL); } void r_light_shutdown(void) @@ -132,7 +133,7 @@ void R_BuildLightList(void) rd->cullradius2 = (2048.0f * 2048.0f); rd->cullradius = sqrt(rd->cullradius2); rd->subtract = 1.0f / rd->cullradius2; - //rd->ent = cd->ent; + rd->ent = cd->ent; c_dlights++; // count every dlight in use } } @@ -148,19 +149,22 @@ void R_DrawCoronas(void) memset(&m, 0, sizeof(m)); m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ONE; - m.wantoverbright = false; m.depthdisable = true; // magic m.tex[0] = R_GetTexture(lightcorona); R_Mesh_Matrix(&r_identitymatrix); R_Mesh_State(&m); viewdist = DotProduct(r_origin, vpn); + varray_texcoord[0][ 0] = 0;varray_texcoord[0][ 1] = 0; + varray_texcoord[0][ 4] = 0;varray_texcoord[0][ 5] = 1; + varray_texcoord[0][ 8] = 1;varray_texcoord[0][ 9] = 1; + varray_texcoord[0][12] = 1;varray_texcoord[0][13] = 0; for (i = 0;i < r_numdlights;i++) { rd = r_dlight + i; dist = (DotProduct(rd->origin, vpn) - viewdist); - if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true) == 1) + if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true, NULL) == 1) { - scale = mesh_colorscale * (1.0f / 131072.0f); + scale = r_colorscale * (1.0f / 131072.0f); if (gl_flashblend.integer) scale *= 4.0f; if (fogenabled) @@ -168,24 +172,7 @@ void R_DrawCoronas(void) VectorSubtract(rd->origin, r_origin, diff); scale *= 1 - exp(fogdensity/DotProduct(diff,diff)); } - varray_element[0] = 0; - varray_element[1] = 1; - varray_element[2] = 2; - varray_element[3] = 0; - varray_element[4] = 2; - varray_element[5] = 3; - varray_color[ 0] = varray_color[ 4] = varray_color[ 8] = varray_color[12] = rd->light[0] * scale; - varray_color[ 1] = varray_color[ 5] = varray_color[ 9] = varray_color[13] = rd->light[1] * scale; - varray_color[ 2] = varray_color[ 6] = varray_color[10] = varray_color[14] = rd->light[2] * scale; - varray_color[ 3] = varray_color[ 7] = varray_color[11] = varray_color[15] = 1; - varray_texcoord[0][0] = 0; - varray_texcoord[0][1] = 0; - varray_texcoord[0][2] = 0; - varray_texcoord[0][3] = 1; - varray_texcoord[0][4] = 1; - varray_texcoord[0][5] = 1; - varray_texcoord[0][6] = 1; - varray_texcoord[0][7] = 0; + 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; @@ -201,7 +188,7 @@ void R_DrawCoronas(void) varray_vertex[12] = rd->origin[0] + vright[0] * scale - vup[0] * scale; varray_vertex[13] = rd->origin[1] + vright[1] * scale - vup[1] * scale; varray_vertex[14] = rd->origin[2] + vright[2] * scale - vup[2] * scale; - R_Mesh_Draw(4, 2); + R_Mesh_Draw(4, 2, polygonelements); } } } @@ -223,7 +210,7 @@ static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t { float ndist, maxdist; msurface_t *surf; - int i; + int i, *surfacepvsframes; int d, impacts, impactt; float dist, dist2, impact[3]; @@ -233,6 +220,7 @@ static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t // for comparisons to minimum acceptable light maxdist = rd->cullradius2; + surfacepvsframes = ent->model->surfacepvsframes; loc0: if (node->contents < 0) return; @@ -254,7 +242,7 @@ loc0: surf = ent->model->surfaces + node->firstsurface; for (i = 0;i < node->numsurfaces;i++, surf++) { - if (surf->visframe != r_framecount) + if (surfacepvsframes[surf->number] != ent->model->pvsframecount) continue; dist = ndist; if (surf->flags & SURF_PLANEBACK) @@ -297,6 +285,8 @@ loc0: { 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; } @@ -329,8 +319,8 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b 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; @@ -363,6 +353,7 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b maxdist = rd->cullradius2; row = (model->numleafs+7)>>3; + surfacepvsframes = model->surfacepvsframes; k = 0; while (k < row) @@ -388,12 +379,12 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b 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) @@ -435,6 +426,8 @@ static void R_VisMarkLights (entity_render_t *ent, rdlight_t *rd, int bit, int b { 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; } @@ -632,7 +625,7 @@ void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mlea { 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) == 1) + 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); @@ -650,7 +643,7 @@ void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mlea rd = r_dlight + i; VectorSubtract (p, rd->origin, v); f = DotProduct(v, v); - if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, 0, false) == 1) + if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, 0, false, NULL) == 1) { f = (1.0f / (f + LIGHTOFFSET)) - rd->subtract; VectorMA(color, f, rd->light, color); @@ -670,11 +663,11 @@ void R_ModelLightPoint (const entity_render_t *ent, vec3_t color, const vec3_t p } color[0] = color[1] = color[2] = r_ambient.value * (2.0f / 128.0f); - if (!cl.worldmodel->numlights) + if (!cl.worldmodel->numlights && r_shadow_lightingmode < 2) RecursiveLightPoint (color, cl.worldmodel->nodes, p[0], p[1], p[2], p[2] - 65536); } -void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float colorg, float colorb, int worldcoords) +void R_LightModel(const entity_render_t *ent, int numverts, float *vertices, float *normals, float *colors, float colorr, float colorg, float colorb, int worldcoords) { 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]; @@ -702,72 +695,16 @@ void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float { R_ModelLightPoint(ent, basecolor, ent->origin); - 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 - { - 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 (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; - } - } - for (i = 0;i < r_numdlights;i++) + if (r_shadow_lightingmode < 2) { - 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) + nl = &nearlight[0]; + for (i = 0;i < ent->numentlights;i++) { - if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, 0, false) != 1) - continue; - VectorSubtract (ent->origin, rd->origin, v); - f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - rd->subtract); - VectorScale(rd->light, f, ambientcolor); + 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; @@ -798,45 +735,106 @@ void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float nl->intensity = intensity; // transform the light into the model's coordinate system if (worldcoords) - VectorCopy(rd->origin, nl->origin); + VectorCopy(sl->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]); - */ - } + Matrix4x4_Transform(&ent->inversematrix, sl->origin, nl->origin); // integrate mscale into falloff, for maximum speed - nl->falloff = mscale; + nl->falloff = sl->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; + 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_lightingmode < 1) + { + 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) + { + 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 (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, ent->origin, true, NULL); - } basecolor[0] *= colorr; basecolor[1] *= colorg; basecolor[2] *= colorb; - avc = aliasvertcolor; + avc = colors; if (nearlights) { - av = aliasvert; - avn = aliasvertnorm; + GL_UseColorArray(); + av = vertices; + avn = normals; for (i = 0;i < numverts;i++) { VectorCopy(basecolor, color); @@ -878,18 +876,11 @@ void R_LightModel(const entity_render_t *ent, int numverts, float colorr, float avc[3] = a; avc += 4; av += 4; - avn += 3; + avn += 4; } } else - { - for (i = 0;i < numverts;i++) - { - VectorCopy(basecolor, avc); - avc[3] = a; - avc += 4; - } - } + GL_Color(basecolor[0], basecolor[1], basecolor[2], a); } void R_UpdateEntLights(entity_render_t *ent) @@ -897,6 +888,8 @@ void R_UpdateEntLights(entity_render_t *ent) int i; const mlight_t *sl; vec3_t v; + if (r_shadow_lightingmode >= 2) + return; VectorSubtract(ent->origin, ent->entlightsorigin, v); if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f)) { @@ -905,7 +898,7 @@ void R_UpdateEntLights(entity_render_t *ent) 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) == 1) + if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, 0, false, NULL) == 1) ent->entlights[ent->numentlights++] = i; } ent->entlightsframe = r_framecount;