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

Merge pull request #17254 from Chaosus/updatewrap 

Update wrap functions
This commit is contained in:
Rémi Verschelde 2018-03-13 12:33:57 +01:00 committed by GitHub
parent d3e788a6b8 70bb31a7b2
commit b4da44981a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/math/math_funcs.cpp
View File

@ -177,18 +177,3 @@ float Math::random(float from, float to) {
float ret = (float)r / (float)RANDOM_MAX;
return (ret) * (to - from) + from;
}
int Math::wrapi(int value, int min, int max) {
--max;
int rng = max - min + 1;
value = ((value - min) % rng);
if (value < 0)
return max + 1 + value;
else
return min + value;
}
float Math::wrapf(float value, float min, float max) {
float rng = max - min;
return min + (value - min) - (rng * floor((value - min) / rng));
}

14
core/math/math_funcs.h
View File

@ -209,8 +209,18 @@ public:
static _ALWAYS_INLINE_ double round(double p_val) { return (p_val >= 0) ? Math::floor(p_val + 0.5) : -Math::floor(-p_val + 0.5); }
static _ALWAYS_INLINE_ float round(float p_val) { return (p_val >= 0) ? Math::floor(p_val + 0.5) : -Math::floor(-p_val + 0.5); }
static int wrapi(int value, int min, int max);
static float wrapf(float value, float min, float max);
static _ALWAYS_INLINE_ int wrapi(int value, int min, int max) {
int rng = max - min;
return min + ((((value - min) % rng) + rng) % rng);
}
static _ALWAYS_INLINE_ double wrapf(double value, double min, double max) {
double rng = max - min;
return min + (value - min) - (rng * Math::floor((value - min) / rng));
}
static _ALWAYS_INLINE_ float wrapf(float value, float min, float max) {
float rng = max - min;
return min + (value - min) - (rng * Math::floor((value - min) / rng));
}
// double only, as these functions are mainly used by the editor and not performance-critical,
static double ease(double p_x, double p_c);