seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #88925 from Aziroshin/linear-curve-zero-vector-bug

Browse Source 
[Curve3D] Fix middle point forward vector when control1=end and…
This commit is contained in:
Thaddeus Crews
2025-05-02 09:25:28 -05:00
parent da462c093a 1a91570ce9
commit f45e6d7462
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/curve.cpp
View File

@ -899,6 +899,10 @@ Vector2 Curve2D::_calculate_tangent(const Vector2 &p_begin, const Vector2 &p_con
}
}
if (p_control_1.is_equal_approx(p_end) && p_control_2.is_equal_approx(p_begin)) {
return (p_end - p_begin).normalized();
}
return p_begin.bezier_derivative(p_control_1, p_control_2, p_end, p_t).normalized();
}
@ -1648,6 +1652,10 @@ Vector3 Curve3D::_calculate_tangent(const Vector3 &p_begin, const Vector3 &p_con
}
}
if (p_control_1.is_equal_approx(p_end) && p_control_2.is_equal_approx(p_begin)) {
return (p_end - p_begin).normalized();
}
return p_begin.bezier_derivative(p_control_1, p_control_2, p_end, p_t).normalized();
}

13
tests/scene/test_curve_2d.h
View File

@ -236,6 +236,19 @@ TEST_CASE("[Curve2D] Sampling") {
CHECK(curve->get_closest_point(Vector2(50, 50)) == Vector2(0, 50));
CHECK(curve->get_closest_point(Vector2(0, 100)) == Vector2(0, 50));
}
SUBCASE("sample_baked_with_rotation, linear curve with control1 = end and control2 = begin") {
// Regression test for issue #88923
// The Vector2s that aren't relevant to the issue have x = 2 or x = -2.
// They're just set to make collisions with corner cases less likely
// that involve zero-vector control points.
Ref<Curve2D> cross_linear_curve = memnew(Curve2D);
cross_linear_curve->set_bake_interval(0.5);
cross_linear_curve->add_point(Vector2(), Vector2(-2, 0), Vector2(1, 0));
cross_linear_curve->add_point(Vector2(1, 0), Vector2(-1, 0), Vector2(2, 0));
CHECK(cross_linear_curve->get_baked_points().size() >= 3);
CHECK(cross_linear_curve->sample_baked_with_rotation(cross_linear_curve->get_closest_offset(Vector2(0.5, 0))).is_equal_approx(Transform2D(Vector2(1, 0), Vector2(0, 1), Vector2(0.5, 0))));
}
}
TEST_CASE("[Curve2D] Tessellation") {

12
tests/scene/test_curve_3d.h
View File

@ -234,6 +234,18 @@ TEST_CASE("[Curve3D] Sampling") {
c->add_point(Vector3(0, .1, 1));
CHECK_LT((c->sample_baked_up_vector(c->get_closest_offset(Vector3(0, 0, .9))) - Vector3(0, 0.995037, -0.099504)).length(), 0.01);
}
SUBCASE("sample_baked_with_rotation, linear curve with control1 = end and control2 = begin") {
// Regression test for issue #88923
// The Vector3s that aren't relevant to the issue have z = 2.
// They're just set to make collisions with corner cases less likely
// that involve zero-vector control points.
Ref<Curve3D> cross_linear_curve = memnew(Curve3D);
cross_linear_curve->add_point(Vector3(), Vector3(-1, 0, 2), Vector3(1, 0, 0));
cross_linear_curve->add_point(Vector3(1, 0, 0), Vector3(-1, 0, 0), Vector3(1, 0, 2));
CHECK(cross_linear_curve->get_baked_points().size() >= 3);
CHECK(cross_linear_curve->sample_baked_with_rotation(cross_linear_curve->get_closest_offset(Vector3(0.5, 0, 0))).is_equal_approx(Transform3D(Basis(Vector3(0, 0, 1), Vector3(0, 1, 0), Vector3(-1, 0, 0)), Vector3(0.5, 0, 0))));
}
}
TEST_CASE("[Curve3D] Tessellation") {