Skip to content

Conversation

jrouwe
Copy link
Contributor

@jrouwe jrouwe commented Sep 30, 2025

A 6DOF constraint that constrains all rotation axis in combination with a body that has some of its rotation axis locked would not constrain the rotation in the unlocked axis.

Fixes #109018

A 6DOF constraint that constrains all rotation axis in combination with a body that has some of its rotation axis locked would not constrain the rotation in the unlocked axis.

Fixes godotengine#109018
@jrouwe jrouwe requested a review from a team as a code owner September 30, 2025 19:02
@jrouwe
Copy link
Contributor Author

jrouwe commented Sep 30, 2025

Note that merging this PR may not actually cause the affected cpp files to be recompiled due to a scons caching issue we found. You may need to force recompile.

@jrouwe jrouwe changed the title Fix Generic6DOFJoint3D not respecting angular limits [JoltPhysics] Fix Generic6DOFJoint3D not respecting angular limits Sep 30, 2025
@AThousandShips AThousandShips added bug topic:thirdparty topic:physics topic:3d cherrypick:4.4 Considered for cherry-picking into a future 4.4.x release cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release labels Oct 1, 2025
@AThousandShips AThousandShips added this to the 4.6 milestone Oct 1, 2025
Copy link
Contributor

@mihe mihe left a comment

Choose a reason for hiding this comment

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

It does indeed seem to fix #109018, thanks!

@jrouwe would you say this is safe to cherrypick all the way back to Godot 4.4, i.e. jrouwe/JoltPhysics@f094082 (-ish), or does this fix depend on anything newer than that?

@jrouwe
Copy link
Contributor Author

jrouwe commented Oct 1, 2025

I think it should be safe yes.

@Repiteo Repiteo merged commit be9f6b4 into godotengine:master Oct 1, 2025
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Oct 1, 2025

Thanks!

@jrouwe jrouwe deleted the issue_109018 branch October 2, 2025 06:23
@akien-mga
Copy link
Member

Cherry-picked for 4.5.1.

@akien-mga akien-mga removed the cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release label Oct 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug cherrypick:4.4 Considered for cherry-picking into a future 4.4.x release topic:physics topic:thirdparty topic:3d

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Jolt Generic6DOFJoint3D does not respect angular limits when Rigidbody3D has angular Axis Locks

5 participants