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-09-13 12:26:52 +01:00
commit 12033f401b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glm/core/func_common.inl
View File

@ -1388,7 +1388,8 @@ namespace detail
{
return detail::tvec3<uint>(
floatBitsToUint(value.x),
floatBitsToUint(value.y));
floatBitsToUint(value.y),
floatBitsToUint(value.z));
}
template <typename T>
@ -1399,7 +1400,9 @@ namespace detail
{
return detail::tvec4<uint>(
floatBitsToUint(value.x),
floatBitsToUint(value.y));
floatBitsToUint(value.y),
floatBitsToUint(value.z),
floatBitsToUint(value.w));
}
GLM_FUNC_QUALIFIER float intBitsToFloat(int const & value)
@ -1433,7 +1436,8 @@ namespace detail
{
return detail::tvec3<float>(
intBitsToFloat(value.x),
intBitsToFloat(value.y));
intBitsToFloat(value.y),
intBitsToFloat(value.z));
}
template <typename T>
@ -1444,7 +1448,9 @@ namespace detail
{
return detail::tvec4<float>(
intBitsToFloat(value.x),
intBitsToFloat(value.y));
intBitsToFloat(value.y),
intBitsToFloat(value.z),
intBitsToFloat(value.w));
}
GLM_FUNC_QUALIFIER float uintBitsToFloat(uint const & value)
@ -1478,7 +1484,8 @@ namespace detail
{
return detail::tvec3<float>(
uintBitsToFloat(value.x),
uintBitsToFloat(value.y));
uintBitsToFloat(value.y),
uintBitsToFloat(value.z));
}
template <typename T>
@ -1489,7 +1496,9 @@ namespace detail
{
return detail::tvec4<float>(
uintBitsToFloat(value.x),
uintBitsToFloat(value.y));
uintBitsToFloat(value.y),
uintBitsToFloat(value.z),
uintBitsToFloat(value.w));
}
template <typename genType>