pop
/
monologue-trees
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make systems private, audio stop all button

Browse Source
main
Elijah Voigt 2 years ago
parent fab810c007
commit b91561d4fc
13 changed files with 127 additions and 94 deletions
Show Stats Download Patch File Download Diff File

14
src/editor/animation.rs
Unescape Escape View File

@ -8,8 +8,6 @@ impl Plugin for EditorAnimationPlugin {
app.add_event::<ControlAnimation>()
.add_systems(Update, sync_asset_buttons::<AnimationClip>)
.add_systems(Update, sync_remove_asset_buttons::<AnimationClip>)
.add_systems(Update, set_epoch_animations)
.add_systems(Update, load_epoch_animations)
.add_systems(Update, init_animations_ui)
.add_systems(Update, remove_animations_ui)
.add_systems(Update, add_animations_ui)
@ -26,7 +24,7 @@ pub struct AnimationWidget;
#[derive(Debug, Component)]
pub struct AnimationPlayAll;
pub fn init_animations_ui(events: Query<Entity, Added<AnimationWidget>>, mut commands: Commands) {
fn init_animations_ui(events: Query<Entity, Added<AnimationWidget>>, mut commands: Commands) {
events.iter().for_each(|entity| {
commands.entity(entity).with_children(|parent| {
parent.spawn((
@ -52,7 +50,7 @@ pub fn init_animations_ui(events: Query<Entity, Added<AnimationWidget>>, mut com
/// When a new scene is loaded, add any newly compatible animations
/// TODO: Add target entity(s) too
pub fn add_animations_ui(
fn add_animations_ui(
player_spawned: Query<&Name, Added<AnimationPlayer>>,
widget: Query<Entity, With<AnimationWidget>>,
mut commands: Commands,
@ -82,7 +80,7 @@ pub fn add_animations_ui(
}
// When a scene is de-selected, remove any outdated animation options
pub fn remove_animations_ui(
fn remove_animations_ui(
mut removed_players: RemovedComponents<Handle<Scene>>,
current: Query<(Entity, &ui::TargetAsset<AnimationClip>)>,
clips: Res<Assets<AnimationClip>>,
@ -121,7 +119,7 @@ pub enum ControlAnimation {
Pause(Handle<AnimationClip>),
}
pub fn play_animation(
fn play_animation(
mut events: EventReader<ControlAnimation>,
mut targets: Query<(&mut AnimationPlayer, &Name), With<Transform>>,
clips: Res<Assets<AnimationClip>>,
@ -152,7 +150,7 @@ pub fn play_animation(
});
}
pub fn play_all_animations(
fn play_all_animations(
events: Query<
(Entity, &Interaction, Option<&ui::Active>),
(With<AnimationPlayAll>, Changed<Interaction>),
@ -207,7 +205,7 @@ fn ui_control_animations(
});
}
pub fn ui_active_animation(
fn ui_active_animation(
mut events: EventReader<ControlAnimation>,
targets: Query<(Entity, &ui::TargetAsset<AnimationClip>)>,
mut commands: Commands,

6
src/editor/assets.rs
Unescape Escape View File

@ -18,7 +18,7 @@ pub struct AssetRegistry(pub Vec<HandleUntyped>);
#[derive(Debug, Component)]
pub struct ReloadAssets;
pub fn reload_assets(
fn reload_assets(
server: Res<AssetServer>,
mut registry: ResMut<AssetRegistry>,
mut writer: EventWriter<ui::Alert>,
@ -164,7 +164,7 @@ pub fn sync_remove_asset_buttons<T: Asset>(
.find_map(|this_asset_entity| asset_entities.get(this_asset_entity).ok())
.into_iter()
.for_each(|this_handle| {
info!("Syncing removal of {:?}", this_handle);
debug!("Syncing removal of {:?}", this_handle);
buttons
.iter()
.find_map(|(entity, ui::TargetAsset { handle })| {
@ -180,7 +180,7 @@ pub fn sync_remove_asset_buttons<T: Asset>(
#[derive(Debug, Component)]
pub struct ClearAssets;
pub fn clear_assets(
fn clear_assets(
asset_holders: Query<
Entity,
Or<(

77
src/editor/audio.rs
Unescape Escape View File

@ -10,12 +10,14 @@ impl Plugin for EditorAudioPlugin {
fn build(&self, app: &mut App) {
app.register_type::<AudioRoot>()
.add_event::<ControlAudio>()
.add_systems(Update, init_audio_ui)
.add_systems(Update, ui_active::<AudioSource>)
.add_systems(Update, ui_inactive::<AudioSource>)
.add_systems(Update, sync_asset_buttons::<AudioSource>)
.add_systems(Update, sync_remove_asset_buttons::<AudioSource>)
.add_systems(Update, audio_ui)
.add_systems(Update, ui_control_audio)
.add_systems(Update, stop_all_audio)
.add_systems(Update, control_audio);
}
}
@ -27,7 +29,34 @@ pub struct AudioRoot;
#[derive(Debug, Component, Default)]
pub struct AudioWidget;
pub fn audio_ui(
#[derive(Debug, Component)]
struct AudioStopAll;
fn init_audio_ui(events: Query<Entity, Added<AudioWidget>>, mut commands: Commands) {
events.iter().for_each(|entity| {
commands.entity(entity).with_children(|parent| {
parent.spawn((
AudioStopAll,
ButtonBundle {
style: Style {
border: UiRect::all(Val::Px(1.0)),
margin: UiRect::all(Val::Px(1.0)),
padding: UiRect::all(Val::Px(1.0)),
..default()
},
border_color: Color::BLACK.into(),
..default()
},
ui::Title {
text: "Stop All".into(),
..default()
},
));
});
})
}
fn audio_ui(
mut events: EventReader<AssetEvent<AudioSource>>,
mut commands: Commands,
widget: Query<Entity, With<AudioWidget>>,
@ -36,7 +65,7 @@ pub fn audio_ui(
) {
events.iter().for_each(|event| match event {
AssetEvent::Created { handle } => {
info!("Asset created! {:?}", event);
debug!("Audio asset created! {:?}", event);
create_asset_button(
&widget,
&mut commands,
@ -48,7 +77,7 @@ pub fn audio_ui(
);
}
AssetEvent::Removed { handle } => {
info!("Asset removed! {:?}", event);
debug!("Asset removed! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -58,7 +87,7 @@ pub fn audio_ui(
);
}
AssetEvent::Modified { handle } => {
info!("Asset modified! {:?}", event);
debug!("Asset modified! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -85,7 +114,7 @@ pub enum ControlAudio {
Stop(Handle<AudioSource>),
}
pub fn control_audio(
fn control_audio(
mut events: EventReader<ControlAudio>,
root: Query<Entity, With<AudioRoot>>,
mut commands: Commands,
@ -93,7 +122,7 @@ pub fn control_audio(
) {
events.iter().for_each(|event| match event {
ControlAudio::Loop(handle) => {
info!("Looping audio {:?}", handle);
debug!("Looping audio {:?}", handle);
let root = if let Ok(entity) = root.get_single() {
entity
} else {
@ -108,30 +137,24 @@ pub fn control_audio(
..default()
},
});
info!("Done spawning");
debug!("Done spawning {:?}", handle);
});
}
ControlAudio::Stop(handle) => {
info!("Stopping audio {:?}", handle);
sources
.iter()
.find_map(|(entity, source_handle)| {
if source_handle == handle {
Some(entity)
} else {
None
}
})
.iter()
.for_each(|&entity| {
.find_map(|(entity, source_handle)| (source_handle == handle).then_some(entity))
.into_iter()
.for_each(|entity| {
debug!("Stopping audio {:?}", handle);
commands.entity(entity).despawn_recursive();
info!("Done despawning");
debug!("Done despawning {:?}", handle);
});
}
});
}
pub fn ui_control_audio(
fn ui_control_audio(
events: Query<
(
&Interaction,
@ -155,3 +178,19 @@ pub fn ui_control_audio(
None => writer.send(ControlAudio::Loop(handle.clone())),
});
}
fn stop_all_audio(
events: Query<&Interaction, With<AudioStopAll>>,
targets: Query<&ui::TargetAsset<AudioSource>>,
mut writer: EventWriter<ControlAudio>,
) {
events
.into_iter()
.filter(|&interaction| *interaction == Interaction::Pressed)
.into_iter()
.for_each(|_| {
targets.iter().for_each(|ui::TargetAsset { handle }| {
writer.send(ControlAudio::Stop(handle.clone()));
});
});
}

12
src/editor/camera.rs
Unescape Escape View File

@ -19,7 +19,7 @@ pub struct EditorCamera;
#[derive(Debug, Component, Default)]
pub struct CameraWidget;
pub fn cameras_ui(
fn cameras_ui(
mut added: Query<(Entity, &mut Camera, &Name), Added<Camera>>,
mut removed: RemovedComponents<Camera>,
editor_camera: Query<Entity, With<EditorCamera>>,
@ -28,11 +28,11 @@ pub fn cameras_ui(
mut commands: Commands,
) {
removed.iter().for_each(|entity| {
info!("Destroy button for {:?}", entity);
debug!("Destroy button for {:?}", entity);
destroy_entity_button(&current, &mut commands, &ui::TargetEntity { entity });
});
added.iter_mut().for_each(|(entity, mut camera, name)| {
info!("Camera added {:?} {:?}", entity, name);
debug!("Camera added {:?} {:?}", entity, name);
create_entity_button(
&widget,
&mut commands,
@ -44,7 +44,7 @@ pub fn cameras_ui(
}
/// Set the camera active component based on button clicks
pub fn control_active_camera(
fn control_active_camera(
events: Query<(Entity, &Camera), Changed<Camera>>,
buttons: Query<(Entity, &ui::TargetEntity)>,
mut commands: Commands,
@ -67,7 +67,7 @@ pub fn control_active_camera(
});
}
pub fn ui_control_active_camera(
fn ui_control_active_camera(
events: Query<
(&Interaction, &ui::TargetEntity, Option<&ui::Active>),
(With<Button>, Changed<Interaction>),
@ -97,7 +97,7 @@ pub fn ui_control_active_camera(
}
// In the event that an active camera is despawned, fall back to the editor camera
pub fn fallback_camera(
fn fallback_camera(
modified: Query<Entity, (Changed<Camera>, Without<EditorCamera>)>,
mut removed: RemovedComponents<Camera>,
other_cameras: Query<&Camera, Without<EditorCamera>>,

16
src/editor/font.rs
Unescape Escape View File

@ -5,11 +5,11 @@ pub struct EditorFontPlugin;
impl Plugin for EditorFontPlugin {
fn build(&self, app: &mut App) {
app.add_systems(Update, sync_asset_buttons::<Font>)
app.init_resource::<FontInfo>()
.add_systems(Update, sync_asset_buttons::<Font>)
.add_systems(Update, sync_remove_asset_buttons::<Font>)
.add_systems(Update, fonts_ui)
.add_systems(Update, ui_control_font)
.init_resource::<FontInfo>()
.add_systems(Update, sync_font);
}
}
@ -22,7 +22,7 @@ pub struct FontInfo {
pub default: Option<Handle<Font>>,
}
pub fn fonts_ui(
fn fonts_ui(
mut events: EventReader<AssetEvent<Font>>,
mut commands: Commands,
widget: Query<Entity, With<FontWidget>>,
@ -31,7 +31,7 @@ pub fn fonts_ui(
) {
events.iter().for_each(|event| match event {
AssetEvent::Created { handle } => {
info!("Asset created! {:?}", event);
debug!("Font asset created! {:?}", event);
create_asset_button(
&widget,
&mut commands,
@ -43,7 +43,7 @@ pub fn fonts_ui(
);
}
AssetEvent::Removed { handle } => {
info!("Asset removed! {:?}", event);
debug!("Font asset removed! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -53,7 +53,7 @@ pub fn fonts_ui(
);
}
AssetEvent::Modified { handle } => {
info!("Asset modified! {:?}", event);
debug!("Font asset modified! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -74,7 +74,7 @@ pub fn fonts_ui(
});
}
pub fn ui_control_font(
fn ui_control_font(
events: Query<
(&Interaction, &ui::TargetAsset<Font>, Option<&ui::Active>),
(With<Button>, Changed<Interaction>),
@ -95,7 +95,7 @@ pub fn ui_control_font(
});
}
pub fn sync_font(
fn sync_font(
query: Query<(Entity, &ui::TargetAsset<Font>)>,
font: Res<FontInfo>,
mut commands: Commands,

2
src/editor/gltf.rs
Unescape Escape View File

@ -1,2 +0,0 @@

16
src/editor/level.rs
Unescape Escape View File

@ -32,7 +32,7 @@ pub struct LevelWidget;
#[derive(Debug, Component)]
pub struct ExportLevel;
pub fn level_ui(
fn level_ui(
mut events: EventReader<AssetEvent<Level>>,
mut commands: Commands,
widget: Query<Entity, With<LevelWidget>>,
@ -41,7 +41,7 @@ pub fn level_ui(
) {
events.iter().for_each(|event| match event {
AssetEvent::Created { handle } => {
info!("Asset created! {:?}", event);
debug!("Level asset created! {:?}", event);
create_asset_button(
&widget,
&mut commands,
@ -53,7 +53,7 @@ pub fn level_ui(
);
}
AssetEvent::Removed { handle } => {
info!("Asset removed! {:?}", event);
debug!("Level asset removed! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -63,7 +63,7 @@ pub fn level_ui(
);
}
AssetEvent::Modified { handle } => {
info!("Asset modified! {:?}", event);
debug!("Level asset modified! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -84,7 +84,7 @@ pub fn level_ui(
});
}
pub fn load_level(
fn load_level(
events: Query<
&ui::TargetAsset<DynamicScene>,
(Added<ui::Active>, With<ui::TargetAsset<DynamicScene>>),
@ -103,7 +103,7 @@ pub fn load_level(
});
}
pub fn export_level(
fn export_level(
level_root: Query<Entity, With<LevelRoot>>,
audio_root: Query<Entity, With<AudioRoot>>,
children: Query<&Children>,
@ -176,7 +176,7 @@ pub fn export_level(
.detach();
}
pub fn rehydrate_level<W: Component, WO: Component + Default>(
fn rehydrate_level<W: Component, WO: Component + Default>(
events: Query<Entity, (Added<W>, Without<WO>)>,
mut commands: Commands,
) {
@ -188,7 +188,7 @@ pub fn rehydrate_level<W: Component, WO: Component + Default>(
#[derive(Debug, Component)]
pub struct ClearLevel;
pub fn clear_level(
fn clear_level(
events: Query<Entity, (With<ClearLevel>, Added<ui::Active>)>,
actives: Query<
Entity,

6
src/editor/lighting.rs
Unescape Escape View File

@ -11,13 +11,13 @@ impl Plugin for EditorLightingPlugin {
}
}
pub fn spot_light_force_shadows(mut spot_lights: Query<&mut SpotLight, Added<SpotLight>>) {
fn spot_light_force_shadows(mut spot_lights: Query<&mut SpotLight, Added<SpotLight>>) {
spot_lights.iter_mut().for_each(|mut light| {
light.shadows_enabled = true;
})
}
pub fn directional_light_force_shadows(
fn directional_light_force_shadows(
mut directional_lights: Query<&mut DirectionalLight, Added<DirectionalLight>>,
) {
directional_lights.iter_mut().for_each(|mut light| {
@ -25,7 +25,7 @@ pub fn directional_light_force_shadows(
})
}
pub fn point_light_force_shadows(mut point_lights: Query<&mut PointLight, Added<PointLight>>) {
fn point_light_force_shadows(mut point_lights: Query<&mut PointLight, Added<PointLight>>) {
point_lights.iter_mut().for_each(|mut light| {
light.shadows_enabled = true;
})

5
src/editor/mod.rs
Unescape Escape View File

@ -41,14 +41,13 @@ pub fn ui_inactive<T: Asset>(
mut commands: Commands,
) {
events.iter().for_each(|_| {
info!("Handle entity removed");
targets
.iter()
.find_map(|(entity, ui::TargetAsset { handle })| {
.filter_map(|(entity, ui::TargetAsset { handle })| {
(!sources.iter().any(|this_handle| this_handle == handle)).then_some(entity)
})
.into_iter()
.for_each(|entity| {
debug!("handle entity remove Active {:?}", entity);
commands.entity(entity).remove::<ui::Active>();
});
});

19
src/editor/monologue.rs
Unescape Escape View File

@ -71,7 +71,7 @@ impl AssetLoader for MonologueLoader {
}
}
pub fn init_texts_ui(mut commands: Commands) {
fn init_texts_ui(mut commands: Commands) {
commands.spawn((
NodeBundle {
style: Style {
@ -87,7 +87,7 @@ pub fn init_texts_ui(mut commands: Commands) {
));
}
pub fn texts_ui(
fn texts_ui(
mut events: EventReader<AssetEvent<Monologue>>,
mut commands: Commands,
widget: Query<Entity, With<MonologueWidget>>,
@ -96,7 +96,7 @@ pub fn texts_ui(
) {
events.iter().for_each(|event| match event {
AssetEvent::Created { handle } => {
info!("Monologue created! {:?}", event);
debug!("Monologue created! {:?}", event);
create_asset_button(
&widget,
&mut commands,
@ -108,7 +108,7 @@ pub fn texts_ui(
);
}
AssetEvent::Removed { handle } => {
info!("Monologue removed! {:?}", event);
debug!("Monologue removed! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -118,7 +118,7 @@ pub fn texts_ui(
);
}
AssetEvent::Modified { handle } => {
info!("Monologue modified! {:?}", event);
debug!("Monologue modified! {:?}", event);
destroy_asset_button(
&current,
&mut commands,
@ -139,7 +139,7 @@ pub fn texts_ui(
});
}
pub fn control_monologue(
fn control_monologue(
mut events: EventReader<ControlMonologue>,
monologues: Res<Assets<Monologue>>,
container: Query<Entity, With<MonologueContainer>>,
@ -206,7 +206,7 @@ pub fn control_monologue(
});
}
pub fn ui_control_monologue(
fn ui_control_monologue(
events: Query<
(
&Interaction,
@ -232,10 +232,7 @@ pub fn ui_control_monologue(
}
// TODO: Sync Handle<Monologue> and TextStyle components to automagically generate and sync text
pub fn sync_monologue_font(
mut texts: Query<&mut Text, With<Handle<Monologue>>>,
font: Res<FontInfo>,
) {
fn sync_monologue_font(mut texts: Query<&mut Text, With<Handle<Monologue>>>, font: Res<FontInfo>) {
if font.is_changed() || font.is_added() {
texts.iter_mut().for_each(|mut text| {
text.sections

2
src/editor/quit.rs
Unescape Escape View File

@ -14,6 +14,6 @@ impl Plugin for EditorQuitPlugin {
#[derive(Debug, Component, Default)]
pub struct QuitAction;
pub fn quit(mut exit: EventWriter<AppExit>) {
fn quit(mut exit: EventWriter<AppExit>) {
exit.send(AppExit);
}

8
src/editor/scene.rs
Unescape Escape View File

@ -26,7 +26,7 @@ pub enum ControlScene {
#[derive(Debug, Component, Default)]
pub struct SceneWidget;
pub fn add_scenes_ui(
fn add_scenes_ui(
mut events: EventReader<AssetEvent<Gltf>>,
mut commands: Commands,
gltfs: Res<Assets<Gltf>>,
@ -57,7 +57,7 @@ pub fn add_scenes_ui(
});
}
pub fn remove_scenes_ui(
fn remove_scenes_ui(
mut gltf_unselected: RemovedComponents<ui::Active>,
target_assets: Query<&ui::TargetAsset<Gltf>>,
current: Query<(Entity, &ui::TargetAsset<Scene>)>,
@ -81,7 +81,7 @@ pub fn remove_scenes_ui(
});
}
pub fn control_scene(
fn control_scene(
mut events: EventReader<ControlScene>,
root: Query<Entity, With<LevelRoot>>,
scenes: Query<(Entity, &Handle<Scene>)>,
@ -106,7 +106,7 @@ pub fn control_scene(
});
}
pub fn ui_control_scene(
fn ui_control_scene(
events: Query<
(&Interaction, &ui::TargetAsset<Scene>, Option<&ui::Active>),
(With<Button>, Changed<Interaction>),

38
src/editor/timeline.rs
Unescape Escape View File

@ -19,7 +19,9 @@ impl Plugin for EditorTimelinePlugin {
.add_systems(Update, set_epoch_font)
.add_systems(Update, load_epoch_font)
.add_systems(Update, set_epoch_sfx)
.add_systems(Update, load_epoch_sfx);
.add_systems(Update, load_epoch_sfx)
.add_systems(Update, set_epoch_animations)
.add_systems(Update, load_epoch_animations);
}
}
@ -87,7 +89,7 @@ pub struct EpochAnimations {
/// System for adding an epoch to the level's timeline
/// Triggered when a button with the AddEpoch marker is Active
pub fn add_timeline_epoch(
fn add_timeline_epoch(
root: Query<(Entity, &Children), With<TimelineWidget>>,
mut commands: Commands,
) {
@ -119,7 +121,7 @@ pub fn add_timeline_epoch(
}
/// Set the GLTF for the current epoch
pub fn set_epoch_gltf(
fn set_epoch_gltf(
events: Query<&ui::TargetAsset<Gltf>, Added<ui::Active>>,
active_epoch: Query<Entity, (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -138,13 +140,13 @@ pub fn set_epoch_gltf(
});
}
pub fn load_epoch_gltf(events: Query<Option<&EpochGltf>, (Added<ui::Active>, With<EpochId>)>) {
fn load_epoch_gltf(events: Query<Option<&EpochGltf>, (Added<ui::Active>, With<EpochId>)>) {
events.iter().for_each(|epoch_gltf| {
warn!("TODO: Load epoch GLTF!");
})
}
pub fn set_epoch_scene(
fn set_epoch_scene(
events: Query<&ui::TargetAsset<Scene>, Added<ui::Active>>,
active_epoch: Query<Entity, (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -161,13 +163,13 @@ pub fn set_epoch_scene(
});
}
pub fn load_epoch_scene(events: Query<Option<&EpochScene>, (Added<ui::Active>, With<EpochId>)>) {
fn load_epoch_scene(events: Query<Option<&EpochScene>, (Added<ui::Active>, With<EpochId>)>) {
events.iter().for_each(|epoch_scene| {
warn!("TODO: Load epoch Scene!");
})
}
pub fn set_epoch_camera(
fn set_epoch_camera(
events: Query<&ui::TargetEntity, Added<ui::Active>>,
active_epoch: Query<Entity, (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -184,13 +186,13 @@ pub fn set_epoch_camera(
});
}
pub fn load_epoch_camera(events: Query<Option<&EpochCamera>, (Added<ui::Active>, With<EpochId>)>) {
fn load_epoch_camera(events: Query<Option<&EpochCamera>, (Added<ui::Active>, With<EpochId>)>) {
events.iter().for_each(|epoch_camera| {
warn!("TODO: Load epoch Camera");
})
}
pub fn set_epoch_music(
fn set_epoch_music(
events: Query<&ui::TargetAsset<AudioSource>, Added<ui::Active>>,
active_epoch: Query<Entity, (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -207,13 +209,13 @@ pub fn set_epoch_music(
});
}
pub fn load_epoch_music(events: Query<Option<&EpochMusic>, (Added<ui::Active>, With<EpochId>)>) {
fn load_epoch_music(events: Query<Option<&EpochMusic>, (Added<ui::Active>, With<EpochId>)>) {
events.iter().for_each(|epoch_music| {
warn!("TODO: Load epoch music!");
})
}
pub fn set_epoch_monologue(
fn set_epoch_monologue(
events: Query<&ui::TargetAsset<Monologue>, Added<ui::Active>>,
active_epoch: Query<Entity, (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -230,7 +232,7 @@ pub fn set_epoch_monologue(
});
}
pub fn load_epoch_monologue(
fn load_epoch_monologue(
events: Query<Option<&EpochMonologue>, (Added<ui::Active>, With<EpochId>)>,
) {
events.iter().for_each(|epoch_monologue| {
@ -243,7 +245,7 @@ pub fn load_epoch_monologue(
});
}
pub fn set_epoch_font(
fn set_epoch_font(
events: Query<&ui::TargetAsset<Font>, Added<ui::Active>>,
active_epoch: Query<Entity, (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -260,7 +262,7 @@ pub fn set_epoch_font(
});
}
pub fn load_epoch_font(
fn load_epoch_font(
events: Query<Option<&EpochFont>, (Added<ui::Active>, With<EpochId>)>,
mut font_info: ResMut<FontInfo>,
) {
@ -269,7 +271,7 @@ pub fn load_epoch_font(
});
}
pub fn set_epoch_sfx(
fn set_epoch_sfx(
events: Query<&ui::TargetAsset<AudioSource>, Added<ui::Active>>,
mut active_epoch: Query<(Entity, Option<&mut EpochSfx>), (With<ui::Active>, With<EpochId>)>,
mut commands: Commands,
@ -291,7 +293,7 @@ pub fn set_epoch_sfx(
});
}
pub fn load_epoch_sfx(
fn load_epoch_sfx(
added: Query<Entity, (Added<ui::Active>, With<EpochId>)>,
mut removed: RemovedComponents<ui::Active>,
epoch_sfx: Query<&EpochSfx>,
@ -313,7 +315,7 @@ pub fn load_epoch_sfx(
});
}
pub fn set_epoch_animations(
fn set_epoch_animations(
events: Query<&ui::TargetAsset<AnimationClip>, Added<ui::Active>>,
mut active_epoch: Query<
(Entity, Option<&mut EpochAnimations>),
@ -339,7 +341,7 @@ pub fn set_epoch_animations(
});
}
pub fn load_epoch_animations(
fn load_epoch_animations(
events: Query<Option<&EpochAnimations>, (Added<ui::Active>, With<EpochId>)>,
) {
events.iter().for_each(|epoch_animations| {

Write Preview
Loading…
Cancel
Save