diff options
| author | Chaosus <chaosus89@gmail.com> | 2019-03-07 20:23:52 +0300 |
|---|---|---|
| committer | Chaosus <chaosus89@gmail.com> | 2019-03-07 22:57:12 +0300 |
| commit | 752055ccbaf0387af3925afb2765ef76677daf3b (patch) | |
| tree | 6adf3b52d9bdf2af0adaf09cfe595da0c1a40812 | |
| parent | 9af7fa193f65f2caf206b079397fa810d012d803 (diff) | |
Fix division by zero at wrap functions in mono
| -rw-r--r-- | modules/mono/glue/Managed/Files/Mathf.cs | 4 | ||||
| -rw-r--r-- | modules/mono/glue/Managed/Files/MathfEx.cs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/mono/glue/Managed/Files/Mathf.cs b/modules/mono/glue/Managed/Files/Mathf.cs index dcab3c1ffc..5f5de12959 100644 --- a/modules/mono/glue/Managed/Files/Mathf.cs +++ b/modules/mono/glue/Managed/Files/Mathf.cs @@ -289,13 +289,13 @@ namespace Godot public static int Wrap(int value, int min, int max) { int rng = max - min; - return min + ((value - min) % rng + rng) % rng; + return rng != 0 ? min + ((value - min) % rng + rng) % rng : min; } public static real_t Wrap(real_t value, real_t min, real_t max) { real_t rng = max - min; - return min + ((value - min) % rng + rng) % rng; + return !IsEqualApprox(rng, default(real_t)) ? min + ((value - min) % rng + rng) % rng : min; } } } diff --git a/modules/mono/glue/Managed/Files/MathfEx.cs b/modules/mono/glue/Managed/Files/MathfEx.cs index 2ef02cc288..414762f7b1 100644 --- a/modules/mono/glue/Managed/Files/MathfEx.cs +++ b/modules/mono/glue/Managed/Files/MathfEx.cs @@ -35,5 +35,10 @@ namespace Godot { return (int)Math.Round(s); } + + public static bool IsEqualApprox(real_t a, real_t b, real_t ratio = Mathf.Epsilon) + { + return Abs(a - b) < ratio; + } } }
\ No newline at end of file |