diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
| commit | 6daa52b3b93328506e34d6595a01d30c334897bc (patch) | |
| tree | bdbe951d06f95a1a7752d5c23950eda7bb36a9e7 /indra/llmath/llmath.h | |
| parent | 850bdf4ce335049a75e1c4f6400b627bf328a264 (diff) | |
| parent | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (diff) | |
Merge branch 'develop' into maxim/viewer_2245
Diffstat (limited to 'indra/llmath/llmath.h')
| -rw-r--r-- | indra/llmath/llmath.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index fa315291a3..0348dad8fe 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -358,10 +358,7 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs) return new_foo; } -inline F32 lerp(F32 a, F32 b, F32 u) -{ - return a + ((b - a) * u); -} +using std::lerp; inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v) { @@ -486,7 +483,7 @@ inline U32 get_next_power_two(U32 val, U32 max_power_two) //get the gaussian value given the linear distance from axis x and guassian value o inline F32 llgaussian(F32 x, F32 o) { - return 1.f/(F_SQRT_TWO_PI*o)*powf(F_E, -(x*x)/(2*o*o)); + return 1.f/(F_SQRT_TWO_PI*o)*powf(F_E, -(x*x)/(2.f*o*o)); } //helper function for removing outliers |