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"};
static rtexture_t *lightcorona;
dx = (x - 15.5f) * (1.0f / 16.0f);
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_LoadTexture (lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE);
}
void r_light_shutdown(void)
void R_Light_Init(void)
{
- Cvar_RegisterVariable(&r_lightmodels);
+ Cvar_RegisterVariable(&r_modellights);
Cvar_RegisterVariable(&r_vismarklights);
R_RegisterModule("R_Light", r_light_start, r_light_shutdown, r_light_newmap);
}
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;
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;
- rd->ent = cd->ent;
+ 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;
+ rmeshbufferinfo_t m;
+ float scale, viewdist, diff[3], dist;
rdlight_t *rd;
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;
viewdist = DotProduct(r_origin, vpn);
for (i = 0;i < r_numdlights;i++)
{
{
// trace to a point just barely closer to the eye
VectorSubtract(rd->origin, vpn, diff);
- if (CL_TraceLine(r_origin, diff, NULL, NULL, 0, true) == 1)
+ if (CL_TraceLine(r_origin, diff, NULL, NULL, 0, true) == 1 && R_Mesh_Draw_GetBuffer(&m, false))
{
- scale = 1.0f / 131072.0f;
- m.cr = rd->light[0] * scale;
- m.cg = rd->light[1] * scale;
- m.cb = rd->light[2] * scale;
- m.ca = 1;
+ scale = m.colorscale * (1.0f / 131072.0f);
if (fogenabled)
{
VectorSubtract(rd->origin, r_origin, diff);
- m.ca *= 1 - exp(fogdensity/DotProduct(diff,diff));
+ scale *= 1 - exp(fogdensity/DotProduct(diff,diff));
}
+ m.index[0] = 0;
+ m.index[1] = 1;
+ m.index[2] = 2;
+ m.index[3] = 0;
+ m.index[4] = 2;
+ m.index[5] = 3;
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = rd->light[0] * scale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = rd->light[1] * scale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = rd->light[2] * scale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 1;
+ m.texcoords[0][0] = 0;
+ m.texcoords[0][1] = 0;
+ m.texcoords[0][2] = 0;
+ m.texcoords[0][3] = 1;
+ m.texcoords[0][4] = 1;
+ m.texcoords[0][5] = 1;
+ m.texcoords[0][6] = 1;
+ m.texcoords[0][7] = 0;
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);
+ m.vertex[0] = rd->origin[0] - vright[0] * scale - vup[0] * scale;
+ m.vertex[1] = rd->origin[1] - vright[1] * scale - vup[1] * scale;
+ m.vertex[2] = rd->origin[2] - vright[2] * scale - vup[2] * scale;
+ m.vertex[4] = rd->origin[0] - vright[0] * scale + vup[0] * scale;
+ m.vertex[5] = rd->origin[1] - vright[1] * scale + vup[1] * scale;
+ m.vertex[6] = rd->origin[2] - vright[2] * scale + vup[2] * scale;
+ m.vertex[8] = rd->origin[0] + vright[0] * scale + vup[0] * scale;
+ m.vertex[9] = rd->origin[1] + vright[1] * scale + vup[1] * scale;
+ m.vertex[10] = rd->origin[2] + vright[2] * scale + vup[2] * scale;
+ m.vertex[12] = rd->origin[0] + vright[0] * scale - vup[0] * scale;
+ m.vertex[13] = rd->origin[1] + vright[1] * scale - vup[1] * scale;
+ m.vertex[14] = rd->origin[2] + vright[2] * scale - vup[2] * scale;
+ R_Mesh_Render();
}
}
}
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;
+ mleaf_t *leaf;
+ int i;
if (!r_dynamic.integer)
return;
}
// mark the polygons
- surf = currentrenderentity->model->surfaces + node->firstsurface;
+ surf = ent->model->surfaces + node->firstsurface;
for (i=0 ; i<node->numsurfaces ; i++, surf++)
{
int d, impacts, impactt;
{
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;
}
}
-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;
+ int i, k, m, c, leafnum;
msurface_t *surf, **mark;
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;
+ model = ent->model;
softwareuntransform(rd->origin, lightorigin);
if (!r_vismarklights.integer)
{
- R_OldMarkLights(lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
+ R_OldMarkLights(ent, lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
return;
}
if (pvsleaf == NULL)
{
Con_Printf("R_VisMarkLights: NULL leaf??\n");
- R_OldMarkLights(lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
+ R_OldMarkLights(ent, lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
return;
}
if (!in)
{
// no vis info, so make all visible
- R_OldMarkLights(lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
+ R_OldMarkLights(ent, lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
return;
}
}
}
-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);
+ R_VisMarkLights (ent, r_dlight + i, 1 << (i & 31), i >> 5);
}
/*
static int RecursiveLightPoint (vec3_t color, 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)
void R_CompleteLightPoint (vec3_t color, vec3_t p, int dynamic, mleaf_t *leaf)
{
- int i, *dlightbits;
- vec3_t dist;
+ int i, *dlightbits;
+ vec3_t v;
float f;
rdlight_t *rd;
mlight_t *sl;
sl = cl.worldmodel->lights + i;
if (d_lightstylevalue[sl->style] > 0)
{
- VectorSubtract (p, sl->origin, dist);
- f = DotProduct(dist, dist) + sl->distbias;
- f = (1.0f / f) - sl->subtract;
- if (f > 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) == 1)
{
- if (CL_TraceLine(p, sl->origin, NULL, NULL, 0, false) == 1)
- {
- f *= d_lightstylevalue[sl->style] * (1.0f / 16384.0f);
- VectorMA(color, f, sl->light, color);
- }
+ f *= d_lightstylevalue[sl->style] * (1.0f / 65536.0f);
+ VectorMA(color, f, sl->light, color);
}
}
-
}
}
else
if (!(dlightbits[i >> 5] & (1 << (i & 31))))
continue;
rd = r_dlight + i;
- VectorSubtract (p, rd->origin, dist);
- f = DotProduct(dist, dist) + LIGHTOFFSET;
+ VectorSubtract (p, rd->origin, v);
+ f = DotProduct(v, v);
if (f < rd->cullradius2)
{
- 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_ModelLightPoint (entity_render_t *ent, vec3_t color, vec3_t p, int *dlightbits)
{
mleaf_t *leaf;
leaf = Mod_PointInLeaf(p, cl.worldmodel);
return;
}
- if (r_fullbright.integer || !cl.worldmodel->lightdata)
+ if (r_fullbright.integer || !cl.worldmodel->lightdata || ent->effects & EF_FULLBRIGHT)
{
color[0] = color[1] = color[2] = 2;
dlightbits[0] = dlightbits[1] = dlightbits[2] = dlightbits[3] = dlightbits[4] = dlightbits[5] = dlightbits[6] = dlightbits[7] = 0;
dlightbits[0] = dlightbits[1] = dlightbits[2] = dlightbits[3] = dlightbits[4] = dlightbits[5] = dlightbits[6] = dlightbits[7] = 0;
}
-void R_LightModel(int numverts, float colorr, float colorg, float colorb, int worldcoords)
+void R_LightModel(entity_render_t *ent, int numverts, float colorr, float colorg, float colorb, int worldcoords)
{
- int i, j, nearlights = 0;
- float color[3], basecolor[3], v[3], t, *av, *avn, *avc, a, number, f, dist2, mscale;
+ 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;
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];
mlight_t *sl;
- a = currentrenderentity->alpha;
+ rdlight_t *rd;
+ 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 = currentrenderentity->scale * currentrenderentity->scale;
- if (r_fullbright.integer || r_ambient.value > 128.0f || currentrenderentity->effects & EF_FULLBRIGHT)
+ mscale = ent->scale * ent->scale;
+ if ((maxnearlights != 0) && !r_fullbright.integer && !(ent->effects & EF_FULLBRIGHT))
{
- basecolor[0] = colorr * 2.0f;
- basecolor[1] = colorg * 2.0f;
- basecolor[2] = colorb * 2.0f;
- }
- else
- {
- if (r_lightmodels.integer)
- {
- R_ModelLightPoint(basecolor, currentrenderentity->origin, modeldlightbits);
+ R_ModelLightPoint(ent, basecolor, ent->origin, modeldlightbits);
- nl = &nearlight[0];
- VectorSubtract(currentrenderentity->origin, currentrenderentity->entlightsorigin, v);
- if ((realtime > currentrenderentity->entlightstime && DotProduct(v,v) >= 1.0f) || currentrenderentity->numentlights >= MAXENTLIGHTS)
+ nl = &nearlight[0];
+ VectorSubtract(ent->origin, ent->entlightsorigin, v);
+ if ((realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f))
+ {
+ ent->numentlights = 0;
+ ent->entlightstime = realtime + 0.2;
+ VectorCopy(ent->origin, ent->entlightsorigin);
+ 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)
+ ent->entlights[ent->numentlights++] = i;
+ }
+ 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
{
- currentrenderentity->numentlights = 0;
- currentrenderentity->entlightstime = realtime + 0.2;
- VectorCopy(currentrenderentity->origin, currentrenderentity->entlightsorigin);
- for (i = 0, sl = cl.worldmodel->lights;i < cl.worldmodel->numlights && nearlights < MAX_DLIGHTS;i++, sl++)
+ for (j = 0;j < maxnearlights;j++)
{
- if (CL_TraceLine(currentrenderentity->origin, sl->origin, NULL, NULL, 0, false) == 1)
+ if (nearlight[j].intensity < intensity)
{
- if (currentrenderentity->numentlights < MAXENTLIGHTS)
- currentrenderentity->entlights[currentrenderentity->numentlights++] = i;
-
- // integrate mscale into falloff, for maximum speed
- nl->falloff = mscale * sl->falloff;
- // transform the light into the model's coordinate system
- if (worldcoords)
- VectorCopy(sl->origin, nl->origin);
- else
- softwareuntransform(sl->origin, nl->origin);
- f = d_lightstylevalue[sl->style] * (1.0f / 65536.0f);
- nl->light[0] = sl->light[0] * f * colorr;
- nl->light[1] = sl->light[1] * f * colorg;
- nl->light[2] = sl->light[2] * f * colorb;
- //nl->cullradius2 = 99999999;
- nl->lightsubtract = sl->subtract;
- nl->offset = sl->distbias;
- nl++;
- nearlights++;
+ 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
{
- for (i = 0;i < currentrenderentity->numentlights && nearlights < MAX_DLIGHTS;i++)
- {
- sl = cl.worldmodel->lights + currentrenderentity->entlights[i];
-
- // integrate mscale into falloff, for maximum speed
- nl->falloff = mscale * sl->falloff;
- // transform the light into the model's coordinate system
- if (worldcoords)
- VectorCopy(sl->origin, nl->origin);
- else
- softwareuntransform(sl->origin, nl->origin);
- f = d_lightstylevalue[sl->style] * (1.0f / 65536.0f);
- nl->light[0] = sl->light[0] * f * colorr;
- nl->light[1] = sl->light[1] * f * colorg;
- nl->light[2] = sl->light[2] * f * colorb;
- //nl->cullradius2 = 99999999;
- nl->lightsubtract = sl->subtract;
- nl->offset = sl->distbias;
- nl++;
- nearlights++;
- }
+ nl = nearlight + j;
+ nl->intensity = intensity;
+ // transform the light into the model's coordinate system
+ if (worldcoords)
+ VectorCopy(sl->origin, nl->origin);
+ else
+ softwareuntransform(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 && nearlights < MAX_DLIGHTS;i++)
+ }
+ for (i = 0;i < r_numdlights;i++)
+ {
+ if (!(modeldlightbits[i >> 5] & (1 << (i & 31))))
+ continue;
+ rd = r_dlight + i;
+ 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
{
- if (!(modeldlightbits[i >> 5] & (1 << (i & 31))))
- continue;
- if (currentrenderentity == r_dlight[i].ent)
+ for (j = 0;j < maxnearlights;j++)
{
- f = (1.0f / LIGHTOFFSET) - nl->lightsubtract;
- if (f > 0)
- VectorMA(basecolor, f, r_dlight[i].light, basecolor);
+ 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
- {
- // transform the light into the model's coordinate system
- if (worldcoords)
- VectorCopy(r_dlight[i].origin, nl->origin);
- else
- softwareuntransform(r_dlight[i].origin, nl->origin);
- // integrate mscale into falloff, for maximum speed
- nl->falloff = mscale;
- // scale the cullradius so culling by distance is done before mscale is applied
- //nl->cullradius2 = r_dlight[i].cullradius2 * currentrenderentity->scale * currentrenderentity->scale;
- nl->light[0] = r_dlight[i].light[0] * colorr;
- nl->light[1] = r_dlight[i].light[1] * colorg;
- nl->light[2] = r_dlight[i].light[2] * colorb;
- nl->lightsubtract = r_dlight[i].lightsubtract;
- nl->offset = LIGHTOFFSET;
- nl++;
- nearlights++;
- }
+ softwareuntransform(rd->origin, nl->origin);
+ // 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);
+ }
+ else
+ {
+ R_CompleteLightPoint (basecolor, ent->origin, true, NULL);
}
basecolor[0] *= colorr;
basecolor[1] *= colorg;
{
VectorSubtract(nl->origin, av, v);
// directional shading
- a = DotProduct(avn,v);
- if (a > 0)
+ dot = DotProduct(avn,v);
+ if (dot > 0)
{
// the vertex normal faces the light
// do the distance attenuation
dist2 = DotProduct(v,v);
- f = (1.0f / (dist2 * nl->falloff + nl->offset)) - nl->lightsubtract;
+ f = (1.0f / (dist2 * nl->falloff + nl->offset)) - nl->subtract;
if (f > 0)
{
#if SLOWMATH
t = 1.0f / sqrt(dist2);
#else
- number = DotProduct(v, v);
- *((int *)&t) = 0x5f3759df - ((* (int *) &number) >> 1);
- t = t * (1.5f - (number * 0.5f * t * t));
+ *((int *)&t) = 0x5f3759df - ((* (int *) &dist2) >> 1);
+ t = t * (1.5f - (dist2 * 0.5f * t * t));
#endif
- // a * t is dotproduct with a normalized v.
+
+ // 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
// these have been hardwired at * 0.5 + 0.5 to match
// the quake map lighting utility's equations
- f *= a * t * 0.5f + 0.5f;// * hardness + hardnessoffset;
+ f *= dot * t;// * 0.5f + 0.5f;// * hardness + hardnessoffset;
VectorMA(color, f, nl->light, color);
}
}
projects / xonotic / darkplaces.git / blobdiff