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

Update GlobalTransform on insertion (#9081)

Browse Source 
# Objective

`GlobalTransform` after insertion will be updated only on `Transform` or
hierarchy change.

Fixes #9075

## Solution

Update `GlobalTransform` after insertion too.

---

## Changelog

- `GlobalTransform` is now updated not only on `Transform` or hierarchy
change, but also on insertion.
This commit is contained in:
Hennadii Chernyshchyk 2023-07-10 11:05:13 +03:00 committed by Carter Anderson
parent 8ba9571eed
commit 25c64ec7cf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/bevy_transform/src/systems.rs
View File

@ -2,6 +2,7 @@ use crate::components::{GlobalTransform, Transform};
use bevy_ecs::{ use bevy_ecs::{
change_detection::Ref, change_detection::Ref,
prelude::{Changed, DetectChanges, Entity, Query, With, Without}, prelude::{Changed, DetectChanges, Entity, Query, With, Without},
query::{Added, Or},
removal_detection::RemovedComponents, removal_detection::RemovedComponents,
system::{Local, ParamSet}, system::{Local, ParamSet},
}; };
@ -14,7 +15,11 @@ pub fn sync_simple_transforms(
mut query: ParamSet<( mut query: ParamSet<(
Query< Query<
(&Transform, &mut GlobalTransform), (&Transform, &mut GlobalTransform),
(Changed<Transform>, Without<Parent>, Without<Children>), (
Or<(Changed<Transform>, Added<GlobalTransform>)>,
Without<Parent>,
Without<Children>,
),
>, >,
Query<(Ref<Transform>, &mut GlobalTransform), Without<Children>>, Query<(Ref<Transform>, &mut GlobalTransform), Without<Children>>,
)>, )>,
@ -31,7 +36,7 @@ pub fn sync_simple_transforms(
let mut query = query.p1(); let mut query = query.p1();
let mut iter = query.iter_many_mut(orphaned.iter()); let mut iter = query.iter_many_mut(orphaned.iter());
while let Some((transform, mut global_transform)) = iter.fetch_next() { while let Some((transform, mut global_transform)) = iter.fetch_next() {
if !transform.is_changed() { if !transform.is_changed() && !global_transform.is_added() {
*global_transform = GlobalTransform::from(*transform); *global_transform = GlobalTransform::from(*transform);
} }
} }
@ -56,7 +61,7 @@ pub fn propagate_transforms(
orphaned_entities.sort_unstable(); orphaned_entities.sort_unstable();
root_query.par_iter_mut().for_each_mut( root_query.par_iter_mut().for_each_mut(
|(entity, children, transform, mut global_transform)| { |(entity, children, transform, mut global_transform)| {
let changed = transform.is_changed() || orphaned_entities.binary_search(&entity).is_ok(); let changed = transform.is_changed() || global_transform.is_added() || orphaned_entities.binary_search(&entity).is_ok();
if changed { if changed {
*global_transform = GlobalTransform::from(*transform); *global_transform = GlobalTransform::from(*transform);
} }
@ -143,7 +148,7 @@ unsafe fn propagate_recursive(
return; return;
}; };
changed |= transform.is_changed(); changed |= transform.is_changed() || global_transform.is_added();
if changed { if changed {
*global_transform = parent.mul_transform(*transform); *global_transform = parent.mul_transform(*transform);
} }