diff --git a/.gitignore b/.gitignore index 2259a0a..f15685a 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,5 @@ AppRun .DirIcon # Windows build files -*.exe \ No newline at end of file +platforms/windows +*.exe diff --git a/assets/martian.tweak.toml b/assets/martian.tweak.toml index f549330..2eed4ac 100644 --- a/assets/martian.tweak.toml +++ b/assets/martian.tweak.toml @@ -228,7 +228,8 @@ valid_move = "Valid Move Static" [title] image = "images/title.png" -fade_in_seconds = 6.0 +fade_in_seconds = 3.0 +fade_out_seconds = 6.0 width_px = 400.0 [display3d.models.animations] diff --git a/platforms/windows/.gitkeep b/platforms/windows/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/scripts/package-windows.ps1 b/scripts/package-windows.ps1 index 44e1fd4..6967e49 100644 --- a/scripts/package-windows.ps1 +++ b/scripts/package-windows.ps1 @@ -1,6 +1,6 @@ Copy-Item -Force "./target/x86_64-pc-windows-msvc/release/martian-chess.exe" "./platforms/windows/MartianChess.exe" Copy-Item -Force "./lib/windows/*" "./platforms/windows/" -Copy-Item -Force -Recursive "./assets" "./platforms/windows" +Copy-Item -Force -Recurse "./assets" "./platforms/windows" $compress = @{ Path = "./platforms/windows/*" diff --git a/src/display3d.rs b/src/display3d.rs index 7874053..81afca1 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(can_continue_title) + .run_if(not(any_with_component::)) .run_if(just_pressed(KeyCode::Enter).or_else(just_pressed(MouseButton::Left))), ), ); @@ -1231,22 +1231,6 @@ 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) }