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

[3.x] Move collision layer and mask into CollisionObject. #42771

Merged
merged 1 commit into from
May 8, 2021

Conversation

madmiraal
Copy link
Contributor

3.2 version of #42770.

@madmiraal
Copy link
Contributor Author

Rebased following merge of 4287af5.

@madmiraal madmiraal requested review from a team as code owners March 12, 2021 12:26
Base automatically changed from 3.2 to 3.x March 16, 2021 11:11
@aaronfranke aaronfranke modified the milestones: 3.2, 3.3 Mar 16, 2021
@akien-mga akien-mga changed the title [3.2] Move collision layer and mask into CollisionObject. [3.x] Move collision layer and mask into CollisionObject. Mar 26, 2021
@akien-mga akien-mga modified the milestones: 3.3, 3.4 Mar 26, 2021
@madmiraal
Copy link
Contributor Author

Rebased following merge of 015973d.

@madmiraal
Copy link
Contributor Author

Updated the documentation as suggested here.

@madmiraal
Copy link
Contributor Author

Rebased following e4addff.

@akien-mga
Copy link
Member

I wonder how this impacts compatibility for GDNative or other language bindings? Moving methods to a parent class should be transparent to GDScript but it does break the ABI, no?

@madmiraal
Copy link
Contributor Author

I wonder how this impacts compatibility for GDNative or other language bindings? Moving methods to a parent class should be transparent to GDScript but it does break the ABI, no?

It doesn't, because the inherited methods have the same signature as before. This PR simply removes the duplication of defining (and in this case also declaring) them in their child classes. It resolves #26680: the current duplicate declaration prevents people using a pointer to the parent class to call the methods defined in the child classes. However, everyone can continue to call the individual methods in each child class as before.

@akien-mga
Copy link
Member

Thanks for the confirmation, sounds good to me then 👍

@akien-mga akien-mga merged commit 0bdadd4 into godotengine:3.x May 8, 2021
@akien-mga
Copy link
Member

Thanks!

@madmiraal madmiraal deleted the fix-26680-3.2 branch May 9, 2021 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants