diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-20 19:24:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 19:24:49 -0300 |
| commit | ee0f53df52d88ca57079579f3f3e943e7e40f53a (patch) | |
| tree | fcf670f1e8aec411c6deaf97e9fc77bf5c195f31 /scene/resources/curve.cpp | |
| parent | 72a02555850016ab792cf498c5370983d3b72832 (diff) | |
| parent | 6f4f9aa6ded6da027c84cc466c767334dc3d3362 (diff) | |
| download | redot-engine-ee0f53df52d88ca57079579f3f3e943e7e40f53a.tar.gz | |
Merge pull request #7528 from tagcup/real_t_float_fixes
Use real_t rather than float or double in generic functions (core/mat…
Diffstat (limited to 'scene/resources/curve.cpp')
| -rw-r--r-- | scene/resources/curve.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp index e201cb16ac..3392c68e75 100644 --- a/scene/resources/curve.cpp +++ b/scene/resources/curve.cpp @@ -498,7 +498,7 @@ Vector2 Curve2D::interpolatef(real_t p_findex) const { else if (p_findex>=points.size()) p_findex=points.size(); - return interpolate((int)p_findex,Math::fmod(p_findex,1.0)); + return interpolate((int)p_findex,Math::fmod(p_findex,(real_t)1.0)); } @@ -653,7 +653,7 @@ Vector2 Curve2D::interpolate_baked(float p_offset,bool p_cubic) const{ return r[bpc-1]; int idx = Math::floor((double)p_offset/(double)bake_interval); - float frac = Math::fmod(p_offset,bake_interval); + float frac = Math::fmod(p_offset,(float)bake_interval); if (idx>=bpc-1) { return r[bpc-1]; @@ -974,7 +974,7 @@ Vector3 Curve3D::interpolatef(real_t p_findex) const { else if (p_findex>=points.size()) p_findex=points.size(); - return interpolate((int)p_findex,Math::fmod(p_findex,1.0)); + return interpolate((int)p_findex,Math::fmod(p_findex,(real_t)1.0)); } |