From 42fa7f4723f25fc24c03e64a03a51aa9e02fa70c Mon Sep 17 00:00:00 2001
From: Lach <lachsrb2@gmail.com>
Date: Thu, 26 Jan 2023 15:29:35 +1100
Subject: [PATCH] Invert OpenGL rollangle for papersprites to match software
renderer behaviour
---
src/hardware/hw_main.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 3a6baab71..05d1be28f 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5180,7 +5180,15 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (thing->rollangle
&& !(splat && !(thing->renderflags & RF_NOSPLATROLLANGLE)))
{
- rollangle = R_GetRollAngle(thing->rollangle);
+ if (papersprite)
+ {
+ // a positive rollangle should should pitch papersprites upwards relative to their facing angle
+ rollangle = R_GetRollAngle(InvAngle(thing->rollangle));
+ }
+ else
+ {
+ rollangle = R_GetRollAngle(thing->rollangle);
+ }
rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
if (rotsprite != NULL)
@@ -5234,7 +5242,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
{
interpmobjstate_t casterinterp = { 0 };
fixed_t groundz;
- fixed_t floordiff;
+ fixed_t floordiff;
if (R_UsingFrameInterpolation() && !paused)
{
@@ -5244,7 +5252,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
{
R_InterpolateMobjState(caster, FRACUNIT, &casterinterp);
}
-
+
groundz = R_GetShadowZ(thing, NULL);
floordiff = abs(((thing->eflags & MFE_VERTICALFLIP) ? caster->height : 0) + casterinterp.z - groundz);