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

Fix forward calculation in PathFollow3D for the position at the end of the curve

Browse Source 
(cherry picked from commit e23f6a5bba)
This commit is contained in:
Raul Santos
2021-07-28 21:42:26 +02:00
committed by Rémi Verschelde
parent 86466737ff
commit 32bbe644ca
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scene/3d/path.cpp
View File

@@ -108,11 +108,18 @@ void PathFollow::_update_transform(bool p_update_xyz_rot) {
}
float bi = c->get_bake_interval();
float o_next = offset + bi;
float o_prev = offset - bi;
if (loop) {
o_next = Math::fposmod(o_next, bl);
} else if (rotation_mode == ROTATION_ORIENTED && o_next >= bl) {
o_next = bl;
o_prev = Math::fposmod(o_prev, bl);
} else if (rotation_mode == ROTATION_ORIENTED) {
if (o_next >= bl) {
o_next = bl;
}
if (o_prev <= 0) {
o_prev = 0;
}
}
Vector3 pos = c->interpolate_baked(offset, cubic);
@@ -121,8 +128,12 @@ void PathFollow::_update_transform(bool p_update_xyz_rot) {
// will be replaced by "Vector3(h_offset, v_offset, 0)" where it was formerly used
if (rotation_mode == ROTATION_ORIENTED) {
Vector3 forward = c->interpolate_baked(o_next, cubic);
Vector3 forward = c->interpolate_baked(o_next, cubic) - pos;
// Try with the previous position
if (forward.length_squared() < CMP_EPSILON2) {
forward = pos - c->interpolate_baked(o_prev, cubic);
}
if (forward.length_squared() < CMP_EPSILON2)
forward = Vector3(0, 0, 1);