Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Curve: Check for finiteness before performing calculations in sample_baked() functions #98625

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Curve: Check for finiteness before performing calculations in sample_baked() functions #98625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions scene/resources/curve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,9 @@ void Curve::set_bake_resolution(int p_resolution) {
}

real_t Curve::sample_baked(real_t p_offset) const {
// Make sure that p_offset is finite.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO the comment is unnecessary, the code is self-explanatory.
At least there is no reason to repeat it in every method.

ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), 0, "Offset is non-finite");

if (_baked_cache_dirty) {
// Last-second bake if not done already
const_cast<Curve *>(this)->bake();
Expand Down Expand Up @@ -981,6 +984,9 @@ Transform2D Curve2D::_sample_posture(Interval p_interval) const {
}

Vector2 Curve2D::sample_baked(real_t p_offset, bool p_cubic) const {
// Make sure that p_offset is finite.
ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), Vector2(), "Offset is non-finite");

if (baked_cache_dirty) {
_bake();
}
Expand All @@ -1000,6 +1006,9 @@ Vector2 Curve2D::sample_baked(real_t p_offset, bool p_cubic) const {
}

Transform2D Curve2D::sample_baked_with_rotation(real_t p_offset, bool p_cubic) const {
// Make sure that p_offset is finite.
ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), Transform2D(), "Offset is non-finite");

if (baked_cache_dirty) {
_bake();
}
Expand Down Expand Up @@ -1881,6 +1890,9 @@ Basis Curve3D::get_point_baked_posture(int p_index, bool p_apply_tilt) const {
#endif

Vector3 Curve3D::sample_baked(real_t p_offset, bool p_cubic) const {
// Make sure that p_offset is finite.
ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), Vector3(), "Offset is non-finite");

if (baked_cache_dirty) {
_bake();
}
Expand All @@ -1900,6 +1912,9 @@ Vector3 Curve3D::sample_baked(real_t p_offset, bool p_cubic) const {
}

Transform3D Curve3D::sample_baked_with_rotation(real_t p_offset, bool p_cubic, bool p_apply_tilt) const {
// Make sure that p_offset is finite.
ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), Transform3D(), "Offset is non-finite");

if (baked_cache_dirty) {
_bake();
}
Expand Down Expand Up @@ -1929,6 +1944,9 @@ Transform3D Curve3D::sample_baked_with_rotation(real_t p_offset, bool p_cubic, b
}

real_t Curve3D::sample_baked_tilt(real_t p_offset) const {
// Make sure that p_offset is finite.
ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), 0, "Offset is non-finite");

if (baked_cache_dirty) {
_bake();
}
Expand All @@ -1948,6 +1966,9 @@ real_t Curve3D::sample_baked_tilt(real_t p_offset) const {
}

Vector3 Curve3D::sample_baked_up_vector(real_t p_offset, bool p_apply_tilt) const {
// Make sure that p_offset is finite.
ERR_FAIL_COND_V_MSG(!Math::is_finite(p_offset), Vector3(0, 1, 0), "Offset is non-finite");

if (baked_cache_dirty) {
_bake();
}
Expand Down