mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio
2013-05-06 15:34:37 +02:00
parent 57a093035f 86a5825fee
commit e3da5f952c
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
glm/gtx/multiple.inl
View File

@@ -22,13 +22,13 @@ namespace glm
genType const & Multiple
)
{
assert(genType(0) <= Multiple);
genType SourceSign = sign(Source);
genType SourceAbs = abs(Source);
genType Tmp = SourceAbs % Multiple;
return (Tmp ? SourceAbs + Multiple - Tmp : SourceAbs) * SourceSign;
if (Source > genType(0))
{
genType Tmp = Source - genType(1);
return Tmp + (Multiple - (Tmp % Multiple));
}
else
return Source + (-Source % Multiple);
}
template <>
@@ -95,8 +95,13 @@ namespace glm
genType const & Multiple
)
{
genType Tmp = Source % Multiple;
return Tmp ? Source - Tmp : Source;
if (Source >= 0)
return Source - Source % Multiple;
else
{
genType Tmp = Source + 1;
return Tmp - Tmp % Multiple - Multiple;
}
}
template <>