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

This commit is contained in:
Raul Santos 2021-07-28 21:42:26 +02:00
parent 60eb508fbb
commit e23f6a5bba

View file

@ -100,11 +100,18 @@ void PathFollow3D::_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);
@ -113,7 +120,12 @@ void PathFollow3D::_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) - pos;
Vector3 forward = c->interpolate_baked(o_next, cubic);
// 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);