mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.2' into 0.9.3

Browse Source
This commit is contained in:
Christophe Riccio
2011-06-01 17:00:34 +01:00
parent b99df41b3e e43633dbe6
commit d850bdcd0b
24 changed files with 584 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
glm/gtc/quaternion.hpp
View File

@@ -227,6 +227,17 @@ namespace quaternion ///< GLM_GTC_quaternion extension: Quaternion types and fun
//! From GLM_GTC_quaternion extension.
typedef detail::tquat<double> dquat;
//! Quaternion of low precision floating-point numbers.
//! From GLM_GTC_quaternion extension.
typedef detail::tquat<lowp_float> lowp_quat;
//! Quaternion of medium precision floating-point numbers.
//! From GLM_GTC_quaternion extension.
typedef detail::tquat<mediump_float> mediump_quat;
//! Quaternion of high precision floating-point numbers.
//! From GLM_GTC_quaternion extension.
typedef detail::tquat<highp_float> highp_quat;
///@}
} //namespace quaternion

2
glm/gtc/quaternion.inl
View File

@@ -430,7 +430,7 @@ namespace quaternion{
)
{
T angle = acos(dot(x, y));
return (sin((T(1) - a) * angle) * x + sin(a * angle) * y) / sin(angle);
return (glm::sin((T(1) - a) * angle) * x + glm::sin(a * angle) * y) / glm::sin(angle);
}
template <typename T>