mirror of
https://github.com/godotengine/godot
synced 2024-09-05 16:56:44 +00:00
Update wrap functions
This commit is contained in:
parent
184b2fe21b
commit
70bb31a7b2
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue