diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-07-08 12:05:44 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-07-08 12:05:44 -0300 |
| commit | cc2e40324d884bc0417809980a696a5084e661d7 (patch) | |
| tree | 9620dfa32e44af5c125aac2c9bce36011ad27b8b /Project/glm/ext/matrix_common.inl | |
| parent | ae765504642759ba4addbf91d62f167ba5f063a3 (diff) | |
| download | PSP.git-cc2e40324d884bc0417809980a696a5084e661d7.tar.gz PSP.git-cc2e40324d884bc0417809980a696a5084e661d7.tar.xz PSP.git-cc2e40324d884bc0417809980a696a5084e661d7.zip | |
GLM folder changed
Diffstat (limited to 'Project/glm/ext/matrix_common.inl')
| -rw-r--r-- | Project/glm/ext/matrix_common.inl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Project/glm/ext/matrix_common.inl b/Project/glm/ext/matrix_common.inl new file mode 100644 index 0000000..9d50848 --- /dev/null +++ b/Project/glm/ext/matrix_common.inl @@ -0,0 +1,16 @@ +#include "../matrix.hpp" + +namespace glm +{ + template<length_t C, length_t R, typename T, typename U, qualifier Q> + GLM_FUNC_QUALIFIER mat<C, R, T, Q> mix(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, U a) + { + return mat<C, R, U, Q>(x) * (static_cast<U>(1) - a) + mat<C, R, U, Q>(y) * a; + } + + template<length_t C, length_t R, typename T, typename U, qualifier Q> + GLM_FUNC_QUALIFIER mat<C, R, T, Q> mix(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, mat<C, R, U, Q> const& a) + { + return matrixCompMult(mat<C, R, U, Q>(x), static_cast<U>(1) - a) + matrixCompMult(mat<C, R, U, Q>(y), a); + } +}//namespace glm |