#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"};
+cvar_t r_modellights = {CVAR_SAVE, "r_modellights", "4", "how many lights from a .lights file (produced by hlight) are worthy of directional shading on a model (others are applied to the whole model as ambient lighting)"};
+cvar_t r_coronas = {CVAR_SAVE, "r_coronas", "1", "brightness of corona flare effects around certain lights, 0 disables corona effects"};
+cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0", "render bright coronas for dynamic lights instead of actual lighting, fast but ugly"};
static rtexture_t *lightcorona;
static rtexturepool_t *lighttexturepool;
{
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++)
{
{
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;
dlight_t *light;
if (r_coronas.value < 0.01)
return;
- R_Mesh_Matrix(&r_identitymatrix);
+ R_Mesh_Matrix(&identitymatrix);
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++)
{
- 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;
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);
}
}
}
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);
}
}
}
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;
float v[3], f, mscale, stylescale, intensity, ambientcolor[3], tempdiffusenormal[3];
nearlight_t *nl;
mlight_t *sl;
- dlight_t *light;
nearlights = 0;
maxnearlights = r_modellights.integer;
VectorSet(ambient4f, 1, 1, 1);
maxnearlights = 0;
}
- else if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT))
+ else if (r_lightmapintensity <= 0)
maxnearlights = 0;
else
{
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);
nl->offset = sl->distbias;
}
}
- if (ent->flags & RENDER_TRANSPARENT)
- {
- // FIXME: this dlighting doesn't look like rtlights
- for (i = 0;i < r_numdlights;i++)
- {
- light = r_dlight + 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, 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)
- continue;
- 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;
- if (nearlights < maxnearlights)
- j = nearlights++;
- else
- {
- for (j = 0;j < maxnearlights;j++)
- {
- if (nearlight[j].intensity < intensity)
- {
- if (nearlight[j].intensity > 0)
- VectorAdd(ambient4f, nearlight[j].ambientlight, ambient4f);
- break;
- }
- }
- }
- if (j >= maxnearlights)
- {
- // this light is less significant than all others,
- // add it to ambient
- if (intensity > 0)
- VectorAdd(ambient4f, ambientcolor, ambient4f);
- }
- else
- {
- nl = nearlight + j;
- nl->intensity = intensity;
- // transform the light into the model's coordinate system
- if (worldcoords)
- VectorCopy(light->origin, nl->origin);
- else
- {
- 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
- , 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]
- , 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] = 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;
- }
- }
- }
- }
ambient4f[0] *= colorr;
ambient4f[1] *= colorg;
ambient4f[2] *= colorb;
// 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
int i;
const mlight_t *sl;
vec3_t v;
- if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT))
+ if (r_lightmapintensity <= 0)
return;
VectorSubtract(ent->origin, ent->entlightsorigin, v);
if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f))
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;
projects / xonotic / darkplaces.git / blobdiff