From 78a52ce9562b31f79f508e3df33e776856afe8fc Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 25 Oct 2022 22:20:20 -0700
Subject: [PATCH] Disable sprite/model rotation on slopes for now
---
src/hardware/hw_md2.c | 5 +++++
src/p_mobj.c | 5 +++++
src/r_patchrotation.c | 4 ++++
3 files changed, 14 insertions(+)
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 1cced9b9aa..a1aa985901 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1618,8 +1618,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
}
}
+#if 0
p.anglez = FIXED_TO_FLOAT(AngleFixed(spr->mobj->pitch));
p.anglex = FIXED_TO_FLOAT(AngleFixed(spr->mobj->roll));
+#else
+ p.anglez = 0.f;
+ p.anglex = 0.f;
+#endif
p.flip = atransform.flip;
p.mirror = atransform.mirror;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index f336ecd842..0b5246866b 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1591,6 +1591,7 @@ void P_CheckGravity(mobj_t *mo, boolean affect)
//
void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
{
+#if 0
if (slope)
{
fixed_t tempz = slope->normal.z;
@@ -1604,6 +1605,10 @@ void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
{
mo->pitch = mo->roll = 0;
}
+#else
+ (void)mo;
+ (void)slope;
+#endif
}
#define STOPSPEED (FRACUNIT)
diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c
index 999f07995e..d960a95ad8 100644
--- a/src/r_patchrotation.c
+++ b/src/r_patchrotation.c
@@ -26,6 +26,7 @@ angle_t R_ModelRotationAngle(mobj_t *mobj)
angle_t R_SpriteRotationAngle(mobj_t *mobj)
{
+#if 0
angle_t viewingAngle = R_PointToAngle(mobj->x, mobj->y);
fixed_t pitchMul = -FINESINE(viewingAngle >> ANGLETOFINESHIFT);
@@ -34,6 +35,9 @@ angle_t R_SpriteRotationAngle(mobj_t *mobj)
angle_t rollOrPitch = FixedMul(mobj->pitch, pitchMul) + FixedMul(mobj->roll, rollMul);
return (rollOrPitch + R_ModelRotationAngle(mobj));
+#else
+ return R_ModelRotationAngle(mobj);
+#endif
}
INT32 R_GetRollAngle(angle_t rollangle)
--
GitLab