Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Merged by Bors] - Hierarchy commandization #4197

Closed
wants to merge 24 commits into from
Closed

[Merged by Bors] - Hierarchy commandization #4197

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
613756a
Make Parent immutable, remove PreviousParent, parent_update_system
james7132 Mar 13, 2022
838de43
Make hierarchy commands "atomic"
james7132 Mar 13, 2022
9b3a8f0
Fix tests
james7132 Mar 13, 2022
d471ba3
Formatting and clippy
james7132 Mar 13, 2022
9a35a57
More complete and correct updates
james7132 Mar 13, 2022
2e9a9a4
Hierarchy events
james7132 Mar 13, 2022
42d0ad3
Document new events
james7132 Mar 13, 2022
70a96fc
Remove return type
james7132 Mar 13, 2022
4d7dea3
Panic if invariant broken
james7132 Mar 13, 2022
88958a1
fix up CI
james7132 Mar 14, 2022
51368c1
fix formatting
james7132 Mar 14, 2022
01b0d48
Fix UI tests
james7132 Mar 14, 2022
c07b2ee
Remove copying/constructing traits from Parent/Children
james7132 Mar 14, 2022
e58b087
Scenes are Worlds too
james7132 Mar 14, 2022
82febea
fix rebase errors
james7132 Mar 15, 2022
f05a2ca
Merge branch 'main' into hierarchy-commandization
james7132 May 24, 2022
b914610
Update to reflect changes to the RFC
james7132 May 24, 2022
d8b3d14
Merge branch 'main' into hierarchy-commandization
james7132 May 30, 2022
192789d
Fix CI
james7132 May 30, 2022
3c855ba
Merge branch 'main' into hierarchy-commandization
james7132 Jun 23, 2022
cfeb242
Review comments and some code cleanup
james7132 Jun 23, 2022
e15702b
Formatting
james7132 Jun 23, 2022
cc5244a
Some code cleanup
james7132 Jun 23, 2022
456c0ea
Add back malformed hierarchy test
james7132 Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions crates/bevy_animation/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use bevy_ecs::{
schedule::ParallelSystemDescriptorCoercion,
system::{Query, Res},
};
use bevy_hierarchy::{Children, HierarchySystem};
use bevy_hierarchy::Children;
use bevy_math::{Quat, Vec3};
use bevy_reflect::{Reflect, TypeUuid};
use bevy_time::Time;
Expand Down Expand Up @@ -295,9 +295,7 @@ impl Plugin for AnimationPlugin {
.register_type::<AnimationPlayer>()
.add_system_to_stage(
CoreStage::PostUpdate,
animation_player
.before(TransformSystem::TransformPropagate)
.after(HierarchySystem::ParentUpdate),
animation_player.before(TransformSystem::TransformPropagate),
);
}
}
Loading