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

Jump to bottom

Move collision layer and mask into CollisionObject. #42770

Merged
merged 1 commit into from
Apr 20, 2021
Merged

Move collision layer and mask into CollisionObject. #42770

merged 1 commit into from
Apr 20, 2021

Conversation

madmiraal
Copy link
Contributor

Currently, in both 2D and 3D, collision_layer and collision_mask are implemented in both Area and PhysicsBody and not their parent CollisionObject. This PR removes the duplication by moving collision_layer and collision_mask to CollisionObject where it belongs.

Fixes #26680.

@madmiraal madmiraal added this to the 4.0 milestone Oct 13, 2020
@madmiraal madmiraal mentioned this pull request Oct 13, 2020
Merged
@madmiraal madmiraal requested a review from a team as a code owner October 13, 2020 15:35
@madmiraal
Copy link
Contributor Author

Rebased following merge of #42778.

@madmiraal
Copy link
Contributor Author

Rebased following merge of #44630 and #45852.

KoBeWi
KoBeWi requested changes Mar 29, 2021
View reviewed changes
scene/3d/collision_object_3d.cpp Outdated Show resolved Hide resolved
@madmiraal madmiraal requested review from a team as code owners March 29, 2021 16:45
@madmiraal madmiraal mentioned this pull request Apr 19, 2021
Merged
@pouleyKetchoupp pouleyKetchoupp requested a review from a team April 19, 2021 17:38
@madmiraal
Copy link
Contributor Author

Rebased following merge of #47991.

@akien-mga akien-mga merged commit b06116d into godotengine:master Apr 20, 2021
@akien-mga
Copy link
Member

Thanks!

@madmiraal madmiraal deleted the fix-26680 branch April 21, 2021 09:03
@madmiraal madmiraal mentioned this pull request May 1, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KoBeWi KoBeWi KoBeWi approved these changes

@pouleyKetchoupp pouleyKetchoupp pouleyKetchoupp approved these changes

Assignees
No one assigned
Labels
enhancement topic:core topic:physics
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.

Difficult to work with Area2D/PhysicsBody2D in C# due to duplicated code in Godot Engine
4 participants
@madmiraal @akien-mga @pouleyKetchoupp @KoBeWi