-
Notifications
You must be signed in to change notification settings - Fork 6k
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
[Impeller] fixed Rect::Contains #49294
Conversation
315b15c
to
d671ae4
Compare
@@ -130,7 +130,8 @@ struct TRect { | |||
} | |||
|
|||
[[nodiscard]] constexpr bool Contains(const TRect& o) const { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want a.Contains(a) == true
, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes indeed, we assume this inclusivity in our current usages
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only ask because the Contains(Point) uses < operators for the right and bottom axises.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another issue with these methods is that empty can contain another rectangle and vice versa. I'm planning to address all of these in a rewrite now that the fields are hidden, but I'm just starting on that now and if this PR fixes an existing practical issue, then we should proceed with it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The left and top edges are considered "inside", the right and bottom edges are considered "outside".
For points you want >= left/top
and < right/bottom
to match that rule.
For rects, both have the same insideness and so matching edges always have the same containment as each other. In the case of right and bottom, those edges are the non-inclusive limit of what each rectangle considers "inside" and so if they are equal then all of the points inside one of them are also inside the other (wrt that one edge).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. This looks safe because the Get[Direction] methods return sorted directions.
@@ -130,7 +130,8 @@ struct TRect { | |||
} | |||
|
|||
[[nodiscard]] constexpr bool Contains(const TRect& o) const { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes indeed, we assume this inclusivity in our current usages
Actually, the opposite. Because of the sorted data an empty rectangle can "contain" a non-empty rectangle. The auto-sorting of rectangles is one of the first things I'm going to fix in the rework of Rect. |
The eventual implementation of these methods will be based upon the versions that were created for the DL-specific geometry classes, such as: Note that we decided to not proceed with the DL-geometry package and instead have it share a geometry package with Impeller by updating Impeller's classes. |
…140519) Roll Flutter Engine from c70f0a495ace to 1b1b2a12a597 (32 revisions) flutter/engine@c70f0a4...1b1b2a1 2023-12-21 [email protected] Roll Dart SDK from 4a10533a4dc8 to bcf68d22f0fa (1 revision) (flutter/engine#49329) 2023-12-21 [email protected] Roll Dart SDK from 1d0c3ecd1349 to 4a10533a4dc8 (1 revision) (flutter/engine#49326) 2023-12-21 [email protected] Ensure sorted rects in ui.Canvas for legacy compatibility (flutter/engine#49309) 2023-12-21 [email protected] Roll Dart SDK from 63a452b45026 to 1d0c3ecd1349 (1 revision) (flutter/engine#49318) 2023-12-21 [email protected] [Impeller] Make IPLR files multi-platform (flutter/engine#49253) 2023-12-21 [email protected] [web] Defer injection of platform views until needed. (flutter/engine#48960) 2023-12-21 [email protected] Roll Dart SDK from 1aef027ec953 to 63a452b45026 (2 revisions) (flutter/engine#49311) 2023-12-21 [email protected] Roll Skia from 29917d8c97ca to 4b16117e94b2 (4 revisions) (flutter/engine#49310) 2023-12-21 [email protected] Reland "[Windows] Move to FlutterCompositor for rendering" (flutter/engine#49262) 2023-12-21 [email protected] Reland `[Impeller] new blur: refactored math and fixed expanded padding size` (flutter/engine#49302) 2023-12-20 [email protected] Multiview pipeline Pt. 1: Skip illegal render calls (flutter/engine#49266) 2023-12-20 [email protected] SemanticsUpdateBuilder: make all args non-null (flutter/engine#49148) 2023-12-20 [email protected] [Impeller] fixed Rect::Contains (flutter/engine#49294) 2023-12-20 [email protected] Roll Dart SDK from 97c3b7e1885a to 1aef027ec953 (1 revision) (flutter/engine#49295) 2023-12-20 [email protected] Revert "[Impeller] new blur: refactored math and fixed expanded padding size" (flutter/engine#49298) 2023-12-20 [email protected] [Impeller] new blur: refactored math and fixed expanded padding size (flutter/engine#49206) 2023-12-20 [email protected] Multi-view pointer event (flutter/engine#46213) 2023-12-20 [email protected] [web:multiview] Only call `Renderer.clearFragmentProgramCache` on hot restart (flutter/engine#48758) 2023-12-20 [email protected] Roll Skia from 9cb1bb1164ea to 29917d8c97ca (1 revision) (flutter/engine#49289) 2023-12-20 [email protected] [Impeller] Add interactive Blur+Clip AiksTest. (flutter/engine#49283) 2023-12-20 [email protected] [macos] FlutterKeyboardManager memory leak fix (flutter/engine#48824) 2023-12-20 [email protected] Don't guard Windows arm64 Dart SDK download on the release candidate flag (flutter/engine#49244) 2023-12-20 [email protected] Fix testAppExtensionLaunching for Xcode 15/iOS 17 (flutter/engine#49242) 2023-12-20 [email protected] Roll Skia from 8060d6b36066 to 9cb1bb1164ea (2 revisions) (flutter/engine#49288) 2023-12-20 [email protected] Roll Dart SDK from ed415d966d8a to 97c3b7e1885a (1 revision) (flutter/engine#49287) 2023-12-20 [email protected] Roll Skia from d0f09ad481f7 to 8060d6b36066 (1 revision) (flutter/engine#49285) 2023-12-20 [email protected] [release] Update release config (flutter/engine#49254) 2023-12-20 [email protected] Roll Dart SDK from 1732c4c92ccd to ed415d966d8a (1 revision) (flutter/engine#49274) 2023-12-20 [email protected] Roll Dart SDK from 4c59838945d9 to 1732c4c92ccd (1 revision) (flutter/engine#49269) 2023-12-20 [email protected] Sync lints with flutter/flutter (flutter/engine#49192) 2023-12-19 [email protected] [web] Enforce onDrawFrame/onBeginFrame render rule (flutter/engine#49214) 2023-12-19 [email protected] [Docs] Add more info about running tests on iOS (flutter/engine#48859) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md ...
…lutter#140519) Roll Flutter Engine from c70f0a495ace to 1b1b2a12a597 (32 revisions) flutter/engine@c70f0a4...1b1b2a1 2023-12-21 [email protected] Roll Dart SDK from 4a10533a4dc8 to bcf68d22f0fa (1 revision) (flutter/engine#49329) 2023-12-21 [email protected] Roll Dart SDK from 1d0c3ecd1349 to 4a10533a4dc8 (1 revision) (flutter/engine#49326) 2023-12-21 [email protected] Ensure sorted rects in ui.Canvas for legacy compatibility (flutter/engine#49309) 2023-12-21 [email protected] Roll Dart SDK from 63a452b45026 to 1d0c3ecd1349 (1 revision) (flutter/engine#49318) 2023-12-21 [email protected] [Impeller] Make IPLR files multi-platform (flutter/engine#49253) 2023-12-21 [email protected] [web] Defer injection of platform views until needed. (flutter/engine#48960) 2023-12-21 [email protected] Roll Dart SDK from 1aef027ec953 to 63a452b45026 (2 revisions) (flutter/engine#49311) 2023-12-21 [email protected] Roll Skia from 29917d8c97ca to 4b16117e94b2 (4 revisions) (flutter/engine#49310) 2023-12-21 [email protected] Reland "[Windows] Move to FlutterCompositor for rendering" (flutter/engine#49262) 2023-12-21 [email protected] Reland `[Impeller] new blur: refactored math and fixed expanded padding size` (flutter/engine#49302) 2023-12-20 [email protected] Multiview pipeline Pt. 1: Skip illegal render calls (flutter/engine#49266) 2023-12-20 [email protected] SemanticsUpdateBuilder: make all args non-null (flutter/engine#49148) 2023-12-20 [email protected] [Impeller] fixed Rect::Contains (flutter/engine#49294) 2023-12-20 [email protected] Roll Dart SDK from 97c3b7e1885a to 1aef027ec953 (1 revision) (flutter/engine#49295) 2023-12-20 [email protected] Revert "[Impeller] new blur: refactored math and fixed expanded padding size" (flutter/engine#49298) 2023-12-20 [email protected] [Impeller] new blur: refactored math and fixed expanded padding size (flutter/engine#49206) 2023-12-20 [email protected] Multi-view pointer event (flutter/engine#46213) 2023-12-20 [email protected] [web:multiview] Only call `Renderer.clearFragmentProgramCache` on hot restart (flutter/engine#48758) 2023-12-20 [email protected] Roll Skia from 9cb1bb1164ea to 29917d8c97ca (1 revision) (flutter/engine#49289) 2023-12-20 [email protected] [Impeller] Add interactive Blur+Clip AiksTest. (flutter/engine#49283) 2023-12-20 [email protected] [macos] FlutterKeyboardManager memory leak fix (flutter/engine#48824) 2023-12-20 [email protected] Don't guard Windows arm64 Dart SDK download on the release candidate flag (flutter/engine#49244) 2023-12-20 [email protected] Fix testAppExtensionLaunching for Xcode 15/iOS 17 (flutter/engine#49242) 2023-12-20 [email protected] Roll Skia from 8060d6b36066 to 9cb1bb1164ea (2 revisions) (flutter/engine#49288) 2023-12-20 [email protected] Roll Dart SDK from ed415d966d8a to 97c3b7e1885a (1 revision) (flutter/engine#49287) 2023-12-20 [email protected] Roll Skia from d0f09ad481f7 to 8060d6b36066 (1 revision) (flutter/engine#49285) 2023-12-20 [email protected] [release] Update release config (flutter/engine#49254) 2023-12-20 [email protected] Roll Dart SDK from 1732c4c92ccd to ed415d966d8a (1 revision) (flutter/engine#49274) 2023-12-20 [email protected] Roll Dart SDK from 4c59838945d9 to 1732c4c92ccd (1 revision) (flutter/engine#49269) 2023-12-20 [email protected] Sync lints with flutter/flutter (flutter/engine#49192) 2023-12-19 [email protected] [web] Enforce onDrawFrame/onBeginFrame render rule (flutter/engine#49214) 2023-12-19 [email protected] [Docs] Add more info about running tests on iOS (flutter/engine#48859) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md ...
fixes flutter/flutter#140464
Pre-launch Checklist
///
).If you need help, consider asking for advice on the #hackers-new channel on Discord.