mewin/glm
1
0
Fork 0
Code Releases 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

42
glm/gtx/multiple.inl
View File

@ -10,13 +10,14 @@
// - GLM core // - GLM core
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
namespace glm namespace glm{
namespace detail
{
template <bool Signed>
struct higherMultiple
{ {
//////////////////////
// higherMultiple
template <typename genType> template <typename genType>
GLM_FUNC_QUALIFIER genType higherMultiple GLM_FUNC_QUALIFIER genType operator()
( (
genType const & Source, genType const & Source,
genType const & Multiple genType const & Multiple
@ -30,6 +31,37 @@ namespace glm
else else
return Source + (-Source % Multiple); 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
template <typename genType>
GLM_FUNC_QUALIFIER genType higherMultiple
(
genType const & Source,
genType const & Multiple
)
{
detail::higherMultiple<std::numeric_limits<genType>::is_signed> Compute;
return Compute(Source, Multiple);
}
template <> template <>
GLM_FUNC_QUALIFIER float higherMultiple GLM_FUNC_QUALIFIER float higherMultiple