diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index b00239e8..59397399 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -54,21 +54,6 @@ namespace glm /// @addtogroup gtx_transform /// @{ - /// Builds a translation 4 * 4 matrix created from 3 scalars. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink - template - detail::tmat4x4 translate( - T x, T y, T z); - - /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink - template - detail::tmat4x4 translate( - detail::tmat4x4 const & m, - T x, T y, T z); - /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. /// - From \link gtx_transform GLM_GTX_transform \endlink extension /// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink @@ -76,14 +61,6 @@ namespace glm detail::tmat4x4 translate( detail::tvec3 const & v); - /// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink - template - detail::tmat4x4 rotate( - T angle, - T x, T y, T z); - /// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. /// - From \link gtx_transform GLM_GTX_transform \endlink extension /// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink @@ -92,30 +69,6 @@ namespace glm T angle, detail::tvec3 const & v); - /// Transforms a matrix with a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink - template - detail::tmat4x4 rotate( - detail::tmat4x4 const & m, - T angle, - T x, T y, T z); - - /// Builds a scale 4 * 4 matrix created from 3 scalars. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink - template - detail::tmat4x4 scale( - T x, T y, T z); - - /// Transforms a matrix with a scale 4 * 4 matrix created from 3 scalars. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink - template - detail::tmat4x4 scale( - detail::tmat4x4 const & m, - T x, T y, T z); - /// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components. /// - From \link gtx_transform GLM_GTX_transform \endlink extension /// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink diff --git a/glm/gtx/transform.inl b/glm/gtx/transform.inl index 39e20b5f..aa288df4 100644 --- a/glm/gtx/transform.inl +++ b/glm/gtx/transform.inl @@ -9,24 +9,6 @@ namespace glm { - template - GLM_FUNC_QUALIFIER detail::tmat4x4 translate( - T x, T y, T z) - { - return translate( - detail::tmat4x4(1.0f), - detail::tvec3(x, y , z)); - } - - template - GLM_FUNC_QUALIFIER detail::tmat4x4 translate( - detail::tmat4x4 const & m, - T x, T y, T z) - { - return translate( - m, detail::tvec3(x, y , z)); - } - template GLM_FUNC_QUALIFIER detail::tmat4x4 translate( detail::tvec3 const & v) @@ -35,15 +17,6 @@ namespace glm detail::tmat4x4(1.0f), v); } - template - GLM_FUNC_QUALIFIER detail::tmat4x4 rotate( - T angle, - T x, T y, T z) - { - return rotate( - detail::tmat4x4(1), angle, detail::tvec3(x, y, z)); - } - template GLM_FUNC_QUALIFIER detail::tmat4x4 rotate( T angle, @@ -53,32 +26,6 @@ namespace glm detail::tmat4x4(1), angle, v); } - template - GLM_FUNC_QUALIFIER detail::tmat4x4 rotate( - detail::tmat4x4 const & m, - T angle, - T x, T y, T z) - { - return rotate( - m, angle, detail::tvec3(x, y, z)); - } - - template - GLM_FUNC_QUALIFIER detail::tmat4x4 scale(T x, T y, T z) - { - return scale( - detail::tmat4x4(1), detail::tvec3(x, y, z)); - } - - template - GLM_FUNC_QUALIFIER detail::tmat4x4 scale( - detail::tmat4x4 const & m, - T x, T y, T z) - { - return scale( - m, detail::tvec3(x, y, z)); - } - template GLM_FUNC_QUALIFIER detail::tmat4x4 scale( detail::tvec3 const & v)