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.

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

Test collision mask before creating constraint pair in Godot physics broadphase 2D and 3D. #39399

Merged
merged 1 commit into from
Jun 9, 2020

Conversation

madmiraal
Copy link
Contributor

@madmiraal madmiraal commented Jun 8, 2020

Fixes #28460.
Fixes #39374.

Note: This fix is only needed in Godot physics (2D and 3D). Bullet physics' RigidBodys already works as expected.

Edit: Also fixes #16541.

@ghost
Copy link

ghost commented Jun 9, 2020

Curious if it might also close this? #28460

Tried testing, but I had some merge conflicts in 3.2 that I wasn't able to resolve.

Do these extra pairs impact performance noticeably?

@madmiraal
Copy link
Contributor Author

@avencherus The 3.2 version is here.

@madmiraal
Copy link
Contributor Author

@avencherus It does indeed fix #28460 too. Thanks for spotting it.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jun 9, 2020
@akien-mga akien-mga merged commit 945ed76 into godotengine:master Jun 9, 2020
@akien-mga
Copy link
Member

Thanks!

@madmiraal madmiraal deleted the fix-39374 branch June 9, 2020 11:40
@ghost
Copy link

ghost commented Jun 10, 2020

@madmiraal Nice work, thanks. All looks good in the monitor with various combinations.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment