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;
*/
void R_UpdateLights(void)
{
- int i, j, k;
+ 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)
continue;
}
k = i % cl_lightstyle[j].length;
+ l = (i-1) % cl_lightstyle[j].length;
k = cl_lightstyle[j].map[k] - 'a';
- k = k*22;
- d_lightstylevalue[j] = k;
+ l = cl_lightstyle[j].map[l] - 'a';
+ d_lightstylevalue[j] = ((k*frac)+(l*(1-frac)))*22;
}
r_numdlights = 0;
void R_DrawCoronas(void)
{
- int i, lnum;
+ int i, lnum, flag;
float cscale, scale, viewdist, dist;
dlight_t *light;
if (r_coronas.value < 0.01)
return;
R_Mesh_Matrix(&r_identitymatrix);
viewdist = DotProduct(r_vieworigin, r_viewforward);
- if (r_shadow_realtime_world.integer)
+ flag = r_rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE;
+ for (lnum = 0, light = r_shadow_worldlightchain;light;light = light->next, lnum++)
{
- 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->rtlight.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)
- {
- cscale = light->rtlight.corona * r_coronas.value * 0.25f;
- scale = light->rtlight.radius * 0.25f;
- 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);
- }
+ 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);
}
}
for (i = 0, light = r_dlight;i < r_numdlights;i++, light++)
{
- if (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)
+ 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)
{
cscale = light->corona * r_coronas.value * 0.25f;
- scale = light->radius * 0.25f;
+ scale = light->rtlight.radius * light->rtlight.coronasizescale;
if (gl_flashblend.integer)
{
cscale *= 4.0f;
}
}
+#ifdef LHREMOVESOON
/*
=============================================================================
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)
+static void R_RecursiveMarkLights(entity_render_t *ent, vec3_t lightorigin, vec3_t lightmins, vec3_t lightmaxs, 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)
+ while(node->plane)
{
dist = PlaneDiff(lightorigin, node->plane);
if (dist > light->rtlight.lightmap_cullradius)
else
{
if (dist >= -light->rtlight.lightmap_cullradius)
- R_RecursiveMarkLights(ent, lightorigin, light, bit, bitindex, node->children[0], pvs, pvsbits);
+ R_RecursiveMarkLights(ent, lightorigin, lightmins, lightmaxs, 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)))
+ if (leaf->numleafsurfaces && (i >= pvsbits || CHECKPVSBIT(pvs, i)))
{
- int *surfacepvsframes, d, impacts, impactt;
- float sdist, maxdist, dist2, impact[3];
- msurface_t *surf;
+ int d, impacts, impactt;
+ float sdist, maxdist, dist2, impact[3], planenormal[3], planedist;
+ msurface_t *surface;
// mark the polygons
maxdist = light->rtlight.lightmap_cullradius2;
- surfacepvsframes = ent->model->brushq1.surfacepvsframes;
- for (i = 0;i < leaf->nummarksurfaces;i++)
+ for (i = 0;i < leaf->numleafsurfaces;i++)
{
- if (surfacepvsframes[leaf->firstmarksurface[i]] != ent->model->brushq1.pvsframecount)
+ // note: this is only called on the worldmodel
+ if (r_worldsurfacevisible[leaf->firstleafsurface[i]])
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))
+ surface = ent->model->brush.data_surfaces + leaf->firstleafsurface[i];
+ if (!BoxesOverlap(surface->mins, surface->maxs, lightmins, lightmaxs))
continue;
- dist2 = dist * dist;
- if (dist2 >= maxdist)
- continue;
+ // do q1bsp culling checks only if it is a q1bsp surface
+ if (surface->samples && surface->texinfo)
+ {
+ VectorNegate(surface->mesh.data_normal3f, planenormal);
+ planedist = DotProduct(surface->mesh.data_vertex3f, planenormal);
+ dist = sdist = DotProduct(lightorigin, planenormal) - planedist;
- VectorCopy(lightorigin, impact);
- if (surf->plane->type >= 3)
- VectorMA(impact, -sdist, surf->plane->normal, impact);
- else
- impact[surf->plane->type] -= sdist;
+ if (dist < -0.25f && !(surface->texture->currentmaterialflags & MATERIALFLAG_LIGHTBOTHSIDES))
+ continue;
- impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
+ dist2 = dist * dist;
+ if (dist2 >= maxdist)
+ continue;
- d = bound(0, impacts, surf->extents[0] + 16) - impacts;
- dist2 += d * d;
- if (dist2 > maxdist)
- continue;
+ VectorCopy(lightorigin, impact);
+ VectorMA(impact, -sdist, planenormal, impact);
- impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
+ impacts = DotProduct (impact, surface->texinfo->vecs[0]) + surface->texinfo->vecs[0][3] - surface->texturemins[0];
- d = bound(0, impactt, surf->extents[1] + 16) - impactt;
- dist2 += d * d;
- if (dist2 > maxdist)
- continue;
+ d = bound(0, impacts, surface->extents[0] + 16) - impacts;
+ dist2 += d * d;
+ if (dist2 > maxdist)
+ continue;
+
+ impactt = DotProduct (impact, surface->texinfo->vecs[1]) + surface->texinfo->vecs[1][3] - surface->texturemins[1];
+
+ d = bound(0, impactt, surface->extents[1] + 16) - impactt;
+ dist2 += d * d;
+ if (dist2 > maxdist)
+ continue;
+ }
- if (surf->dlightframe != r_framecount) // not dynamic until now
+ if (surface->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;
+ surface->dlightbits[0] = surface->dlightbits[1] = surface->dlightbits[2] = surface->dlightbits[3] = surface->dlightbits[4] = surface->dlightbits[5] = surface->dlightbits[6] = surface->dlightbits[7] = 0;
+ surface->dlightframe = r_framecount;
+ surface->cached_dlight = true;
}
- surf->dlightbits[bitindex] |= bit;
+ surface->dlightbits[bitindex] |= bit;
}
}
}
void R_MarkLights(entity_render_t *ent)
{
- int i, bit, bitindex;
+ int i, j, bit, bitindex;
dlight_t *light;
- vec3_t lightorigin;
- if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brushq1.num_leafs)
+ vec3_t lightorigin, lightmins, lightmaxs;
+ if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brush.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));
+ lightmins[0] = lightorigin[0] - light->rtlight.lightmap_cullradius;
+ lightmins[1] = lightorigin[1] - light->rtlight.lightmap_cullradius;
+ lightmins[2] = lightorigin[2] - light->rtlight.lightmap_cullradius;
+ lightmaxs[0] = lightorigin[0] + light->rtlight.lightmap_cullradius;
+ lightmaxs[1] = lightorigin[1] + light->rtlight.lightmap_cullradius;
+ lightmaxs[2] = lightorigin[2] + light->rtlight.lightmap_cullradius;
+ if (ent == r_refdef.worldentity)
+ {
+ 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, lightmins, lightmaxs, light, bit, bitindex, ent->model->brush.data_nodes, lightpvs, min(lightpvsbytes * 8, ent->model->brush.num_pvsclusters));
+ }
+ else
+ {
+ msurface_t *surface;
+ for (j = 0, surface = ent->model->brush.data_surfaces + ent->model->firstmodelsurface;j < ent->model->nummodelsurfaces;j++, surface++)
+ {
+ if (BoxesOverlap(surface->mins, surface->maxs, lightmins, lightmaxs))
+ {
+ if (surface->dlightframe != r_framecount) // not dynamic until now
+ {
+ surface->dlightbits[0] = surface->dlightbits[1] = surface->dlightbits[2] = surface->dlightbits[3] = surface->dlightbits[4] = surface->dlightbits[5] = surface->dlightbits[6] = surface->dlightbits[7] = 0;
+ surface->dlightframe = r_framecount;
+ surface->cached_dlight = true;
+ }
+ surface->dlightbits[bitindex] |= bit;
+ }
+ }
+ }
}
}
}
+#endif
/*
=============================================================================
VectorClear(diffusecolor);
VectorClear(diffusenormal);
- if (!r_fullbright.integer && cl.worldmodel && cl.worldmodel->brush.LightPoint)
+ if (!r_fullbright.integer && r_refdef.worldmodel && r_refdef.worldmodel->brush.LightPoint)
{
ambientcolor[0] = ambientcolor[1] = ambientcolor[2] = r_ambient.value * (2.0f / 128.0f);
- cl.worldmodel->brush.LightPoint(cl.worldmodel, p, ambientcolor, diffusecolor, diffusenormal);
+ r_refdef.worldmodel->brush.LightPoint(r_refdef.worldmodel, p, ambientcolor, diffusecolor, diffusenormal);
}
else
VectorSet(ambientcolor, 1, 1, 1);
// FIXME: this .lights related stuff needs to be ported into the Mod_Q1BSP code
- if (cl.worldmodel->brushq1.numlights)
+ if (r_refdef.worldmodel->brushq1.numlights)
{
int i;
vec3_t v;
float f;
mlight_t *sl;
- for (i = 0;i < cl.worldmodel->brushq1.numlights;i++)
+ for (i = 0;i < r_refdef.worldmodel->brushq1.numlights;i++)
{
- sl = cl.worldmodel->brushq1.lights + i;
+ sl = r_refdef.worldmodel->brushq1.lights + i;
if (d_lightstylevalue[sl->style] > 0)
{
VectorSubtract (p, sl->origin, v);
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))
+ if (!(ent->flags & RENDER_LIGHT))
{
// highly rare
VectorSet(ambient4f, 1, 1, 1);
maxnearlights = 0;
}
- else if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0)
+ else if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT))
maxnearlights = 0;
else
{
- if (cl.worldmodel && cl.worldmodel->brush.LightPoint)
+ if (r_refdef.worldmodel && r_refdef.worldmodel->brush.LightPoint)
{
- cl.worldmodel->brush.LightPoint(cl.worldmodel, ent->origin, ambient4f, diffusecolor, tempdiffusenormal);
+ r_refdef.worldmodel->brush.LightPoint(r_refdef.worldmodel, ent->origin, ambient4f, diffusecolor, tempdiffusenormal);
Matrix4x4_Transform3x3(&ent->inversematrix, tempdiffusenormal, diffusenormal);
VectorNormalize(diffusenormal);
}
nl = &nearlight[0];
for (i = 0;i < ent->numentlights;i++)
{
- sl = cl.worldmodel->brushq1.lights + ent->entlights[i];
+ sl = r_refdef.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;
nl->offset = sl->distbias;
}
}
- if (!r_shadow_realtime_dlight.integer)
+ if (!r_rtdlight || (ent->flags & RENDER_TRANSPARENT))
{
+ // FIXME: this dlighting doesn't look like rtlights
for (i = 0;i < r_numdlights;i++)
{
light = r_dlight + i;
// pretty good lighting
for (j = 0, nl = &nearlight[0];j < nearlights;j++, nl++)
{
- VectorSubtract(vertex3f, nl->origin, v);
+ VectorSubtract(nl->origin, vertex3f, v);
// first eliminate negative lighting (back side)
dot = DotProduct(normal3f, v);
if (dot > 0)
int i;
const mlight_t *sl;
vec3_t v;
- if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0)
+ if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT))
return;
VectorSubtract(ent->origin, ent->entlightsorigin, v);
if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f))
ent->entlightstime = realtime + 0.1;
VectorCopy(ent->origin, ent->entlightsorigin);
ent->numentlights = 0;
- if (cl.worldmodel)
- for (i = 0, sl = cl.worldmodel->brushq1.lights;i < cl.worldmodel->brushq1.numlights && ent->numentlights < MAXENTLIGHTS;i++, sl++)
+ 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)
ent->entlights[ent->numentlights++] = i;
}
projects / xonotic / darkplaces.git / blobdiff