Fix CCD bodies adding multiple contact manifolds when using Jolt#110914
Merged
Repiteo merged 1 commit intogodotengine:masterfrom Sep 26, 2025
Merged
Fix CCD bodies adding multiple contact manifolds when using Jolt#110914Repiteo merged 1 commit intogodotengine:masterfrom
Repiteo merged 1 commit intogodotengine:masterfrom
Conversation
mihe
added
the
cherrypick:4.5
Contributor
|
Tested locally, and it seems to have fixed the errors in my game. :) |
jrouwe
approved these changes
Sep 26, 2025
Repiteo
approved these changes
Sep 26, 2025
Contributor
|
Thanks! |
Contributor
|
Thank you! |
Contributor
|
It happens… Now! Cherry-picked to 4.5 |
Repiteo
removed
the
cherrypick:4.5
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #110757.
The code in
JoltContactListener3D::_try_add_contacts, as called by Jolt through itsJPH::ContactListenercallback interface, does not currently take into account that CCD collisions can cause it to be called multiple times in a single physics step for the same shape pair. This means that aRigidBody3Dwithcontinuous_cdenabled, as well as a non-zeromax_contacts_reported, can end up with a list of contacts that actually make up two different contact manifolds, which is bad.In 4.5-stable this also resulted in an error about
reserve() called with a capacity smaller than the current size, but which has since been relegated to a--verbosewarning as of #110826.This PR fixes all that by simply doing an early-out from
JoltContactListener3D::_try_add_contactsif the shape pair in question already has a set of contacts.