From 453607acec02ec7c4c52a154d76e3e4c5f6aa8db Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 9 Mar 2011 09:54:35 +0000 Subject: [PATCH] Typo --- glm/gtc/matrix_transform.inl | 52 +++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index bc0a65ac..93d845e6 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -144,13 +144,15 @@ namespace matrix_transform } template - inline detail::tmat4x4 ortho( + inline detail::tmat4x4 ortho + ( valType const & left, valType const & right, valType const & bottom, valType const & top, valType const & zNear, - valType const & zFar) + valType const & zFar + ) { detail::tmat4x4 Result(1); Result[0][0] = valType(2) / (right - left); @@ -179,13 +181,15 @@ namespace matrix_transform } template - inline detail::tmat4x4 frustum( + inline detail::tmat4x4 frustum + ( valType const & left, valType const & right, valType const & bottom, valType const & top, valType const & nearVal, - valType const & farVal) + valType const & farVal + ) { detail::tmat4x4 Result(0); Result[0][0] = (valType(2) * nearVal) / (right - left); @@ -199,11 +203,13 @@ namespace matrix_transform } template - inline detail::tmat4x4 perspective( + inline detail::tmat4x4 perspective + ( valType const & fovy, valType const & aspect, valType const & zNear, - valType const & zFar) + valType const & zFar + ) { valType range = tan(radians(fovy / valType(2))) * zNear; valType left = -range * aspect; @@ -244,10 +250,12 @@ namespace matrix_transform } template - inline detail::tmat4x4 infinitePerspective( + inline detail::tmat4x4 infinitePerspective + ( T fovy, T aspect, - T zNear) + T zNear + ) { T range = tan(radians(fovy / T(2))) * zNear; T left = -range * aspect; @@ -265,10 +273,12 @@ namespace matrix_transform } template - inline detail::tmat4x4 tweakedInfinitePerspective( + inline detail::tmat4x4 tweakedInfinitePerspective + ( T fovy, T aspect, - T zNear) + T zNear + ) { T range = tan(radians(fovy / T(2))) * zNear; T left = -range * aspect; @@ -286,11 +296,13 @@ namespace matrix_transform } template - inline detail::tvec3 project( + inline detail::tvec3 project + ( detail::tvec3 const & obj, detail::tmat4x4 const & model, detail::tmat4x4 const & proj, - detail::tvec4 const & viewport) + detail::tvec4 const & viewport + ) { detail::tvec4 tmp = detail::tvec4(obj, T(1)); tmp = model * tmp; @@ -305,11 +317,13 @@ namespace matrix_transform } template - inline detail::tvec3 unProject( + inline detail::tvec3 unProject + ( detail::tvec3 const & win, detail::tmat4x4 const & model, detail::tmat4x4 const & proj, - detail::tvec4 const & viewport) + detail::tvec4 const & viewport + ) { detail::tmat4x4 inverse = glm::inverse(proj * model); @@ -349,10 +363,12 @@ namespace matrix_transform } template - inline detail::tmat4x4 lookAt( - const detail::tvec3& eye, - const detail::tvec3& center, - const detail::tvec3& up) + inline detail::tmat4x4 lookAt + ( + detail::tvec3 const & eye, + detail::tvec3 const & center, + detail::tvec3 const & up + ) { detail::tvec3 f = normalize(center - eye); detail::tvec3 u = normalize(up);