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_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_rtworld)
+ 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;
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)
// 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->numleaffaces && (i >= pvsbits || CHECKPVSBIT(pvs, i)))
{
- int *surfacepvsframes, d, impacts, impactt;
+ int d, impacts, impactt;
float sdist, maxdist, dist2, impact[3];
msurface_t *surf;
// 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->numleaffaces;i++)
{
- if (surfacepvsframes[leaf->firstmarksurface[i]] != ent->model->brushq1.pvsframecount)
+ if (ent == r_refdef.worldentity && !r_worldsurfacevisible[leaf->firstleafface[i]])
continue;
- surf = ent->model->brushq1.surfaces + leaf->firstmarksurface[i];
+ surf = ent->model->brushq1.surfaces + leaf->firstleafface[i];
dist = sdist = PlaneDiff(lightorigin, surf->plane);
if (surf->flags & SURF_PLANEBACK)
dist = -dist;
int i, bit, bitindex;
dlight_t *light;
vec3_t lightorigin;
- if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brushq1.num_leafs)
+ 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++)
{
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));
+ R_RecursiveMarkLights(ent, lightorigin, light, bit, bitindex, ent->model->brush.data_nodes + ent->model->brushq1.hulls[0].firstclipnode, lightpvs, min(lightpvsbytes * 8, ent->model->brush.num_pvsclusters));
}
}
}
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);
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;
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;
}