From cb91e23c75c398e82046b63814d84c0942a04557 Mon Sep 17 00:00:00 2001 From: Mitch Richters Date: Mon, 6 Dec 2021 17:31:00 +1100 Subject: [PATCH] - Clamp the return value in `PitchToHoriz()` between the range of an INT32 value, and fix some math in the `PitchToBAM()` and `BAMToPitch()` inlines. --- source/core/binaryangle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/core/binaryangle.h b/source/core/binaryangle.h index bf4ad49c5..147f434e5 100644 --- a/source/core/binaryangle.h +++ b/source/core/binaryangle.h @@ -226,9 +226,9 @@ inline FSerializer &Serialize(FSerializer &arc, const char *key, binangle &obj, inline double HorizToPitch(double horiz) { return atan2(horiz, 128) * (180. / pi::pi()); } inline double HorizToPitch(fixed_t q16horiz) { return atan2(q16horiz, IntToFixed(128)) * (180. / pi::pi()); } -inline fixed_t PitchToHoriz(double pitch) { return xs_CRoundToInt(IntToFixed(128) * tan(pitch * (pi::pi() / 180.))); } -inline int32_t PitchToBAM(double pitch) { return xs_CRoundToInt(clamp(pitch * (1073741823.5 / 45.), -INT32_MAX, INT32_MAX)); } -inline constexpr double BAMToPitch(int32_t bam) { return bam * (45. / 1073741823.5); } +inline fixed_t PitchToHoriz(double pitch) { return xs_CRoundToInt(clamp(IntToFixed(128) * tan(pitch * (pi::pi() / 180.)), INT32_MIN, INT32_MAX)); } +inline int32_t PitchToBAM(double pitch) { return xs_CRoundToInt(clamp(pitch * (0x80000000u / 90.), INT32_MIN, INT32_MAX)); } +inline constexpr double BAMToPitch(int32_t bam) { return bam * (90. / 0x80000000u); } //---------------------------------------------------------------------------