storytold/storyteller-bevy
2
0
Fork 0
mirror of https://github.com/storytold/storyteller-bevy.git synced 2026-10-20 07:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

add test-2.scn.ron

Browse Source
This commit is contained in:
Lee-Orr
2024-03-21 16:01:39 -04:00
parent 10759af963
commit 0c5ae04664
2 changed files with 150 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
studio/assets/scenes/test-2.scn.ron
+143
View File
File diff suppressed because one or more lines are too long
studio/src/anim/timeline_animation.rs
+7
View File
@@ -304,6 +304,8 @@ fn generate_transform_animation(
(&Keyframe, &Transform, &TransformKeyframe, Entity), (&Keyframe, &Transform, &TransformKeyframe, Entity),
Without<MarkedForDeletion>, Without<MarkedForDeletion>,
>, >,
added_targets: Query<Entity, Added<AnimationTarget>>,
valid_targets: Query<Entity, With<AnimationTarget>>,
removed: Query<&Keyframe, With<MarkedForDeletion>>, removed: Query<&Keyframe, With<MarkedForDeletion>>,
) { ) {
let changed_targets = changed let changed_targets = changed
@@ -313,6 +315,7 @@ fn generate_transform_animation(
info!("Processing a removed keyframe {keyframe:?}"); info!("Processing a removed keyframe {keyframe:?}");
keyframe.target keyframe.target
})) }))
.chain(added_targets.iter())
.collect::<HashSet<_>>(); .collect::<HashSet<_>>();
let keyframes = keyframes let keyframes = keyframes
.iter() .iter()
@@ -320,6 +323,10 @@ fn generate_transform_animation(
.group_by(|(keyframe, _, _, _)| keyframe.target); .group_by(|(keyframe, _, _, _)| keyframe.target);
for (target, keyframes) in &keyframes { for (target, keyframes) in &keyframes {
if !valid_targets.contains(target) {
info!("No valid target.");
continue;
}
let keyframes = keyframes.sorted_by(|a, b| a.0.time.total_cmp(&b.0.time)); let keyframes = keyframes.sorted_by(|a, b| a.0.time.total_cmp(&b.0.time));
let (_, _, _, translation, rotation, scale) = keyframes.fold( let (_, _, _, translation, rotation, scale) = keyframes.fold(