diff options
| author |  Morph | 2021-09-24 16:44:25 -0400 |
|---|---|---|
| committer |  GitHub | 2021-09-24 16:44:25 -0400 |
| commit | 9a53173e4de2194a128a33764d3f50f02f358efa (patch) | |
| tree | 6f6cf76701e48f6c83e105ab06b2e6f82627dbf9 /src/common/vector_math.h | |
| parent | Merge pull request #7069 from lioncash/uuid (diff) | |
| parent | CMakeLists: Update to clang format version 12 (diff) | |
| download | yuzu-9a53173e4de2194a128a33764d3f50f02f358efa.tar.gz yuzu-9a53173e4de2194a128a33764d3f50f02f358efa.tar.xz yuzu-9a53173e4de2194a128a33764d3f50f02f358efa.zip | |
Merge pull request #7084 from ameerj/clang-12
general: Update style to clang-format-12
Diffstat (limited to 'src/common/vector_math.h')
| -rw-r--r-- | src/common/vector_math.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/vector_math.h b/src/common/vector_math.h index 22dba3c2d..ba7c363c1 100644 --- a/src/common/vector_math.h +++ b/src/common/vector_math.h | |||
| @@ -667,8 +667,8 @@ template <typename T> | |||
| 667 | 667 | ||
| 668 | // linear interpolation via float: 0.0=begin, 1.0=end | 668 | // linear interpolation via float: 0.0=begin, 1.0=end |
| 669 | template <typename X> | 669 | template <typename X> |
| 670 | [[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) Lerp(const X& begin, const X& end, | 670 | [[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) |
| 671 | const float t) { | 671 | Lerp(const X& begin, const X& end, const float t) { |
| 672 | return begin * (1.f - t) + end * t; | 672 | return begin * (1.f - t) + end * t; |
| 673 | } | 673 | } |
| 674 | 674 | ||