diff options
| author | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
| commit | 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e (patch) | |
| tree | a6ffd2560ab4e6b632b2db5f8e6db6de7823d7dd /common | |
| parent | 707f4cca27e096c167e79619642fbe2e872ee4c8 (diff) | |
Rename lerp to avoid conflicts with C++20's std::lerp
Diffstat (limited to 'common')
| -rw-r--r-- | common/alnumeric.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |