Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add integer posmod and rename range_lerp to remap 

https://github.com/godotengine/godot/pull/23310
https://github.com/godotengine/godot/pull/65361
pull/852/head
Aaron Franke 2022-09-18 18:28:44 -05:00
parent 9a2e8d907b
commit 7ba459ae7b
No known key found for this signature in database
GPG Key ID: 40A1750B977E56BF
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/godot_cpp/core/math.hpp
View File

@ -113,7 +113,7 @@ inline float fposmod(float p_x, float p_y) {
if ((value < 0 && p_y > 0) || (value > 0 && p_y < 0)) { if ((value < 0 && p_y > 0) || (value > 0 && p_y < 0)) {
value += p_y; value += p_y;
} }
value += 0.0; value += 0.0f;
return value; return value;
} }
@ -122,7 +122,7 @@ inline float fposmodp(float p_x, float p_y) {
if (value < 0) { if (value < 0) {
value += p_y; value += p_y;
} }
value += 0.0; value += 0.0f;
return value; return value;
} }
inline double fposmodp(double p_x, double p_y) { inline double fposmodp(double p_x, double p_y) {
@ -134,6 +134,14 @@ inline double fposmodp(double p_x, double p_y) {
return value; return value;
} }
inline int64_t posmod(int64_t p_x, int64_t p_y) {
int64_t value = p_x % p_y;
if ((value < 0 && p_y > 0) || (value > 0 && p_y < 0)) {
value += p_y;
}
return value;
}
inline double floor(double p_x) { inline double floor(double p_x) {
return ::floor(p_x); return ::floor(p_x);
} }
@ -454,10 +462,10 @@ inline float inverse_lerp(float p_from, float p_to, float p_value) {
return (p_value - p_from) / (p_to - p_from); return (p_value - p_from) / (p_to - p_from);
} }
inline double range_lerp(double p_value, double p_istart, double p_istop, double p_ostart, double p_ostop) { inline double remap(double p_value, double p_istart, double p_istop, double p_ostart, double p_ostop) {
return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value)); return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value));
} }
inline float range_lerp(float p_value, float p_istart, float p_istop, float p_ostart, float p_ostop) { inline float remap(float p_value, float p_istart, float p_istop, float p_ostart, float p_ostop) {
return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value)); return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value));
} }