Merge branch '0.9.4' into 0.9.5

This commit is contained in:
Christophe Riccio 2013-02-22 10:49:00 +01:00
commit 5c44c6e9fc
3 changed files with 10 additions and 6 deletions

View File

@ -50,17 +50,19 @@ namespace glm
/// @addtogroup gtx_polar_coordinates
/// @{
//! Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude.
//! From GLM_GTX_polar_coordinates extension.
/// Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude.
///
/// @see gtx_polar_coordinates
template <typename T>
detail::tvec3<T> polar(
detail::tvec3<T> const & euclidean);
//! Convert Polar to Euclidean coordinates.
//! From GLM_GTX_polar_coordinates extension.
/// Convert Polar to Euclidean coordinates.
///
/// @see gtx_polar_coordinates
template <typename T>
detail::tvec3<T> euclidean(
detail::tvec3<T> const & polar);
detail::tvec2<T> const & polar);
/// @}
}//namespace glm

View File

@ -35,7 +35,7 @@ namespace glm
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> euclidean
(
detail::tvec3<T> const & polar
detail::tvec2<T> const & polar
)
{
#ifdef GLM_FORCE_RADIANS

View File

@ -50,6 +50,8 @@ GLM 0.9.4.3: 2013-0X-XX
--------------------------------------------------------------------------------
- Detected qualifier for Clang
- Fixed C++11 mode for GCC, couldn't be enabled without MS extensions
- Fixed squad, intermediate and exp quaternion functions
- Fixed GTX_polar_coordinates euclidean function, takes a vec2 instead of a vec3
================================================================================
GLM 0.9.4.2: 2013-02-14