X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_light.c;h=69b5097e425b3a4aab7afa817eb449afdc18abd1;hb=890d4c00928b263763b460cb6f5b6a828fd4afc7;hp=0dc8bee068c68829de1e25168317985353f2b90e;hpb=8b554980f64dffdba3e87209cdc5ab49c4741eca;p=xonotic%2Fdarkplaces.git diff --git a/r_light.c b/r_light.c index 0dc8bee0..69b5097e 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", "1"}; +cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0"}; 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,121 +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->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)); + 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); } } } @@ -283,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); @@ -306,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); } } } @@ -325,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; @@ -398,7 +236,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); @@ -445,12 +283,12 @@ 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++) + for (i = 0;i < r_refdef.numlights;i++) { - light = r_dlight + i; + 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]; @@ -458,7 +296,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); @@ -499,7 +337,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co 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 - 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] @@ -549,9 +387,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 @@ -597,7 +437,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;