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

[C#] Fix Encloses failing on shared upper bound for AABB and Rect2(I) #87264

Merged
merged 1 commit into from
Jan 17, 2024

Conversation

@AThousandShips AThousandShips added bug topic:core topic:dotnet cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Jan 16, 2024
@AThousandShips AThousandShips added this to the 4.3 milestone Jan 16, 2024
@AThousandShips AThousandShips requested a review from a team as a code owner January 16, 2024 18:28
@raulsntos
Copy link
Member

Thank you so much, that was fast. I looked at Rect2 and it seems like it's also missing the change from #32478. Do you think you could include it in the fix?

public readonly bool Encloses(Rect2 b)
{
return b._position.X >= _position.X && b._position.Y >= _position.Y &&
b._position.X + b._size.X < _position.X + _size.X &&
b._position.Y + b._size.Y < _position.Y + _size.Y;
}

@AThousandShips
Copy link
Member Author

Good point, will do in a bit, away from the computer for now, can do it in a separate one too, will check Rect2I as well

@AThousandShips

This comment was marked as outdated.

@AThousandShips AThousandShips changed the title [C#] Fix AABB.Encloses failing on shared upper bound [C#] Fix Encloses failing on shared upper bound for AABB and Rect2(I) Jan 16, 2024
Copy link
Member

@raulsntos raulsntos left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@YuriSizov YuriSizov merged commit 6673639 into godotengine:master Jan 17, 2024
15 checks passed
@AThousandShips AThousandShips deleted the aabb_fix_cs branch January 17, 2024 17:59
@YuriSizov
Copy link
Contributor

Thanks!

@AThousandShips
Copy link
Member Author

Thank you!

@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jan 25, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.2.2.

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.

3 participants