Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28581 from Lisapple/patch-1

Browse Source 
Fixing Curve2D/3D baked interpolated values
This commit is contained in:
Rémi Verschelde
2019-05-28 10:56:00 +02:00
committed by GitHub
parent e3735a5d5a 6bd271139d
commit 335111c98f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scene/resources/curve.cpp
View File

@@ -782,7 +782,8 @@ Vector2 Curve2D::interpolate_baked(float p_offset, bool p_cubic) const {
if (idx >= bpc - 1) { if (idx >= bpc - 1) {
return r[bpc - 1]; return r[bpc - 1];
} else if (idx == bpc - 2) { } else if (idx == bpc - 2) {
frac /= Math::fmod(baked_max_ofs, bake_interval); if (frac > 0)
frac /= Math::fmod(baked_max_ofs, bake_interval);
} else { } else {
frac /= bake_interval; frac /= bake_interval;
} }
@@ -1352,7 +1353,8 @@ Vector3 Curve3D::interpolate_baked(float p_offset, bool p_cubic) const {
if (idx >= bpc - 1) { if (idx >= bpc - 1) {
return r[bpc - 1]; return r[bpc - 1];
} else if (idx == bpc - 2) { } else if (idx == bpc - 2) {
frac /= Math::fmod(baked_max_ofs, bake_interval); if (frac > 0)
frac /= Math::fmod(baked_max_ofs, bake_interval);
} else { } else {
frac /= bake_interval; frac /= bake_interval;
} }
@@ -1396,7 +1398,8 @@ float Curve3D::interpolate_baked_tilt(float p_offset) const {
if (idx >= bpc - 1) { if (idx >= bpc - 1) {
return r[bpc - 1]; return r[bpc - 1];
} else if (idx == bpc - 2) { } else if (idx == bpc - 2) {
frac /= Math::fmod(baked_max_ofs, bake_interval); if (frac > 0)
frac /= Math::fmod(baked_max_ofs, bake_interval);
} else { } else {
frac /= bake_interval; frac /= bake_interval;
} }