maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #37311 from MickeMakaron/handle-huge-path2d-offset-values

Browse source 
Handle huge path2d offset values
This commit is contained in:
Rémi Verschelde 2020-04-13 09:17:04 +02:00 committed by GitHub
parent 06748a2b5f 2edb59ec88
commit 6366332949
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/2d/path_2d.cpp
View file

@ -321,16 +321,14 @@ void PathFollow2D::set_offset(float p_offset) {
offset = p_offset;
if (path) {
if (path->get_curve().is_valid() && path->get_curve()->get_baked_length()) {
if (path->get_curve().is_valid()) {
float path_length = path->get_curve()->get_baked_length();
if (loop) {
while (offset > path_length)
offset -= path_length;
while (offset < 0)
offset += path_length;
offset = Math::fposmod(offset, path_length);
if (!Math::is_zero_approx(p_offset) && Math::is_zero_approx(offset)) {
offset = path_length;
}
} else {
offset = CLAMP(offset, 0, path_length);
}

12
scene/3d/path_3d.cpp
View file

@ -316,16 +316,14 @@ void PathFollow3D::set_offset(float p_offset) {
offset = p_offset;
if (path) {
if (path->get_curve().is_valid() && path->get_curve()->get_baked_length()) {
if (path->get_curve().is_valid()) {
float path_length = path->get_curve()->get_baked_length();
if (loop) {
while (offset > path_length)
offset -= path_length;
while (offset < 0)
offset += path_length;
offset = Math::fposmod(offset, path_length);
if (!Math::is_zero_approx(p_offset) && Math::is_zero_approx(offset)) {
offset = path_length;
}
} else {
offset = CLAMP(offset, 0, path_length);
}