forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bevy_ui/layout] Update tests to get GlobalTransform properly (#12802)

Browse Source 
This is 2 of 5 iterative PR's that affect bevy_ui/layout

- [x] Blocked by https://github.com/bevyengine/bevy/pull/12801

[Diff to parent
PR](https://github.com/StrikeForceZero/bevy/compare/dev/bevy_ui/breakup_layout_mod..dev/bevy_ui/update_layout_tests)

---

# Objective

- Update a test in bevy_ui/layout to use the proper way to get an up to
date `GlobalTransform`

## Solution

- Adds `sync_simple_transforms`, and `propagate_transforms` to the test
schedule in bevy_ui/layout

---
This commit is contained in:
Brett Striker 2024-04-02 22:48:06 -04:00 committed by GitHub
parent 1d4176d4cd
commit ba8d70288d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/bevy_ui/src/layout/mod.rs
View File

@ -343,7 +343,8 @@ mod tests {
use bevy_render::camera::OrthographicProjection; use bevy_render::camera::OrthographicProjection;
use bevy_render::prelude::Camera; use bevy_render::prelude::Camera;
use bevy_render::texture::Image; use bevy_render::texture::Image;
use bevy_transform::prelude::{GlobalTransform, Transform}; use bevy_transform::prelude::GlobalTransform;
use bevy_transform::systems::{propagate_transforms, sync_simple_transforms};
use bevy_utils::prelude::default; use bevy_utils::prelude::default;
use bevy_utils::HashMap; use bevy_utils::HashMap;
use bevy_window::PrimaryWindow; use bevy_window::PrimaryWindow;
@ -399,6 +400,8 @@ mod tests {
update_target_camera_system, update_target_camera_system,
apply_deferred, apply_deferred,
ui_layout_system, ui_layout_system,
sync_simple_transforms,
propagate_transforms,
) )
.chain(), .chain(),
); );
@ -697,15 +700,11 @@ mod tests {
ui_schedule.run(&mut world); ui_schedule.run(&mut world);
let overlap_check = world let overlap_check = world
.query_filtered::<(Entity, &Node, &mut GlobalTransform, &Transform), Without<Parent>>() .query_filtered::<(Entity, &Node, &GlobalTransform), Without<Parent>>()
.iter_mut(&mut world) .iter(&world)
.fold( .fold(
Option::<(Rect, bool)>::None, Option::<(Rect, bool)>::None,
|option_rect, (entity, node, mut global_transform, transform)| { |option_rect, (entity, node, global_transform)| {
// fix global transform - for some reason the global transform isn't populated yet.
// might be related to how these specific tests are working directly with World instead of App
*global_transform = GlobalTransform::from(transform.compute_affine());
let global_transform = &*global_transform;
let current_rect = node.logical_rect(global_transform); let current_rect = node.logical_rect(global_transform);
assert!( assert!(
current_rect.height().abs() + current_rect.width().abs() > 0., current_rect.height().abs() + current_rect.width().abs() > 0.,