godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #7528 from tagcup/real_t_float_fixes

Browse Source 
Use real_t rather than float or double in generic functions (core/mat…
This commit is contained in:
Juan Linietsky
2017-01-20 19:24:49 -03:00
committed by GitHub
parent 72a0255585 6f4f9aa6de
commit ee0f53df52
50 changed files with 543 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
core/math/math_funcs.cpp
View File

@@ -59,35 +59,8 @@ uint32_t Math::rand() {
return pcg32_random_r(&default_pcg);
}
double Math::randf() {
return (double)rand() / (double)Math::RANDOM_MAX;
}
double Math::round(double p_val) {
if (p_val>=0) {
return ::floor(p_val+0.5);
} else {
p_val=-p_val;
return -::floor(p_val+0.5);
}
}
double Math::dectime(double p_value,double p_amount, double p_step) {
float sgn = p_value < 0 ? -1.0 : 1.0;
float val = absf(p_value);
val-=p_amount*p_step;
if (val<0.0)
val=0.0;
return val*sgn;
}
int Math::step_decimals(double p_step) {
static const int maxn=9;
static const double sd[maxn]={
0.9999, // somehow compensate for floating point error
@@ -101,7 +74,7 @@ int Math::step_decimals(double p_step) {
0.000000009999
};
double as=absf(p_step);
double as=Math::abs(p_step);
for(int i=0;i<maxn;i++) {
if (as>=sd[i]) {
return i;
@@ -111,8 +84,16 @@ int Math::step_decimals(double p_step) {
return maxn;
}
double Math::ease(double p_x, double p_c) {
double Math::dectime(double p_value,double p_amount, double p_step) {
double sgn = p_value < 0 ? -1.0 : 1.0;
double val = Math::abs(p_value);
val-=p_amount*p_step;
if (val<0.0)
val=0.0;
return val*sgn;
}
double Math::ease(double p_x, double p_c) {
if (p_x<0)
p_x=0;
else if (p_x>1.0)
@@ -133,20 +114,16 @@ double Math::ease(double p_x, double p_c) {
}
} else
return 0; // no ease (raw)
}
double Math::stepify(double p_value,double p_step) {
if (p_step!=0) {
p_value=floor( p_value / p_step + 0.5 ) * p_step;
p_value=Math::floor( p_value / p_step + 0.5 ) * p_step;
}
return p_value;
}
uint32_t Math::larger_prime(uint32_t p_val) {
static const uint32_t primes[] = {
@@ -195,22 +172,15 @@ uint32_t Math::larger_prime(uint32_t p_val) {
}
double Math::random(double from, double to) {
unsigned int r = Math::rand();
double ret = (double)r/(double)RANDOM_MAX;
return (ret)*(to-from) + from;
}
double Math::pow(double x, double y) {
return ::pow(x,y);
float Math::random(float from, float to) {
unsigned int r = Math::rand();
float ret = (float)r/(float)RANDOM_MAX;
return (ret)*(to-from) + from;
}
double Math::log(double x) {
return ::log(x);
}
double Math::exp(double x) {
return ::exp(x);
}