godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26171 from Calinou/fix-wrapi-crash 

Fix crash when using `wrapi()` with a range of zero
This commit is contained in:
Rémi Verschelde 2019-02-24 02:37:04 +01:00 committed by GitHub
parent ef61c14dda 18b90508a1
commit 4ebb544ffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/math/math_funcs.h
View File

@ -219,15 +219,15 @@ public:
static _ALWAYS_INLINE_ int wrapi(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;
}
static _ALWAYS_INLINE_ double wrapf(double value, double min, double max) {
double rng = max - min;
return value - (rng * Math::floor((value - min) / rng));
return (!is_equal_approx(rng, 0.0)) ? value - (rng * Math::floor((value - min) / rng)) : min;
}
static _ALWAYS_INLINE_ float wrapf(float value, float min, float max) {
float rng = max - min;
return value - (rng * Math::floor((value - min) / rng));
return (!is_equal_approx(rng, 0.0f)) ? value - (rng * Math::floor((value - min) / rng)) : min;
}
// double only, as these functions are mainly used by the editor and not performance-critical,