diff options
Diffstat (limited to 'glm-master/glm/ext/matrix_common.inl')
| -rw-r--r-- | glm-master/glm/ext/matrix_common.inl | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/glm-master/glm/ext/matrix_common.inl b/glm-master/glm/ext/matrix_common.inl deleted file mode 100644 index 9d50848..0000000 --- a/glm-master/glm/ext/matrix_common.inl +++ /dev/null @@ -1,16 +0,0 @@ -#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 |