lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now)

Browse source 
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
This commit is contained in:
Monster Iestyn 2020-05-19 22:00:34 +01:00
parent 65d6b04fd2
commit c3d576058a
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/r_things.c
View file

@ -1556,10 +1556,8 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x += FixedMul(offset, cosmul); tr_x += FixedMul(offset, cosmul);
tr_y += FixedMul(offset, sinmul); tr_y += FixedMul(offset, sinmul);
tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
yscale = FixedDiv(projectiony, tz);
tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos); tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
xscale = FixedDiv(projection, tz);
// Get paperoffset (offset) and paperoffset (distance) // Get paperoffset (offset) and paperoffset (distance)
paperoffset = -FixedMul(tr_x, cosmul) - FixedMul(tr_y, sinmul); paperoffset = -FixedMul(tr_x, cosmul) - FixedMul(tr_y, sinmul);
@ -1574,10 +1572,8 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x += FixedMul(offset2, cosmul); tr_x += FixedMul(offset2, cosmul);
tr_y += FixedMul(offset2, sinmul); tr_y += FixedMul(offset2, sinmul);
tz2 = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); tz2 = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
yscale2 = FixedDiv(projectiony, tz2);
tx2 = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos); tx2 = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
xscale2 = FixedDiv(projection, tz2);
if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
return; return;
@ -1588,22 +1584,19 @@ static void R_ProjectSprite(mobj_t *thing)
fixed_t div = FixedDiv(tz2-tz, FixedMul(MINZ, this_scale)-tz); fixed_t div = FixedDiv(tz2-tz, FixedMul(MINZ, this_scale)-tz);
tx += FixedDiv(tx2-tx, div); tx += FixedDiv(tx2-tx, div);
tz = FixedMul(MINZ, this_scale); tz = FixedMul(MINZ, this_scale);
yscale = FixedDiv(projectiony, tz);
xscale = FixedDiv(projection, tz);
} }
else if (tz2 < FixedMul(MINZ, this_scale)) else if (tz2 < FixedMul(MINZ, this_scale))
{ {
fixed_t div = FixedDiv(tz-tz2, FixedMul(MINZ, this_scale)-tz2); fixed_t div = FixedDiv(tz-tz2, FixedMul(MINZ, this_scale)-tz2);
tx2 += FixedDiv(tx-tx2, div); tx2 += FixedDiv(tx-tx2, div);
tz2 = FixedMul(MINZ, this_scale); tz2 = FixedMul(MINZ, this_scale);
yscale2 = FixedDiv(projectiony, tz2);
xscale2 = FixedDiv(projection, tz2);
} }
if (tx2 < -(FixedMul(tz2, fovtan)<<2) || tx > FixedMul(tz, fovtan)<<2) // too far off the side? if (tx2 < -(FixedMul(tz2, fovtan)<<2) || tx > FixedMul(tz, fovtan)<<2) // too far off the side?
return; return;
// TODO: tx clamping yscale = FixedDiv(projectiony, tz);
xscale = FixedDiv(projection, tz);
x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS; x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
@ -1611,6 +1604,9 @@ static void R_ProjectSprite(mobj_t *thing)
if (x1 > viewwidth) if (x1 > viewwidth)
return; return;
yscale2 = FixedDiv(projectiony, tz2);
xscale2 = FixedDiv(projection, tz2);
x2 = (centerxfrac + FixedMul(tx2,xscale2))>>FRACBITS; x2 = (centerxfrac + FixedMul(tx2,xscale2))>>FRACBITS;
// off the left side // off the left side