From d62a62834626a1dd4bf828c2002ffa57a9364546 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Thu, 30 Mar 2017 21:57:36 +0100
Subject: [PATCH] Consistency between software off-slope and GL on+off-slope
flat alignment! (Software slopes are now MORE broken with respect to this,
but that comes later.)
---
src/hardware/hw_main.c | 18 +++++++++---------
src/p_spec.c | 6 ++----
src/r_plane.c | 9 ++++++---
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 7bc12ba75..67eb5d41a 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -641,13 +641,13 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
{
scrollx = FIXED_TO_FLOAT(FOFsector->floor_xoffs)/fflatsize;
scrolly = FIXED_TO_FLOAT(FOFsector->floor_yoffs)/fflatsize;
- angle = FOFsector->floorpic_angle>>ANGLETOFINESHIFT;
+ angle = FOFsector->floorpic_angle;
}
else // it's a ceiling
{
scrollx = FIXED_TO_FLOAT(FOFsector->ceiling_xoffs)/fflatsize;
scrolly = FIXED_TO_FLOAT(FOFsector->ceiling_yoffs)/fflatsize;
- angle = FOFsector->ceilingpic_angle>>ANGLETOFINESHIFT;
+ angle = FOFsector->ceilingpic_angle;
}
}
else if (gr_frontsector)
@@ -656,24 +656,24 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
{
scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatsize;
scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatsize;
- angle = gr_frontsector->floorpic_angle>>ANGLETOFINESHIFT;
+ angle = gr_frontsector->floorpic_angle;
}
else // it's a ceiling
{
scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatsize;
scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatsize;
- angle = gr_frontsector->ceilingpic_angle>>ANGLETOFINESHIFT;
+ angle = gr_frontsector->ceilingpic_angle;
}
}
if (angle) // Only needs to be done if there's an altered angle
{
-
+ angle = InvAngle(angle)>>ANGLETOFINESHIFT;
// This needs to be done so that it scrolls in a different direction after rotation like software
- tempxsow = FLOAT_TO_FIXED(scrollx);
+ /*tempxsow = FLOAT_TO_FIXED(scrollx);
tempytow = FLOAT_TO_FIXED(scrolly);
scrollx = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
- scrolly = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));
+ scrolly = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));*/
// This needs to be done so everything aligns after rotation
// It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does
@@ -687,7 +687,7 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
{
// Hurdler: add scrolling texture on floor/ceiling
v3d->sow = (float)((pv->x / fflatsize) - flatxref + scrollx);
- v3d->tow = (float)(flatyref - (pv->y / fflatsize) + scrolly);
+ v3d->tow = (float)(-(pv->y / fflatsize) + flatyref - scrolly);
//v3d->sow = (float)(pv->x / fflatsize);
//v3d->tow = (float)(pv->y / fflatsize);
@@ -698,7 +698,7 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
tempxsow = FLOAT_TO_FIXED(v3d->sow);
tempytow = FLOAT_TO_FIXED(v3d->tow);
v3d->sow = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
- v3d->tow = (FIXED_TO_FLOAT(-FixedMul(tempxsow, FINESINE(angle)) - FixedMul(tempytow, FINECOSINE(angle))));
+ v3d->tow = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));
}
//v3d->sow = (float)(v3d->sow - flatxref + scrollx);
diff --git a/src/p_spec.c b/src/p_spec.c
index ddcdfbd53..01518d658 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5763,10 +5763,8 @@ void P_SpawnSpecials(INT32 fromnetsave)
}
else // Otherwise, set calculated offsets such that line's v1 is the apparent origin
{
- fixed_t cosinecomponent = FINECOSINE(flatangle>>ANGLETOFINESHIFT);
- fixed_t sinecomponent = FINESINE(flatangle>>ANGLETOFINESHIFT);
- xoffs = (-FixedMul(lines[i].v1->x, cosinecomponent) % MAXFLATSIZE) + (FixedMul(lines[i].v1->y, sinecomponent) % MAXFLATSIZE); // No danger of overflow thanks to the strategically placed modulo operations.
- yoffs = (FixedMul(lines[i].v1->x, sinecomponent) % MAXFLATSIZE) + (FixedMul(lines[i].v1->y, cosinecomponent) % MAXFLATSIZE); // Ditto.
+ xoffs = -lines[i].v1->x;
+ yoffs = -lines[i].v1->y;
}
for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
diff --git a/src/r_plane.c b/src/r_plane.c
index 11dd79d41..e882fa48c 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -448,9 +448,12 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
if (plangle != 0)
{
// Add the view offset, rotated by the plane angle.
- angle_t angle = plangle>>ANGLETOFINESHIFT;
- xoff += FixedMul(viewx,FINECOSINE(angle))-FixedMul(viewy,FINESINE(angle));
- yoff += -FixedMul(viewx,FINESINE(angle))-FixedMul(viewy,FINECOSINE(angle));
+ fixed_t cosinecomponent = FINECOSINE(plangle>>ANGLETOFINESHIFT);
+ fixed_t sinecomponent = FINESINE(plangle>>ANGLETOFINESHIFT);
+ fixed_t interxoff = xoff + viewx;
+ fixed_t interyoff = yoff + viewy;
+ xoff = FixedMul(interxoff,cosinecomponent)-FixedMul(interyoff,sinecomponent);
+ yoff = -FixedMul(interxoff,sinecomponent)-FixedMul(interyoff,cosinecomponent);
}
else
{