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

Remove Changed from parent update system (#907)

Browse Source 
System has to check for actual change of the value anyway. This way,
children inserted after postupdate get synced in the next frame and are
not lost.
This commit is contained in:
SvenTS 2020-11-26 02:33:59 +01:00 committed by GitHub
parent fd6b787efc
commit de5ff0aa5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/bevy_transform/src/hierarchy/hierarchy_maintenance_system.rs
View File

@ -1,15 +1,14 @@
use crate::components::*; use crate::components::*;
use bevy_ecs::{Changed, Commands, Entity, Query, Without}; use bevy_ecs::{Commands, Entity, Query, Without};
use bevy_utils::HashMap; use bevy_utils::HashMap;
use smallvec::SmallVec; use smallvec::SmallVec;
pub fn parent_update_system( pub fn parent_update_system(
commands: &mut Commands, commands: &mut Commands,
removed_parent_query: Query<(Entity, &PreviousParent), Without<Parent>>, removed_parent_query: Query<(Entity, &PreviousParent), Without<Parent>>,
mut changed_parent_query: Query< // The next query could be run with a Changed<Parent> filter. However, this would mean that modifications later in the frame are lost.
(Entity, &Parent, Option<&mut PreviousParent>), // See issue 891: https://github.com/bevyengine/bevy/issues/891
Changed<Parent>, mut parent_query: Query<(Entity, &Parent, Option<&mut PreviousParent>)>,
>,
mut children_query: Query<&mut Children>, mut children_query: Query<&mut Children>,
) { ) {
// Entities with a missing `Parent` (ie. ones that have a `PreviousParent`), remove // Entities with a missing `Parent` (ie. ones that have a `PreviousParent`), remove
@ -25,7 +24,7 @@ pub fn parent_update_system(
let mut children_additions = HashMap::<Entity, SmallVec<[Entity; 8]>>::default(); let mut children_additions = HashMap::<Entity, SmallVec<[Entity; 8]>>::default();
// Entities with a changed Parent (that also have a PreviousParent, even if None) // Entities with a changed Parent (that also have a PreviousParent, even if None)
for (entity, parent, possible_previous_parent) in changed_parent_query.iter_mut() { for (entity, parent, possible_previous_parent) in parent_query.iter_mut() {
if let Some(mut previous_parent) = possible_previous_parent { if let Some(mut previous_parent) = possible_previous_parent {
// New and previous point to the same Entity, carry on, nothing to see here. // New and previous point to the same Entity, carry on, nothing to see here.
if previous_parent.0 == parent.0 { if previous_parent.0 == parent.0 {