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

Fixed glm::multiple warning with unsigned int genType

Browse Source
This commit is contained in:
Christophe Riccio 2013-12-16 23:52:28 +01:00
parent eb56539a76
commit 3b8a199f1b
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
glm/gtx/multiple.inl
View File

@ -10,8 +10,45 @@
// - GLM core // - GLM core
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
namespace glm namespace glm{
namespace detail
{ {
template <bool Signed>
struct higherMultiple
{
template <typename genType>
GLM_FUNC_QUALIFIER genType operator()
(
genType const & Source,
genType const & Multiple
)
{
if (Source > genType(0))
{
genType Tmp = Source - genType(1);
return Tmp + (Multiple - (Tmp % Multiple));
}
else
return Source + (-Source % Multiple);
}
};
template <>
struct higherMultiple<false>
{
template <typename genType>
GLM_FUNC_QUALIFIER genType operator()
(
genType const & Source,
genType const & Multiple
)
{
genType Tmp = Source - genType(1);
return Tmp + (Multiple - (Tmp % Multiple));
}
};
}//namespace detail
////////////////////// //////////////////////
// higherMultiple // higherMultiple
@ -22,13 +59,8 @@ namespace glm
genType const & Multiple genType const & Multiple
) )
{ {
if (Source > genType(0)) detail::higherMultiple<std::numeric_limits<genType>::is_signed> Compute;
{ return Compute(Source, Multiple);
genType Tmp = Source - genType(1);
return Tmp + (Multiple - (Tmp % Multiple));
}
else
return Source + (-Source % Multiple);
} }
template <> template <>