diff --git a/src/lol/math/vector.h b/src/lol/math/vector.h index 596365c9..cc552a8d 100644 --- a/src/lol/math/vector.h +++ b/src/lol/math/vector.h @@ -1286,7 +1286,7 @@ extern Quat slerp(Quat const &qa, Quat const &qb, T f); { \ tname ret; \ for (size_t n = 0; n < sizeof(a) / sizeof(t1); n++) \ - ret[n] = a[n] + (a[n] - b[n]) * x; \ + ret[n] = a[n] + (b[n] - a[n]) * x; \ return ret; \ } diff --git a/src/numeric.h b/src/numeric.h index f0652127..8dc8a4eb 100644 --- a/src/numeric.h +++ b/src/numeric.h @@ -52,7 +52,7 @@ template static inline T PotUp(T val) return val + 1; } -//Lerp for float +//Damp for float template static inline T1 damp(const T1 &a, const T2 &b, const Tf &x, const Tf &dt) { if (dt <= .0f)