diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-05 13:21:13 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-05 13:21:13 +0800 |
| commit | 53197ea0f31270a3094a6720b862bcaeee4851f2 (patch) | |
| tree | a7adddab10cdd835e044bf16d9a1108cd4f705a1 /indra/llmath | |
| parent | 7df3c46f7a1ec6bbfbb0e9bb6e642b7ca31825ce (diff) | |
| parent | ea83f1fd98b6cb99175c76a81e60e63975384a2c (diff) | |
Merge branch 'main' into 2024.12-ForeverFPS
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llmath.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index fa315291a3..a72993a21a 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -358,10 +358,14 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs) return new_foo; } +#ifdef __GNUC__ +using std::lerp; +#else inline F32 lerp(F32 a, F32 b, F32 u) { return a + ((b - a) * u); } +#endif inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v) { |