X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=r_light.c;h=5c69018b3f2309f8283a65c1c54395b85cbc4542;hb=b9616813f4f94820138fb14aa5fb0b6ced557f4f;hp=716998a44ea49e3fd777948969f117ecbb58d5d9;hpb=04b239d7f6d022fb5a4c42c19b4d8888a0361514;p=xonotic%2Fdarkplaces.git diff --git a/r_light.c b/r_light.c index 716998a4..5c69018b 100644 --- a/r_light.c +++ b/r_light.c @@ -23,11 +23,7 @@ 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"}; @@ -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,7 +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); + 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); } } } @@ -192,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); } } } @@ -211,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; @@ -284,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); @@ -331,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]; @@ -344,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); @@ -385,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] @@ -483,7 +435,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;