Browse Source

Fix floorMultiple/ceilMultiple for float

Sebastian Rettenberger 10 years ago
parent
commit
de9e62f0a4
1 changed files with 2 additions and 8 deletions
  1. 2 8
      glm/gtc/round.inl

+ 2 - 8
glm/gtc/round.inl

@@ -104,10 +104,7 @@ namespace detail
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 		{
 			if(Source > genType(0))
 			if(Source > genType(0))
-			{
-				genType Tmp = Source - genType(1);
-				return Tmp + (Multiple - std::fmod(Tmp, Multiple));
-			}
+				return Source + (Multiple - std::fmod(Source, Multiple));
 			else
 			else
 				return Source + std::fmod(-Source, Multiple);
 				return Source + std::fmod(-Source, Multiple);
 		}
 		}
@@ -152,10 +149,7 @@ namespace detail
 			if(Source >= genType(0))
 			if(Source >= genType(0))
 				return Source - std::fmod(Source, Multiple);
 				return Source - std::fmod(Source, Multiple);
 			else
 			else
-			{
-				genType Tmp = Source + genType(1);
-				return Tmp - std::fmod(Tmp, Multiple) - Multiple;
-			}
+				return Source - std::fmod(Source, Multiple) - Multiple;
 		}
 		}
 	};
 	};