-
-
Notifications
You must be signed in to change notification settings - Fork 3.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
[bevy_ui/layout] UiSurface update internal mappings #12804
Closed
StrikeForceZero
wants to merge
2
commits into
bevyengine:main
from
StrikeForceZero:dev/bevy_ui/ui_surface_update_mappings
Closed
[bevy_ui/layout] UiSurface update internal mappings #12804
StrikeForceZero
wants to merge
2
commits into
bevyengine:main
from
StrikeForceZero:dev/bevy_ui/ui_surface_update_mappings
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
StrikeForceZero
changed the title
Dev/bevy UI/UI surface update mappings
[bevy_ui/layout] UiSurface update internal mappings
Mar 30, 2024
4 tasks
NthTensor
added
A-UI
Graphical user interfaces, styles, layouts, and widgets
C-Code-Quality
A section of code that is hard to understand or change
labels
Mar 30, 2024
StrikeForceZero
force-pushed
the
dev/bevy_ui/ui_surface_update_mappings
branch
from
March 30, 2024 18:23
b532dec
to
64370bb
Compare
2 tasks
StrikeForceZero
force-pushed
the
dev/bevy_ui/ui_surface_update_mappings
branch
from
March 30, 2024 18:59
f8f39ee
to
59be93c
Compare
StrikeForceZero
force-pushed
the
dev/bevy_ui/ui_surface_update_mappings
branch
from
March 30, 2024 19:04
59be93c
to
bfc4364
Compare
StrikeForceZero
force-pushed
the
dev/bevy_ui/ui_surface_update_mappings
branch
from
April 30, 2024 17:49
bfc4364
to
a0f6e73
Compare
StrikeForceZero
force-pushed
the
dev/bevy_ui/ui_surface_update_mappings
branch
2 times, most recently
from
May 13, 2024 03:19
f70fd92
to
107d1ca
Compare
removed |
This was referenced May 13, 2024
StrikeForceZero
commented
May 19, 2024
Apply rustfmt Move test_initialization next to other tests Add doc comment to is_root_node_pair_valid Move helper methods into the single test case where they are used Add tests for helper methods Remove trait helpers to reduce complexity of tests Mark specific test functions as unreachable Move ui_surface test only methods into mod tests as trait Fix tests after rebase Add tests for bevy_ui/layout/ui_surface Widen type for parameter children in UiSurface::update_children Add missing asserts and Debug fields in UiSurface from bevyengine#12268 and bevyengine#12698
Move assertion above panic triggering line Remove demotion logic to simplify scope Remove potentially duplicated context update loop Remove duplicated ContentSize removal handler Restore assertion in ui tracking tests Remove promotion test Satisfy linter Update test Remove promotion helper Apply rustfmt Fix documentation Add missing back ticks in doc comment Underscore unused variables Rebase fixes Add regression test for recursive despawn on ui nodes Apply rustfmt in bevy_ui/layout/debug Remove message from unreachable! Add/update documentation for UiSurface Make missing root_node_data in compute_camera_layout an error Fix promote_ui_node, add a test, and set to only be in cfg(test) Update documentation Use replace_camera_association to reduce redundant code Use mark_root_node_as_orphaned Add explicit taffy node counts to tests Add test for promoting normal ui nodes into root nodes Add support demoting root nodes into normal ui nodes Expand tests to cover different methods of despawn Remove user_root_node field in favor of using entity_to_taffy Replace is_root_node_data_valid helper with has_valid_root_node_data Implement updated map structure in UiSurface Deprecate user_root_node in RootNodeData Extract default viewport style into inline fn Rename camera_id to camera_entity
StrikeForceZero
force-pushed
the
dev/bevy_ui/ui_surface_update_mappings
branch
from
May 19, 2024 17:37
34f6f3c
to
791119a
Compare
StrikeForceZero
added a commit
to StrikeForceZero/bevy
that referenced
this pull request
May 19, 2024
Move assertion above panic triggering line Remove demotion logic to simplify scope Remove potentially duplicated context update loop Remove duplicated ContentSize removal handler Restore assertion in ui tracking tests Remove promotion test Satisfy linter Update test Remove promotion helper Apply rustfmt Fix documentation Add missing back ticks in doc comment Underscore unused variables Rebase fixes Add regression test for recursive despawn on ui nodes Apply rustfmt in bevy_ui/layout/debug Remove message from unreachable! Add/update documentation for UiSurface Make missing root_node_data in compute_camera_layout an error Fix promote_ui_node, add a test, and set to only be in cfg(test) Update documentation Use replace_camera_association to reduce redundant code Use mark_root_node_as_orphaned Add explicit taffy node counts to tests Add test for promoting normal ui nodes into root nodes Add support demoting root nodes into normal ui nodes Expand tests to cover different methods of despawn Remove user_root_node field in favor of using entity_to_taffy Replace is_root_node_data_valid helper with has_valid_root_node_data Implement updated map structure in UiSurface Deprecate user_root_node in RootNodeData Extract default viewport style into inline fn Rename camera_id to camera_entity
janhohenheim
added
the
S-Needs-Review
Needs reviewer attention (from anyone!) to move forward
label
Jul 17, 2024
BenjaminBrienen
added
S-Waiting-on-Author
The author needs to make changes or address concerns before this can be merged
and removed
S-Needs-Review
Needs reviewer attention (from anyone!) to move forward
labels
Oct 31, 2024
I plan on closing this PR and creating a new one with these rebased and updated changes, but I see a new state machine/cache has been added since then that I want to look at more closely before having anyone waste time reviewing this. |
9 tasks
superseded by #16362 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-UI
Graphical user interfaces, styles, layouts, and widgets
C-Code-Quality
A section of code that is hard to understand or change
S-Waiting-on-Author
The author needs to make changes or address concerns before this can be merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is 4 of 5 iterative PR's that affect bevy_ui/layout
(Supersedes #12719)
The Demotion of a child UI node to root node might be out of scope and could be extracted into another PR.ExtractedObjective
UiSurface
mappings to be more conciseUiSurface
Solution
EntityHashSet
to track relationships camera -> root nodesOption<Entity>
inRootNodeData
(previously namedRootNodePair
)Changelog
Migration Guide
TBD - even though it is passing the tests, it might introduce slightly different behavior and should probably be saved for 0.14 unless heavily scrutinized