From 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 6 Apr 2022 17:41:24 -0700 Subject: Rename lerp to avoid conflicts with C++20's std::lerp --- common/alnumeric.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/alnumeric.h') diff --git a/common/alnumeric.h b/common/alnumeric.h index a0b0fcf3..9e7a7f07 100644 --- a/common/alnumeric.h +++ b/common/alnumeric.h @@ -69,7 +69,7 @@ constexpr inline size_t clampz(size_t val, size_t min, size_t max) noexcept { return minz(max, maxz(min, val)); } -constexpr inline float lerp(float val1, float val2, float mu) noexcept +constexpr inline float lerpf(float val1, float val2, float mu) noexcept { return val1 + (val2-val1)*mu; } constexpr inline float cubic(float val1, float val2, float val3, float val4, float mu) noexcept { -- cgit v1.2.3