X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_light.c;h=4e7d51fa5b44ae5c8aac96ca3909c2a483010c85;hp=af11fd06dfc926f73ab6044eaf392c08780988a1;hb=c651b263f8a63fa5846df832051d4f5658680a03;hpb=045b4c0a4b471714922deb7ecaed3d83d90602d0 diff --git a/r_light.c b/r_light.c index af11fd06..4e7d51fa 100644 --- a/r_light.c +++ b/r_light.c @@ -23,13 +23,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cl_collision.h" #include "r_shadow.h" -rdlight_t r_dlight[MAX_DLIGHTS]; +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", "1"}; +cvar_t gl_flashblend = {CVAR_SAVE, "gl_flashblend", "0"}; static rtexture_t *lightcorona; static rtexturepool_t *lighttexturepool; @@ -86,13 +86,13 @@ R_UpdateLights */ void R_UpdateLights(void) { - int i, j, k; - dlight_t *cd; - rdlight_t *rd; + 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) @@ -101,9 +101,10 @@ void R_UpdateLights(void) 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; @@ -112,80 +113,55 @@ void R_UpdateLights(void) 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++) { - cd = cl_dlights + i; - if (cd->radius <= 0) - continue; - rd = &r_dlight[r_numdlights++]; - VectorCopy(cd->origin, rd->origin); - VectorScale(cd->color, d_lightstylevalue[cd->style] * (1.0f / 256.0f), rd->color); - rd->radius = bound(0, cd->radius, 2048.0f); - VectorScale(rd->color, rd->radius * 64.0f, rd->light); -#if 0 - 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 - rd->cullradius2 = bound(0, rd->cullradius2, 2048.0f*2048.0f); - rd->cullradius = sqrt(rd->cullradius2); -#else - rd->cullradius = rd->radius; - rd->cullradius2 = rd->cullradius * rd->cullradius; -#endif - rd->subtract = 1.0f / rd->cullradius2; - rd->ent = cd->ent; - rd->cubemapnum = cd->cubemapnum; - rd->shadow = cd->shadow; - rd->corona = cd->corona; - - rd->matrix_lighttoworld = cd->matrix; - Matrix4x4_ConcatScale(&rd->matrix_lighttoworld, rd->cullradius); - Matrix4x4_Invert_Simple(&rd->matrix_worldtolight, &rd->matrix_lighttoworld); - Matrix4x4_Concat(&rd->matrix_worldtoattenuationxyz, &matrix_attenuationxyz, &rd->matrix_worldtolight); - Matrix4x4_Concat(&rd->matrix_worldtoattenuationz, &matrix_attenuationz, &rd->matrix_worldtolight); - - c_dlights++; // count every dlight in use + 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; + int i, lnum, flag; float cscale, scale, viewdist, dist; - rdlight_t *rd; - worldlight_t *wl; - if (!r_coronas.integer) + 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, wl = r_shadow_worldlightchain;wl;wl = wl->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 (wl->corona * r_coronas.value > 0 && (r_shadow_debuglight.integer < 0 || r_shadow_debuglight.integer == lnum) && (dist = (DotProduct(wl->origin, r_viewforward) - viewdist)) >= 24.0f && CL_TraceLine(wl->origin, r_vieworigin, NULL, NULL, true, NULL, SUPERCONTENTS_SOLID) == 1) - { - cscale = wl->corona * r_coronas.value * 0.25f; - scale = wl->radius * 0.25f; - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, wl->origin, r_viewright, r_viewup, scale, -scale, -scale, scale, wl->color[0] * cscale, wl->color[1] * cscale, wl->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;i < r_numdlights;i++) + for (i = 0, light = r_dlight;i < r_numdlights;i++, light++) { - rd = r_dlight + i; - if (rd->corona * r_coronas.value > 0 && (dist = (DotProduct(rd->origin, r_viewforward) - viewdist)) >= 24.0f && CL_TraceLine(rd->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 = rd->corona * r_coronas.value * 0.25f; - scale = rd->radius * 0.25f; + cscale = light->corona * r_coronas.value * 0.25f; + scale = light->rtlight.radius * light->rtlight.coronasizescale; if (gl_flashblend.integer) { cscale *= 4.0f; scale *= 2.0f; } - R_DrawSprite(GL_ONE, GL_ONE, lightcorona, true, rd->origin, r_viewright, r_viewup, scale, -scale, -scale, scale, rd->color[0] * cscale, rd->color[1] * cscale, rd->color[2] * cscale, 1); + 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); } } } +#ifdef LHREMOVESOON /* ============================================================================= @@ -202,103 +178,134 @@ static qbyte lightpvs[(MAX_MAP_LEAFS+7)>>3]; R_MarkLights ============= */ -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) +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 > rd->cullradius) + if (dist > light->rtlight.lightmap_cullradius) node = node->children[0]; else { - if (dist >= -rd->cullradius) - R_RecursiveMarkLights(ent, lightorigin, rd, bit, bitindex, node->children[0], pvs, pvsbits); + if (dist >= -light->rtlight.lightmap_cullradius) + 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 - ent->model->brushq1.leafs) - 1; - if (leaf->nummarksurfaces && (i >= pvsbits || pvs[i >> 3] & (1 << (i & 7)))) + i = leaf->clusterindex; + 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 = rd->cullradius2; - surfacepvsframes = ent->model->brushq1.surfacepvsframes; - for (i = 0;i < leaf->nummarksurfaces;i++) + maxdist = light->rtlight.lightmap_cullradius2; + 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; + + dist2 = dist * dist; + if (dist2 >= maxdist) + continue; - impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; + VectorCopy(lightorigin, impact); + VectorMA(impact, -sdist, planenormal, impact); - d = bound(0, impacts, surf->extents[0] + 16) - impacts; - dist2 += d * d; - if (dist2 > maxdist) - continue; + impacts = DotProduct (impact, surface->texinfo->vecs[0]) + surface->texinfo->vecs[0][3] - surface->texturemins[0]; - impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; + d = bound(0, impacts, surface->extents[0] + 16) - impacts; + dist2 += d * d; + if (dist2 > maxdist) + continue; - d = bound(0, impactt, surf->extents[1] + 16) - impactt; - dist2 += d * d; - if (dist2 > maxdist) - continue; + impactt = DotProduct (impact, surface->texinfo->vecs[1]) + surface->texinfo->vecs[1][3] - surface->texturemins[1]; - if (surf->dlightframe != r_framecount) // not dynamic until now + d = bound(0, impactt, surface->extents[1] + 16) - impactt; + dist2 += d * d; + if (dist2 > maxdist) + continue; + } + + 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; - rdlight_t *rd; - vec3_t lightorigin; - if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brushq1.numleafs) + int i, j, bit, bitindex; + dlight_t *light; + vec3_t lightorigin, lightmins, lightmaxs; + if (!gl_flashblend.integer && r_dynamic.integer && ent->model && ent->model->brush.num_leafs) { - for (i = 0, rd = r_dlight;i < r_numdlights;i++, rd++) + for (i = 0, light = r_dlight;i < r_numdlights;i++, light++) { 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)); + Matrix4x4_Transform(&ent->inversematrix, light->origin, lightorigin); + 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 /* ============================================================================= @@ -313,24 +320,24 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu 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); @@ -348,17 +355,17 @@ void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffu { int i; float f, v[3]; - rdlight_t *rd; + dlight_t *light; // 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); + light = r_dlight + i; + VectorSubtract(p, light->origin, v); f = DotProduct(v, v); - if (f < rd->cullradius2 && CL_TraceLine(p, rd->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) == 1) + if (f < light->rtlight.lightmap_cullradius2 && CL_TraceLine(p, light->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) == 1) { - f = (1.0f / (f + LIGHTOFFSET)) - rd->subtract; - VectorMA(ambientcolor, f, rd->light, ambientcolor); + f = (1.0f / (f + LIGHTOFFSET)) - light->rtlight.lightmap_subtract; + VectorMA(ambientcolor, f, light->rtlight.lightmap_light, ambientcolor); } } } @@ -388,26 +395,26 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co float v[3], f, mscale, stylescale, intensity, ambientcolor[3], tempdiffusenormal[3]; nearlight_t *nl; mlight_t *sl; - rdlight_t *rd; + dlight_t *light; 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)) + 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); } @@ -422,7 +429,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co 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; @@ -470,23 +477,24 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co 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++) { - rd = r_dlight + i; - VectorCopy(rd->origin, v); + 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, rd->origin, v); - if (DotProduct(v, v) < rd->cullradius2) + VectorSubtract (v, light->origin, v); + if (DotProduct(v, v) < light->rtlight.lightmap_cullradius2) { - if (CL_TraceLine(ent->origin, rd->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) != 1) + if (CL_TraceLine(ent->origin, light->origin, NULL, NULL, false, NULL, SUPERCONTENTS_SOLID) != 1) continue; - VectorSubtract (ent->origin, rd->origin, v); - f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - rd->subtract); - VectorScale(rd->light, f, ambientcolor); + 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; @@ -517,14 +525,14 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co nl->intensity = intensity; // transform the light into the model's coordinate system if (worldcoords) - VectorCopy(rd->origin, nl->origin); + VectorCopy(light->origin, nl->origin); else { - Matrix4x4_Transform(&ent->inversematrix, rd->origin, nl->origin); + 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 - , rd->origin[0], rd->origin[1], rd->origin[2] + , 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] @@ -535,10 +543,10 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co // 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->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; } } @@ -581,7 +589,7 @@ void R_LightModel_CalcVertexColors(const float *ambientcolor4f, const float *dif // 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) @@ -611,7 +619,7 @@ void R_UpdateEntLights(entity_render_t *ent) 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)) @@ -619,8 +627,8 @@ void R_UpdateEntLights(entity_render_t *ent) 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; }