mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further optimized glm::sign for signed and unsigned int #271

Browse Source
This commit is contained in:
Christophe Riccio 2014-11-21 23:43:48 +01:00
parent f98f2b107a
commit 38161f01f8
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
glm/detail/func_common.inl
View File

@ -128,6 +128,36 @@ namespace detail
return a ? y : x; return a ? y : x;
} }
}; };
template <typename T, precision P, template <class, precision> class vecType, bool isFloat = true, bool isSigned = true>
struct compute_sign
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
{
return vecType<T, P>(glm::lessThan(vecType<T, P>(0), x)) - vecType<T, P>(glm::lessThan(x, vecType<T, P>(0)));
}
};
template <typename T, precision P, template <class, precision> class vecType>
struct compute_sign<T, P, vecType, false, false>
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
{
return glm::abs(x);
}
};
template <typename T, precision P, template <class, precision> class vecType>
struct compute_sign<T, P, vecType, false, true>
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
{
T const Shift(static_cast<T>(sizeof(T) * 8 - 1));
vecType<T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
return (x >> Shift) | y;
}
};
}//namespace detail }//namespace detail
// abs // abs
@ -159,7 +189,7 @@ namespace detail
std::numeric_limits<genFIType>::is_iec559 || (std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer), std::numeric_limits<genFIType>::is_iec559 || (std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer),
"'sign' only accept signed inputs"); "'sign' only accept signed inputs");
return static_cast<genFIType>(static_cast<genFIType>(0) < x) - static_cast<genFIType>(x < static_cast<genFIType>(0)); return detail::compute_sign<genFIType, defaultp, tvec1, std::numeric_limits<genFIType>::is_iec559>::call(tvec1<genFIType>(x)).x;
} }
template <typename T, precision P, template <typename, precision> class vecType> template <typename T, precision P, template <typename, precision> class vecType>
@ -169,7 +199,9 @@ namespace detail
std::numeric_limits<T>::is_iec559 || (std::numeric_limits<T>::is_signed && std::numeric_limits<T>::is_integer), std::numeric_limits<T>::is_iec559 || (std::numeric_limits<T>::is_signed && std::numeric_limits<T>::is_integer),
"'sign' only accept signed inputs"); "'sign' only accept signed inputs");
return vecType<T, P>(glm::lessThan(vecType<T, P>(0), x)) - vecType<T, P>(glm::lessThan(x, vecType<T, P>(0))); return detail::compute_sign<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x);
//return vecType<T, P>(glm::lessThan(vecType<T, P>(0), x)) - vecType<T, P>(glm::lessThan(x, vecType<T, P>(0)));
} }
// floor // floor

1
readme.txt
View File

@ -76,6 +76,7 @@ Improvements:
- Removed <iostream> in GLM tests - Removed <iostream> in GLM tests
- Used std features within GLM without redeclaring - Used std features within GLM without redeclaring
- Optimized glm::cot #272 - Optimized glm::cot #272
- Optimized glm::sign #272
Fixes: Fixes:
- Fixed std::nextafter not supported with C++11 on Android #217 - Fixed std::nextafter not supported with C++11 on Android #217

2
test/core/core_func_common.cpp
View File

@ -844,6 +844,8 @@ namespace sign
{ {
type<glm::int32> const Data[] = type<glm::int32> const Data[] =
{ {
{ std::numeric_limits<glm::int32>::max(), 1},
{ std::numeric_limits<glm::int32>::min(), -1},
{ 0, 0}, { 0, 0},
{ 1, 1}, { 1, 1},
{ 2, 1}, { 2, 1},