AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-13 13:25:06 +01:00
parent dd2f8e1a97
commit a734a705b7
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glm/core/func_common.inl
View File

@ -1312,7 +1312,6 @@ namespace detail
isnan(x.w));
}
template <>
GLM_FUNC_QUALIFIER int floatBitsToInt(float const & value)
{
union
@ -1325,7 +1324,6 @@ namespace detail
return fi.i;
}
template <>
GLM_FUNC_QUALIFIER detail::tvec2<int> floatBitsToInt
(
detail::tvec2<float> const & value
@ -1336,7 +1334,6 @@ namespace detail
floatBitsToInt(value.y));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec3<int> floatBitsToInt
(
detail::tvec3<float> const & value
@ -1348,7 +1345,6 @@ namespace detail
floatBitsToInt(value.z));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec4<int> floatBitsToInt
(
detail::tvec4<float> const & value
@ -1361,7 +1357,6 @@ namespace detail
floatBitsToInt(value.w));
}
template<>
GLM_FUNC_QUALIFIER uint floatBitsToUint(float const & value)
{
union
@ -1374,7 +1369,6 @@ namespace detail
return fu.u;
}
template <>
GLM_FUNC_QUALIFIER detail::tvec2<uint> floatBitsToUint
(
detail::tvec2<float> const & value
@ -1385,7 +1379,6 @@ namespace detail
floatBitsToUint(value.y));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec3<uint> floatBitsToUint
(
detail::tvec3<float> const & value
@ -1397,7 +1390,6 @@ namespace detail
floatBitsToUint(value.z));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec4<uint> floatBitsToUint
(
detail::tvec4<float> const & value
@ -1422,8 +1414,7 @@ namespace detail
return fi.f;
}
template <>
GLM_FUNC_QUALIFIER detail::tvec2<float> intBitsToFloat
GLM_FUNC_QUALIFIER detail::tvec2<float> intBitsToFloat
(
detail::tvec2<int> const & value
)
@ -1433,8 +1424,7 @@ namespace detail
intBitsToFloat(value.y));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec3<float> intBitsToFloat
GLM_FUNC_QUALIFIER detail::tvec3<float> intBitsToFloat
(
detail::tvec3<int> const & value
)
@ -1445,10 +1435,9 @@ namespace detail
intBitsToFloat(value.z));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec4<float> intBitsToFloat
(
detail::tvec4<T> const & value
detail::tvec4<int> const & value
)
{
return detail::tvec4<float>(
@ -1458,7 +1447,6 @@ namespace detail
intBitsToFloat(value.w));
}
template<>
GLM_FUNC_QUALIFIER float uintBitsToFloat(uint const & value)
{
union
@ -1471,7 +1459,6 @@ namespace detail
return fu.f;
}
template <>
GLM_FUNC_QUALIFIER detail::tvec2<float> uintBitsToFloat
(
detail::tvec2<uint> const & value
@ -1482,7 +1469,6 @@ namespace detail
uintBitsToFloat(value.y));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec3<float> uintBitsToFloat
(
detail::tvec3<uint> const & value
@ -1494,7 +1480,6 @@ namespace detail
uintBitsToFloat(value.z));
}
template <>
GLM_FUNC_QUALIFIER detail::tvec4<float> uintBitsToFloat
(
detail::tvec4<uint> const & value