From 3663c4c7429d7c1d48edf16a69e2f9f1116a105a Mon Sep 17 00:00:00 2001 From: Mitch Richters Date: Sat, 30 Oct 2021 14:50:24 +1100 Subject: [PATCH] - Split out sine/cosine scaling from `bsinf()` and `bcosf()` into its own inline. --- source/core/binaryangle.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/core/binaryangle.h b/source/core/binaryangle.h index 9f55c57ea..8a17a6495 100644 --- a/source/core/binaryangle.h +++ b/source/core/binaryangle.h @@ -63,6 +63,11 @@ constexpr double BAngToDegree = 360. / 2048.; extern int16_t sintable[2048]; +inline constexpr double sinscale(const int shift) +{ + return shift >= -SINSHIFT ? uint64_t(1) << (SINSHIFT + shift) : 1. / (uint64_t(1) << abs(SINSHIFT + shift)); +} + //--------------------------------------------------------------------------- // // Build sine inline functions. @@ -75,7 +80,7 @@ inline int bsin(const int ang, const int shift = 0) } inline double bsinf(const double ang, const int shift = 0) { - return g_sin(ang * BAngRadian) * (shift >= -SINSHIFT ? uint64_t(1) << (SINSHIFT + shift) : 1. / (uint64_t(1) << abs(SINSHIFT + shift))); + return g_sin(ang * BAngRadian) * sinscale(shift); } @@ -91,7 +96,7 @@ inline int bcos(const int ang, const int shift = 0) } inline double bcosf(const double ang, const int shift = 0) { - return g_cos(ang * BAngRadian) * (shift >= -SINSHIFT ? uint64_t(1) << (SINSHIFT + shift) : 1. / (uint64_t(1) << abs(SINSHIFT + shift))); + return g_cos(ang * BAngRadian) * sinscale(shift); }