diff options
Diffstat (limited to 'external/include/glm/gtx/matrix_transform_2d.inl')
-rw-r--r-- | external/include/glm/gtx/matrix_transform_2d.inl | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/external/include/glm/gtx/matrix_transform_2d.inl b/external/include/glm/gtx/matrix_transform_2d.inl index bea5670..9ae83d9 100644 --- a/external/include/glm/gtx/matrix_transform_2d.inl +++ b/external/include/glm/gtx/matrix_transform_2d.inl @@ -6,62 +6,62 @@ namespace glm { - - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> translate( - tmat3x3<T, P> const & m, - tvec2<T, P> const & v) + + template<typename T, qualifier Q> + GLM_FUNC_QUALIFIER mat<3, 3, T, Q> translate( + mat<3, 3, T, Q> const& m, + vec<2, T, Q> const& v) { - tmat3x3<T, P> Result(m); + mat<3, 3, T, Q> Result(m); Result[2] = m[0] * v[0] + m[1] * v[1] + m[2]; return Result; } - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate( - tmat3x3<T, P> const & m, + template<typename T, qualifier Q> + GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rotate( + mat<3, 3, T, Q> const& m, T angle) { T const a = angle; T const c = cos(a); T const s = sin(a); - tmat3x3<T, P> Result(uninitialize); + mat<3, 3, T, Q> Result; Result[0] = m[0] * c + m[1] * s; Result[1] = m[0] * -s + m[1] * c; Result[2] = m[2]; return Result; } - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> scale( - tmat3x3<T, P> const & m, - tvec2<T, P> const & v) + template<typename T, qualifier Q> + GLM_FUNC_QUALIFIER mat<3, 3, T, Q> scale( + mat<3, 3, T, Q> const& m, + vec<2, T, Q> const& v) { - tmat3x3<T, P> Result(uninitialize); + mat<3, 3, T, Q> Result; Result[0] = m[0] * v[0]; Result[1] = m[1] * v[1]; Result[2] = m[2]; return Result; } - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX( - tmat3x3<T, P> const & m, + template<typename T, qualifier Q> + GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearX( + mat<3, 3, T, Q> const& m, T y) { - tmat3x3<T, P> Result(1); + mat<3, 3, T, Q> Result(1); Result[0][1] = y; return m * Result; } - template <typename T, precision P> - GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY( - tmat3x3<T, P> const & m, + template<typename T, qualifier Q> + GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearY( + mat<3, 3, T, Q> const& m, T x) { - tmat3x3<T, P> Result(1); + mat<3, 3, T, Q> Result(1); Result[1][0] = x; return m * Result; } |