diff --git a/.gitignore b/.gitignore index 2ce3986..2259a0a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,6 @@ AppRun *.zip *.tar.gz .DirIcon + +# Windows build files +*.exe \ No newline at end of file diff --git a/src/display3d.rs b/src/display3d.rs index 81afca1..7874053 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -173,7 +173,7 @@ impl Plugin for Display3dPlugin { fade_title.run_if(any_with_component::), continue_title .run_if(in_state(GameState::Title)) - .run_if(not(any_with_component::)) + .run_if(can_continue_title) .run_if(just_pressed(KeyCode::Enter).or_else(just_pressed(MouseButton::Left))), ), ); @@ -1231,6 +1231,22 @@ fn monitor_animations( }); } +fn can_continue_title( + query: Query<&Fading>, +) -> bool { + if query.is_empty() { + true + } else { + query.iter().all(|fading| { + match fading { + Fading::In(s) | Fading::Out(s) => { + *s >= 1.0 + } + } + }) + } +} + fn continue_title(mut next_state: ResMut>) { next_state.set(GameState::Play) }