void R_DrawCoronas(void)
{
int i;
- rmeshstate_t m;
- float scale, viewdist, diff[3], dist;
+ float cscale, scale, viewdist, dist;
rdlight_t *rd;
if (!r_coronas.integer)
return;
- memset(&m, 0, sizeof(m));
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ONE;
- m.depthdisable = true; // magic
- m.tex[0] = R_GetTexture(lightcorona);
R_Mesh_Matrix(&r_identitymatrix);
- R_Mesh_State(&m);
viewdist = DotProduct(r_origin, vpn);
for (i = 0;i < r_numdlights;i++)
{
dist = (DotProduct(rd->origin, vpn) - viewdist);
if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true, NULL) == 1)
{
- scale = r_colorscale * (1.0f / 131072.0f);
- if (gl_flashblend.integer)
- scale *= 4.0f;
- if (fogenabled)
- {
- VectorSubtract(rd->origin, r_origin, diff);
- scale *= 1 - exp(fogdensity/DotProduct(diff,diff));
- }
- GL_Color(rd->light[0] * scale, rd->light[1] * scale, rd->light[2] * scale, 1);
+ cscale = (1.0f / 131072.0f);
scale = rd->cullradius * 0.25f;
if (gl_flashblend.integer)
+ {
+ cscale *= 4.0f;
scale *= 2.0f;
- R_DrawSpriteMesh(rd->origin, vright, vup, scale, -scale, -scale, scale);
+ }
+ R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, rd->origin, vright, vup, scale, -scale, -scale, scale, rd->light[0] * cscale, rd->light[1] * cscale, rd->light[2] * cscale, 1);
}
}
}
=============================================================================
*/
+static int lightpvsbytes;
+static qbyte lightpvs[(MAX_MAP_LEAFS+7)>>3];
+
/*
=============
R_MarkLights
=============
*/
-static void R_OldMarkLights (entity_render_t *ent, vec3_t lightorigin, rdlight_t *rd, int bit, int bitindex, mnode_t *node)
+static void R_RecursiveMarkLights(entity_render_t *ent, vec3_t lightorigin, rdlight_t *rd, int bit, int bitindex, mnode_t *node, qbyte *pvs, int pvsbits)
{
- float ndist, maxdist;
- msurface_t *surf;
- int i, *surfacepvsframes;
- int d, impacts, impactt;
- float dist, dist2, impact[3];
-
- if (!r_dynamic.integer)
- return;
+ int i;
+ mleaf_t *leaf;
+ float dist;
// for comparisons to minimum acceptable light
- maxdist = rd->cullradius2;
-
- surfacepvsframes = ent->model->surfacepvsframes;
-loc0:
- if (node->contents < 0)
- return;
-
- ndist = PlaneDiff(lightorigin, node->plane);
-
- if (ndist > rd->cullradius)
- {
- node = node->children[0];
- goto loc0;
- }
- if (ndist < -rd->cullradius)
- {
- node = node->children[1];
- goto loc0;
- }
-
-// mark the polygons
- surf = ent->model->surfaces + node->firstsurface;
- for (i = 0;i < node->numsurfaces;i++, surf++)
+ while(node->contents >= 0)
{
- if (surfacepvsframes[surf->number] != ent->model->pvsframecount)
- continue;
- dist = ndist;
- if (surf->flags & SURF_PLANEBACK)
- dist = -dist;
-
- if (dist < -0.25f && !(surf->flags & SURF_LIGHTBOTHSIDES))
- continue;
-
- dist2 = dist * dist;
- if (dist2 >= maxdist)
- continue;
-
- if (node->plane->type < 3)
- {
- VectorCopy(lightorigin, impact);
- impact[node->plane->type] -= dist;
- }
+ dist = PlaneDiff(lightorigin, node->plane);
+ if (dist > rd->cullradius)
+ node = node->children[0];
else
{
- impact[0] = lightorigin[0] - surf->plane->normal[0] * dist;
- impact[1] = lightorigin[1] - surf->plane->normal[1] * dist;
- impact[2] = lightorigin[2] - surf->plane->normal[2] * dist;
- }
-
- 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;
- if (r_dlightmap.integer)
- surf->cached_dlight = true;
+ if (dist >= -rd->cullradius)
+ R_RecursiveMarkLights(ent, lightorigin, rd, bit, bitindex, node->children[0], pvs, pvsbits);
+ node = node->children[1];
}
- surf->dlightbits[bitindex] |= bit;
}
- if (node->children[0]->contents >= 0)
+ // check if leaf is visible according to pvs
+ leaf = (mleaf_t *)node;
+ i = (leaf - ent->model->brushq1.leafs) - 1;
+ if (leaf->nummarksurfaces && (i >= pvsbits || pvs[i >> 3] & (1 << (i & 7))))
{
- if (node->children[1]->contents >= 0)
+ int *surfacepvsframes, d, impacts, impactt;
+ float sdist, maxdist, dist2, impact[3];
+ msurface_t *surf;
+ // mark the polygons
+ maxdist = rd->cullradius2;
+ surfacepvsframes = ent->model->brushq1.surfacepvsframes;
+ for (i = 0;i < leaf->nummarksurfaces;i++)
{
- R_OldMarkLights (ent, lightorigin, rd, bit, bitindex, node->children[0]);
- node = node->children[1];
- goto loc0;
- }
- else
- {
- node = node->children[0];
- goto loc0;
- }
- }
- else if (node->children[1]->contents >= 0)
- {
- node = node->children[1];
- goto loc0;
- }
-}
-
-
-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, *surfacepvsframes, *mark;
- msurface_t *surf;
- mleaf_t *leaf;
- qbyte *in;
- int row;
- float low[3], high[3], dist, maxdist;
+ 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 (!r_dynamic.integer)
- return;
-
- Matrix4x4_Transform(&ent->inversematrix, rd->origin, lightorigin);
+ if (dist < -0.25f && !(surf->flags & SURF_LIGHTBOTHSIDES))
+ continue;
- model = ent->model;
- pvsleaf = Mod_PointInLeaf (lightorigin, model);
- if (pvsleaf == NULL)
- return;
+ dist2 = dist * dist;
+ if (dist2 >= maxdist)
+ continue;
- in = pvsleaf->compressed_vis;
- if (!r_vismarklights.integer || !in)
- {
- // told not to use pvs, or there's no pvs to use
- R_OldMarkLights(ent, lightorigin, rd, bit, bitindex, model->nodes + model->hulls[0].firstclipnode);
- return;
- }
+ VectorCopy(lightorigin, impact);
+ if (surf->plane->type >= 3)
+ VectorMA(impact, -sdist, surf->plane->normal, impact);
+ else
+ impact[surf->plane->type] -= sdist;
- lightframe++;
+ impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
- low[0] = lightorigin[0] - rd->cullradius;low[1] = lightorigin[1] - rd->cullradius;low[2] = lightorigin[2] - rd->cullradius;
- high[0] = lightorigin[0] + rd->cullradius;high[1] = lightorigin[1] + rd->cullradius;high[2] = lightorigin[2] + rd->cullradius;
+ d = bound(0, impacts, surf->extents[0] + 16) - impacts;
+ dist2 += d * d;
+ if (dist2 > maxdist)
+ continue;
- // for comparisons to minimum acceptable light
- maxdist = rd->cullradius2;
+ impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
- row = (model->numleafs+7)>>3;
- surfacepvsframes = model->surfacepvsframes;
+ d = bound(0, impactt, surf->extents[1] + 16) - impactt;
+ dist2 += d * d;
+ if (dist2 > maxdist)
+ continue;
- k = 0;
- while (k < row)
- {
- c = *in++;
- if (c)
- {
- for (i = 0;i < 8;i++)
+ if (surf->dlightframe != r_framecount) // not dynamic until now
{
- if (c & (1<<i))
- {
- // warning to the clumsy: numleafs is one less than it should be, it only counts leafs with vis bits (skips leaf 0)
- leafnum = (k << 3)+i+1;
- if (leafnum > model->numleafs)
- return;
- leaf = &model->leafs[leafnum];
- if (leaf->mins[0] > high[0] || leaf->maxs[0] < low[0]
- || leaf->mins[1] > high[1] || leaf->maxs[1] < low[1]
- || leaf->mins[2] > high[2] || leaf->maxs[2] < low[2])
- continue;
- if ((m = leaf->nummarksurfaces))
- {
- mark = leaf->firstmarksurface;
- do
- {
- 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 (surfacepvsframes[surf->number] != model->pvsframecount)
- continue;
- dist = PlaneDiff(lightorigin, surf->plane);
- if (surf->flags & SURF_PLANEBACK)
- dist = -dist;
- // LordHavoc: make sure it is infront of the surface and not too far away
- if (dist < rd->cullradius && (dist > -0.25f || ((surf->flags & SURF_LIGHTBOTHSIDES) && dist > -rd->cullradius)))
- {
- int d;
- int impacts, impactt;
- float dist2, impact[3];
-
- dist2 = dist * dist;
-
- if (surf->plane->type < 3)
- {
- VectorCopy(lightorigin, impact);
- impact[surf->plane->type] -= dist;
- }
- else
- {
- impact[0] = lightorigin[0] - surf->plane->normal[0] * dist;
- impact[1] = lightorigin[1] - surf->plane->normal[1] * dist;
- impact[2] = lightorigin[2] - surf->plane->normal[2] * dist;
- }
-
- 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;
- if (r_dlightmap.integer)
- surf->cached_dlight = true;
- }
- surf->dlightbits[bitindex] |= bit;
- }
- }
- while (--m);
- }
- }
+ 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;
}
- k++;
- continue;
+ surf->dlightbits[bitindex] |= bit;
}
-
- k += *in++;
}
}
void R_MarkLights(entity_render_t *ent)
{
- int i;
- if (!gl_flashblend.integer)
- for (i = 0;i < r_numdlights;i++)
- R_VisMarkLights (ent, r_dlight + i, 1 << (i & 31), i >> 5);
+ int i, bit, bitindex;
+ rdlight_t *rd;
+ vec3_t lightorigin;
+ if (!gl_flashblend.integer && r_dynamic.integer && ent->model)
+ {
+ for (i = 0, rd = r_dlight;i < r_numdlights;i++, rd++)
+ {
+ bit = 1 << (i & 31);
+ bitindex = i >> 5;
+ Matrix4x4_Transform(&ent->inversematrix, rd->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, rd, bit, bitindex, ent->model->brushq1.nodes + ent->model->brushq1.hulls[0].firstclipnode, lightpvs, min(lightpvsbytes * 8, ent->model->brushq1.visleafs));
+ }
+ }
}
/*
=============================================================================
*/
-static int RecursiveLightPoint (vec3_t color, const mnode_t *node, float x, float y, float startz, float endz)
+void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic, const mleaf_t *leaf)
{
- int side, distz = endz - startz;
- float front, back;
- float mid;
+ VectorClear(diffusecolor);
+ VectorClear(diffusenormal);
-loc0:
- if (node->contents < 0)
- return false; // didn't hit anything
-
- switch (node->plane->type)
+ if (!r_fullbright.integer && cl.worldmodel && cl.worldmodel->brush.LightPoint)
{
- case PLANE_X:
- node = node->children[x < node->plane->dist];
- goto loc0;
- case PLANE_Y:
- node = node->children[y < node->plane->dist];
- goto loc0;
- case PLANE_Z:
- side = startz < node->plane->dist;
- if ((endz < node->plane->dist) == side)
- {
- node = node->children[side];
- goto loc0;
- }
- // found an intersection
- mid = node->plane->dist;
- break;
- default:
- back = front = x * node->plane->normal[0] + y * node->plane->normal[1];
- front += startz * node->plane->normal[2];
- back += endz * node->plane->normal[2];
- side = front < node->plane->dist;
- if ((back < node->plane->dist) == side)
- {
- node = node->children[side];
- goto loc0;
- }
- // found an intersection
- mid = startz + distz * (front - node->plane->dist) / (front - back);
- break;
+ ambientcolor[0] = ambientcolor[1] = ambientcolor[2] = r_ambient.value * (2.0f / 128.0f);
+ cl.worldmodel->brush.LightPoint(cl.worldmodel, p, ambientcolor, diffusecolor, diffusenormal);
}
-
- // go down front side
- if (node->children[side]->contents >= 0 && RecursiveLightPoint (color, node->children[side], x, y, startz, mid))
- return true; // hit something
else
- {
- // check for impact on this node
- if (node->numsurfaces)
- {
- int i, ds, dt;
- msurface_t *surf;
-
- surf = cl.worldmodel->surfaces + node->firstsurface;
- for (i = 0;i < node->numsurfaces;i++, surf++)
- {
- if (!(surf->flags & SURF_LIGHTMAP))
- continue; // no lightmaps
-
- ds = (int) (x * surf->texinfo->vecs[0][0] + y * surf->texinfo->vecs[0][1] + mid * surf->texinfo->vecs[0][2] + surf->texinfo->vecs[0][3]);
- dt = (int) (x * surf->texinfo->vecs[1][0] + y * surf->texinfo->vecs[1][1] + mid * surf->texinfo->vecs[1][2] + surf->texinfo->vecs[1][3]);
-
- if (ds < surf->texturemins[0] || dt < surf->texturemins[1])
- continue;
-
- ds -= surf->texturemins[0];
- dt -= surf->texturemins[1];
-
- if (ds > surf->extents[0] || dt > surf->extents[1])
- continue;
-
- if (surf->samples)
- {
- qbyte *lightmap;
- int maps, line3, size3, dsfrac = ds & 15, dtfrac = dt & 15, scale = 0, r00 = 0, g00 = 0, b00 = 0, r01 = 0, g01 = 0, b01 = 0, r10 = 0, g10 = 0, b10 = 0, r11 = 0, g11 = 0, b11 = 0;
- line3 = ((surf->extents[0]>>4)+1)*3;
- size3 = ((surf->extents[0]>>4)+1) * ((surf->extents[1]>>4)+1)*3; // LordHavoc: *3 for colored lighting
-
- lightmap = surf->samples + ((dt>>4) * ((surf->extents[0]>>4)+1) + (ds>>4))*3; // LordHavoc: *3 for color
-
- for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++)
- {
- scale = d_lightstylevalue[surf->styles[maps]];
- r00 += lightmap[ 0] * scale;g00 += lightmap[ 1] * scale;b00 += lightmap[ 2] * scale;
- r01 += lightmap[ 3] * scale;g01 += lightmap[ 4] * scale;b01 += lightmap[ 5] * scale;
- r10 += lightmap[line3+0] * scale;g10 += lightmap[line3+1] * scale;b10 += lightmap[line3+2] * scale;
- r11 += lightmap[line3+3] * scale;g11 += lightmap[line3+4] * scale;b11 += lightmap[line3+5] * scale;
- lightmap += size3;
- }
-
-/*
-LordHavoc: here's the readable version of the interpolation
-code, not quite as easy for the compiler to optimize...
-
-dsfrac is the X position in the lightmap pixel, * 16
-dtfrac is the Y position in the lightmap pixel, * 16
-r00 is top left corner, r01 is top right corner
-r10 is bottom left corner, r11 is bottom right corner
-g and b are the same layout.
-r0 and r1 are the top and bottom intermediate results
-
-first we interpolate the top two points, to get the top
-edge sample
-
- r0 = (((r01-r00) * dsfrac) >> 4) + r00;
- g0 = (((g01-g00) * dsfrac) >> 4) + g00;
- b0 = (((b01-b00) * dsfrac) >> 4) + b00;
+ VectorSet(ambientcolor, 1, 1, 1);
-then we interpolate the bottom two points, to get the
-bottom edge sample
-
- r1 = (((r11-r10) * dsfrac) >> 4) + r10;
- g1 = (((g11-g10) * dsfrac) >> 4) + g10;
- b1 = (((b11-b10) * dsfrac) >> 4) + b10;
-
-then we interpolate the top and bottom samples to get the
-middle sample (the one which was requested)
-
- r = (((r1-r0) * dtfrac) >> 4) + r0;
- g = (((g1-g0) * dtfrac) >> 4) + g0;
- b = (((b1-b0) * dtfrac) >> 4) + b0;
-*/
-
- color[0] += (float) ((((((((r11-r10) * dsfrac) >> 4) + r10)-((((r01-r00) * dsfrac) >> 4) + r00)) * dtfrac) >> 4) + ((((r01-r00) * dsfrac) >> 4) + r00)) * (1.0f / 32768.0f);
- color[1] += (float) ((((((((g11-g10) * dsfrac) >> 4) + g10)-((((g01-g00) * dsfrac) >> 4) + g00)) * dtfrac) >> 4) + ((((g01-g00) * dsfrac) >> 4) + g00)) * (1.0f / 32768.0f);
- color[2] += (float) ((((((((b11-b10) * dsfrac) >> 4) + b10)-((((b01-b00) * dsfrac) >> 4) + b00)) * dtfrac) >> 4) + ((((b01-b00) * dsfrac) >> 4) + b00)) * (1.0f / 32768.0f);
- }
- return true; // success
- }
- }
-
- // go down back side
- node = node->children[side ^ 1];
- startz = mid;
- distz = endz - startz;
- goto loc0;
- }
-}
-
-void R_CompleteLightPoint (vec3_t color, const vec3_t p, int dynamic, const mleaf_t *leaf)
-{
- int i;
- vec3_t v;
- float f;
- rdlight_t *rd;
- mlight_t *sl;
- if (leaf == NULL)
- leaf = Mod_PointInLeaf(p, cl.worldmodel);
- if (!leaf || leaf->contents == CONTENTS_SOLID || r_fullbright.integer || !cl.worldmodel->lightdata)
+ // FIXME: this .lights related stuff needs to be ported into the Mod_Q1BSP code
+ if (cl.worldmodel->brushq1.numlights)
{
- color[0] = color[1] = color[2] = 1;
- return;
- }
-
- color[0] = color[1] = color[2] = r_ambient.value * (2.0f / 128.0f);
- if (cl.worldmodel->numlights)
- {
- for (i = 0;i < cl.worldmodel->numlights;i++)
+ int i;
+ vec3_t v;
+ float f;
+ mlight_t *sl;
+ for (i = 0;i < cl.worldmodel->brushq1.numlights;i++)
{
- sl = cl.worldmodel->lights + i;
+ sl = cl.worldmodel->brushq1.lights + i;
if (d_lightstylevalue[sl->style] > 0)
{
VectorSubtract (p, sl->origin, v);
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);
+ VectorMA(ambientcolor, f, sl->light, ambientcolor);
}
}
}
}
- else
- RecursiveLightPoint (color, cl.worldmodel->nodes, p[0], p[1], p[2], p[2] - 65536);
if (dynamic)
{
+ int i;
+ float f, v[3];
+ rdlight_t *rd;
+ // FIXME: this really should handle dlights as diffusecolor/diffusenormal somehow
for (i = 0;i < r_numdlights;i++)
{
rd = r_dlight + i;
- VectorSubtract (p, rd->origin, v);
+ VectorSubtract(p, rd->origin, v);
f = DotProduct(v, v);
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);
+ VectorMA(ambientcolor, f, rd->light, ambientcolor);
}
}
}
static int nearlights;
static nearlight_t nearlight[MAX_DLIGHTS];
-int R_LightModel(float *ambient4f, const entity_render_t *ent, float colorr, float colorg, float colorb, float colora, int worldcoords)
+int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, const entity_render_t *ent, float colorr, float colorg, float colorb, float colora, int worldcoords)
{
int i, j, maxnearlights;
float v[3], f, mscale, stylescale, intensity, ambientcolor[3];
nearlight_t *nl;
mlight_t *sl;
rdlight_t *rd;
- mleaf_t *leaf;
nearlights = 0;
maxnearlights = r_modellights.integer;
+ ambient4f[0] = ambient4f[1] = ambient4f[2] = r_ambient.value * (2.0f / 128.0f);
+ VectorClear(diffusecolor);
+ VectorClear(diffusenormal);
if (r_fullbright.integer || (ent->effects & EF_FULLBRIGHT))
{
// highly rare
- ambient4f[0] = colorr;
- ambient4f[1] = colorg;
- ambient4f[2] = colorb;
- ambient4f[3] = colora;
- return false;
- }
- if (r_shadow_realtime_world.integer)
- {
- // user config choice
- ambient4f[0] = r_ambient.value * (2.0f / 128.0f) * colorr;
- ambient4f[1] = r_ambient.value * (2.0f / 128.0f) * colorg;
- ambient4f[2] = r_ambient.value * (2.0f / 128.0f) * colorb;
- ambient4f[3] = colora;
- return false;
- }
- if (maxnearlights == 0)
- {
- // user config choice
- R_CompleteLightPoint (ambient4f, ent->origin, true, NULL);
- ambient4f[0] *= colorr;
- ambient4f[1] *= colorg;
- ambient4f[2] *= colorb;
- ambient4f[3] = colora;
- return false;
+ VectorSet(ambient4f, 1, 1, 1);
+ maxnearlights = 0;
}
- leaf = Mod_PointInLeaf(ent->origin, cl.worldmodel);
- if (!leaf || leaf->contents == CONTENTS_SOLID || !cl.worldmodel->lightdata)
- ambient4f[0] = ambient4f[1] = ambient4f[2] = 1;
+ else if (r_shadow_realtime_world.integer)
+ maxnearlights = 0;
else
{
- ambient4f[0] = ambient4f[1] = ambient4f[2] = r_ambient.value * (2.0f / 128.0f);
- if (!cl.worldmodel->numlights)
- RecursiveLightPoint (ambient4f, cl.worldmodel->nodes, ent->origin[0], ent->origin[1], ent->origin[2], ent->origin[2] - 65536);
+ if (cl.worldmodel && cl.worldmodel->brush.LightPoint)
+ cl.worldmodel->brush.LightPoint(cl.worldmodel, ent->origin, ambient4f, diffusecolor, diffusenormal);
+ else
+ VectorSet(ambient4f, 1, 1, 1);
}
+
// 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 = ent->scale * ent->scale;
+ // FIXME: no support for .lights on non-Q1BSP?
nl = &nearlight[0];
for (i = 0;i < ent->numentlights;i++)
{
- sl = cl.worldmodel->lights + ent->entlights[i];
+ sl = cl.worldmodel->brushq1.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;
ambient4f[1] *= colorg;
ambient4f[2] *= colorb;
ambient4f[3] = colora;
- return nearlights != 0;
+ diffusecolor[0] *= colorr;
+ diffusecolor[1] *= colorg;
+ diffusecolor[2] *= colorb;
+ return nearlights != 0 || DotProduct(diffusecolor, diffusecolor) > 0;
}
-void R_LightModel_CalcVertexColors(const float *ambientcolor4f, int numverts, const float *vertex3f, const float *normal3f, float *color4f)
+void R_LightModel_CalcVertexColors(const float *ambientcolor4f, const float *diffusecolor, const float *diffusenormal, int numverts, const float *vertex3f, const float *normal3f, float *color4f)
{
- int i, j;
- float color[4], v[3], dot, dist2, f;
+ int i, j, usediffuse;
+ float color[4], v[3], dot, dist2, f, dnormal[3];
nearlight_t *nl;
+ usediffuse = DotProduct(diffusecolor, diffusecolor) > 0;
+ VectorCopy(diffusenormal, dnormal);
+ if (usediffuse)
+ VectorNormalize(dnormal);
// directional shading code here
for (i = 0;i < numverts;i++, vertex3f += 3, normal3f += 3, color4f += 4)
{
VectorCopy4(ambientcolor4f, color);
+
+ // silly directional diffuse shading
+ if (usediffuse)
+ {
+ dot = DotProduct(normal3f, dnormal);
+ if (dot > 0)
+ VectorMA(color, dot, diffusecolor, color);
+ }
+
+ // pretty good lighting
for (j = 0, nl = &nearlight[0];j < nearlights;j++, nl++)
{
VectorSubtract(vertex3f, nl->origin, v);
int i;
const mlight_t *sl;
vec3_t v;
- if (r_shadow_realtime_dlight.integer)
+ if (r_shadow_realtime_dlight.integer || gl_flashblend.integer)
return;
VectorSubtract(ent->origin, ent->entlightsorigin, v);
if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f))
VectorCopy(ent->origin, ent->entlightsorigin);
ent->numentlights = 0;
if (cl.worldmodel)
- for (i = 0, sl = cl.worldmodel->lights;i < cl.worldmodel->numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++)
+ for (i = 0, sl = cl.worldmodel->brushq1.lights;i < cl.worldmodel->brushq1.numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++)
if (CL_TraceLine(ent->origin, sl->origin, NULL, NULL, 0, false, NULL) == 1)
ent->entlights[ent->numentlights++] = i;
}
ent->entlightsframe = r_framecount;
}
+
projects / xonotic / darkplaces.git / blobdiff