stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only adjust slope offsets if the plane isn't rotated

Browse source
This commit is contained in:
Jaime Ita Passos 2021-04-28 22:15:05 -03:00
parent 090f304f33
commit 9d41325843
1 changed files with 21 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/r_plane.c
View file

@ -829,92 +829,33 @@ static void R_SetSlopePlaneVectors(visplane_t *pl, INT32 y, fixed_t xoff, fixed_
R_CalculateSlopeVectors();
}
/*
Essentially: We can't & the components along the regular axes when the plane is rotated.
This is because the distance on each regular axis in order to loop is different.
We rotate them, & the components, add them together, & them again, and then rotate them back.
These three seperate & operations are done per axis in order to prevent overflows.
toast 10/04/17
*/
static inline void R_AdjustSlopeCoordinates(visplane_t *pl)
static inline void R_AdjustSlopeCoordinates(vector3_t *origin)
{
const fixed_t modmask = ((1 << (32-nflatshiftup)) - 1);
const fixed_t cosinecomponent = FINECOSINE(pl->plangle>>ANGLETOFINESHIFT);
const fixed_t sinecomponent = FINESINE(pl->plangle>>ANGLETOFINESHIFT);
fixed_t ox = (origin->x & modmask);
fixed_t oy = -(origin->y & modmask);
fixed_t ox, oy, temp;
if (!pl->plangle)
{
ox = (FixedMul(pl->slope->o.x,cosinecomponent) & modmask) - (FixedMul(pl->slope->o.y,sinecomponent) & modmask);
oy = (-FixedMul(pl->slope->o.x,sinecomponent) & modmask) - (FixedMul(pl->slope->o.y,cosinecomponent) & modmask);
temp = ox & modmask;
oy &= modmask;
ox = FixedMul(temp,cosinecomponent)+FixedMul(oy,-sinecomponent); // negative sine for opposite direction
oy = -FixedMul(temp,-sinecomponent)+FixedMul(oy,cosinecomponent);
}
if (xoffs || yoffs)
{
temp = xoffs;
xoffs = (FixedMul(temp,cosinecomponent) & modmask) + (FixedMul(yoffs,sinecomponent) & modmask);
yoffs = (-FixedMul(temp,sinecomponent) & modmask) + (FixedMul(yoffs,cosinecomponent) & modmask);
temp = xoffs & modmask;
xoffs &= modmask;
yoffs &= modmask;
xoffs = FixedMul(temp,cosinecomponent)+FixedMul(yoffs,-sinecomponent); // ditto
yoffs = -FixedMul(temp,-sinecomponent)+FixedMul(yoffs,cosinecomponent);
}
if (!pl->plangle)
{
xoffs -= (pl->slope->o.x - ox);
yoffs += (pl->slope->o.y + oy);
}
xoffs -= (origin->x - ox);
yoffs += (origin->y + oy);
}
static inline void R_AdjustSlopeCoordinatesNPO2(visplane_t *pl)
static inline void R_AdjustSlopeCoordinatesNPO2(vector3_t *origin)
{
const fixed_t modmaskw = (ds_flatwidth << FRACBITS);
const fixed_t modmaskh = (ds_flatheight << FRACBITS);
const fixed_t cosinecomponent = FINECOSINE(pl->plangle>>ANGLETOFINESHIFT);
const fixed_t sinecomponent = FINESINE(pl->plangle>>ANGLETOFINESHIFT);
fixed_t ox = (origin->x % modmaskw);
fixed_t oy = -(origin->y % modmaskh);
fixed_t ox, oy, temp;
if (!pl->plangle)
{
ox = (FixedMul(pl->slope->o.x,cosinecomponent) % modmaskw) - (FixedMul(pl->slope->o.y,sinecomponent) % modmaskh);
oy = (-FixedMul(pl->slope->o.x,sinecomponent) % modmaskw) - (FixedMul(pl->slope->o.y,cosinecomponent) % modmaskh);
temp = ox % modmaskw;
oy %= modmaskh;
ox = FixedMul(temp,cosinecomponent)+FixedMul(oy,-sinecomponent); // negative sine for opposite direction
oy = -FixedMul(temp,-sinecomponent)+FixedMul(oy,cosinecomponent);
}
if (xoffs || yoffs)
{
temp = xoffs;
xoffs = (FixedMul(temp,cosinecomponent) % modmaskw) + (FixedMul(yoffs,sinecomponent) % modmaskh);
yoffs = (-FixedMul(temp,sinecomponent) % modmaskw) + (FixedMul(yoffs,cosinecomponent) % modmaskh);
temp = xoffs % modmaskw;
xoffs %= modmaskw;
yoffs %= modmaskh;
xoffs = FixedMul(temp,cosinecomponent)+FixedMul(yoffs,-sinecomponent); // ditto
yoffs = -FixedMul(temp,-sinecomponent)+FixedMul(yoffs,cosinecomponent);
}
if (!pl->plangle)
{
xoffs -= (pl->slope->o.x - ox);
yoffs += (pl->slope->o.y + oy);
}
xoffs -= (origin->x - ox);
yoffs += (origin->y + oy);
}
void R_DrawSinglePlane(visplane_t *pl)
@ -1093,11 +1034,14 @@ void R_DrawSinglePlane(visplane_t *pl)
light = 0;
if (pl->slope)
{
if (!pl->plangle)
{
if (ds_powersoftwo)
R_AdjustSlopeCoordinates(pl);
R_AdjustSlopeCoordinates(&pl->slope->o);
else
R_AdjustSlopeCoordinatesNPO2(pl);
R_AdjustSlopeCoordinatesNPO2(&pl->slope->o);
}
if (planeripple.active)
{