mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed fastDistance ambiguity #215

Browse Source
This commit is contained in:
Christophe Riccio
2014-06-20 01:09:50 +02:00
parent 2935cdc18e
commit 7fe8a1944c
4 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glm/detail/func_geometric.inl
View File

@@ -92,8 +92,7 @@ namespace detail
{
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'length' only accept floating-point inputs");
genType sqr = x * x;
return sqrt(sqr);
return abs(x);
}
template <typename T, precision P>

32
glm/gtx/fast_square_root.inl
View File

@@ -101,13 +101,43 @@ namespace glm
template <typename genType>
GLM_FUNC_QUALIFIER genType fastDistance
(
genType const & x,
genType const & x,
genType const & y
)
{
return fastLength(y - x);
}
template <typename valType, precision P>
GLM_FUNC_QUALIFIER valType fastDistance
(
detail::tvec2<valType, P> const & x,
detail::tvec2<valType, P> const & y
)
{
return fastLength(y - x);
}
template <typename valType, precision P>
GLM_FUNC_QUALIFIER valType fastDistance
(
detail::tvec3<valType, P> const & x,
detail::tvec3<valType, P> const & y
)
{
return fastLength(y - x);
}
template <typename valType, precision P>
GLM_FUNC_QUALIFIER valType fastDistance
(
detail::tvec4<valType, P> const & x,
detail::tvec4<valType, P> const & y
)
{
return fastLength(y - x);
}
// fastNormalize
template <typename genType>
GLM_FUNC_QUALIFIER genType fastNormalize