1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary bounded_offset from PathFollow2D

Browse Source
This commit is contained in:
Tomasz Chabora 2019-11-30 03:16:33 +01:00
parent 1b40a95b6f
commit 7e6fa6c7a8
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/2d/path_2d.cpp
View File

@ -173,16 +173,10 @@ void PathFollow2D::_update_transform() {
if (path_length == 0) { if (path_length == 0) {
return; return;
} }
float bounded_offset = offset; Vector2 pos = c->interpolate_baked(offset, cubic);
if (loop)
bounded_offset = Math::fposmod(bounded_offset, path_length);
else
bounded_offset = CLAMP(bounded_offset, 0, path_length);
Vector2 pos = c->interpolate_baked(bounded_offset, cubic);
if (rotate) { if (rotate) {
float ahead = bounded_offset + lookahead; float ahead = offset + lookahead;
if (loop && ahead >= path_length) { if (loop && ahead >= path_length) {
// If our lookahead will loop, we need to check if the path is closed. // If our lookahead will loop, we need to check if the path is closed.
@ -206,7 +200,7 @@ void PathFollow2D::_update_transform() {
// This will happen at the end of non-looping or non-closed paths. // This will happen at the end of non-looping or non-closed paths.
// We'll try a look behind instead, in order to get a meaningful angle. // We'll try a look behind instead, in order to get a meaningful angle.
tangent_to_curve = tangent_to_curve =
(pos - c->interpolate_baked(bounded_offset - lookahead, cubic)).normalized(); (pos - c->interpolate_baked(offset - lookahead, cubic)).normalized();
} else { } else {
tangent_to_curve = (ahead_pos - pos).normalized(); tangent_to_curve = (ahead_pos - pos).normalized();
} }