fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix black-entities bug introduced from DECOUPLED_LM support.

Browse source
This commit is contained in:
Shpoike 2024-02-25 05:29:21 +00:00
parent 0af9796e5a
commit 11e0cdeb95
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Quake/gl_model.c
View file

@ -1498,7 +1498,7 @@ static void CalcSurfaceExtents (msurface_t *s, int lmshift)
s->lmvecs[i][0] = s->texinfo->vecs[i][0] / lmscale;
s->lmvecs[i][1] = s->texinfo->vecs[i][1] / lmscale;
s->lmvecs[i][2] = s->texinfo->vecs[i][2] / lmscale;
s->lmvecs[i][3] = s->texinfo->vecs[i][3] / lmscale + 0.5/*sigh*/ - bmins[i];
s->lmvecs[i][3] = s->texinfo->vecs[i][3] / lmscale - bmins[i];
if (mod_lightscale_broken.value)
s->lmvecscale[i] = 16; //luxels->qu... except buggy so dlights have the wrong spread on large surfaces (blame shib7)
else
@ -1711,11 +1711,11 @@ static void Mod_LoadFaces (lump_t *l, qboolean bsp2)
out->lmvecs[0][0] = LittleFloat(decoupledlm->lmvecs[0][0]);
out->lmvecs[0][1] = LittleFloat(decoupledlm->lmvecs[0][1]);
out->lmvecs[0][2] = LittleFloat(decoupledlm->lmvecs[0][2]);
out->lmvecs[0][3] = LittleFloat(decoupledlm->lmvecs[0][3]) + 0.5f; //sigh
out->lmvecs[0][3] = LittleFloat(decoupledlm->lmvecs[0][3]);
out->lmvecs[1][0] = LittleFloat(decoupledlm->lmvecs[1][0]);
out->lmvecs[1][1] = LittleFloat(decoupledlm->lmvecs[1][1]);
out->lmvecs[1][2] = LittleFloat(decoupledlm->lmvecs[1][2]);
out->lmvecs[1][3] = LittleFloat(decoupledlm->lmvecs[1][3]) + 0.5f; //sigh
out->lmvecs[1][3] = LittleFloat(decoupledlm->lmvecs[1][3]);
out->lmvecscale[0] = 1.0f/VectorLength(out->lmvecs[0]); //luxels->qu
out->lmvecscale[1] = 1.0f/VectorLength(out->lmvecs[1]);
decoupledlm++;

4
Quake/r_brush.c
View file

@ -879,11 +879,11 @@ static void BuildSurfaceDisplayList (msurface_t *fa)
//
// lightmap texture coordinates
//
s = DotProduct (vec, fa->lmvecs[0]) + fa->lmvecs[0][3];
s = DotProduct (vec, fa->lmvecs[0]) + fa->lmvecs[0][3] + 0.5;
s += fa->light_s;
s /= LMBLOCK_WIDTH;
t = DotProduct (vec, fa->lmvecs[1]) + fa->lmvecs[1][3];
t = DotProduct (vec, fa->lmvecs[1]) + fa->lmvecs[1][3] + 0.5;
t += fa->light_t;
t /= LMBLOCK_HEIGHT;