mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9.1' into 0.9.2

Browse Source
This commit is contained in:
Christophe Riccio 2011-04-11 16:19:03 +01:00
commit 8663d9f67d
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
glm/core/func_common.inl
View File

@ -1402,18 +1402,6 @@ namespace glm
return fi.f; return fi.f;
} }
inline float intBitsToFloat(uint const & value)
{
union
{
float f;
uint u;
} fu;
fu.u = value;
return fu.f;
}
template <typename T> template <typename T>
inline detail::tvec2<float> intBitsToFloat inline detail::tvec2<float> intBitsToFloat
( (
@ -1447,6 +1435,51 @@ namespace glm
intBitsToFloat(value.y)); intBitsToFloat(value.y));
} }
inline float uintBitsToFloat(uint const & value)
{
union
{
float f;
uint u;
} fu;
fu.u = value;
return fu.f;
}
template <typename T>
inline detail::tvec2<float> uintBitsToFloat
(
detail::tvec2<T> const & value
)
{
return detail::tvec2<T>(
uintBitsToFloat(value.x),
uintBitsToFloat(value.y));
}
template <typename T>
inline detail::tvec3<float> uintBitsToFloat
(
detail::tvec3<T> const & value
)
{
return detail::tvec3<T>(
uintBitsToFloat(value.x),
uintBitsToFloat(value.y));
}
template <typename T>
inline detail::tvec4<float> uintBitsToFloat
(
detail::tvec4<T> const & value
)
{
return detail::tvec4<T>(
uintBitsToFloat(value.x),
uintBitsToFloat(value.y));
}
template <typename genType> template <typename genType>
inline genType fma inline genType fma
( (