diff options
| author | chai <chaifix@163.com> | 2018-11-16 00:24:51 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-11-16 00:24:51 +0800 |
| commit | 831e814ce9bdb84e86c06c4a52008f6bdaaa00d6 (patch) | |
| tree | f91fccc7d2628d6e0a39886134b2bb174f5eede4 /src/libjin/Math/je_math.h | |
| parent | 6dc75930fe5fe02f1af5489917752d315cf9e48f (diff) | |
*合并master到minimal分支
Diffstat (limited to 'src/libjin/Math/je_math.h')
| -rw-r--r-- | src/libjin/Math/je_math.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/libjin/Math/je_math.h b/src/libjin/Math/je_math.h index 1f8e0b3..de57e36 100644 --- a/src/libjin/Math/je_math.h +++ b/src/libjin/Math/je_math.h @@ -1,5 +1,5 @@ -#ifndef __JE_UTILS_MATH_H -#define __JE_UTILS_MATH_H +#ifndef __JE_UTILS_MATH_H__ +#define __JE_UTILS_MATH_H__ #include "je_constant.h" #include "je_matrix.h" @@ -71,7 +71,13 @@ namespace JinEngine return a + t * (b - a); } + inline float lerp(float a, float b, float f) + { + f = clamp<float>(f, 0, 1); + return a + f * (b - a); + } + } // namespace Math } // namespace JinEngine -#endif // __JE_UTILS_MATH_H
\ No newline at end of file +#endif // __JE_UTILS_MATH_H__ |