From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/gtx/polar_coordinates.inl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'external/include/glm/gtx/polar_coordinates.inl') diff --git a/external/include/glm/gtx/polar_coordinates.inl b/external/include/glm/gtx/polar_coordinates.inl index afc9d2b..cd1f357 100644 --- a/external/include/glm/gtx/polar_coordinates.inl +++ b/external/include/glm/gtx/polar_coordinates.inl @@ -3,32 +3,32 @@ namespace glm { - template - GLM_FUNC_QUALIFIER tvec3 polar + template + GLM_FUNC_QUALIFIER vec<3, T, Q> polar ( - tvec3 const & euclidean + vec<3, T, Q> const& euclidean ) { T const Length(length(euclidean)); - tvec3 const tmp(euclidean / Length); + vec<3, T, Q> const tmp(euclidean / Length); T const xz_dist(sqrt(tmp.x * tmp.x + tmp.z * tmp.z)); - return tvec3( + return vec<3, T, Q>( asin(tmp.y), // latitude atan(tmp.x, tmp.z), // longitude xz_dist); // xz distance } - template - GLM_FUNC_QUALIFIER tvec3 euclidean + template + GLM_FUNC_QUALIFIER vec<3, T, Q> euclidean ( - tvec2 const & polar + vec<2, T, Q> const& polar ) { T const latitude(polar.x); T const longitude(polar.y); - return tvec3( + return vec<3, T, Q>( cos(latitude) * sin(longitude), sin(latitude), cos(latitude) * cos(longitude)); -- cgit v1.2.3