Slightly fix fade in making it shorter

main
Elijah C. Voigt 1 year ago
parent 92fdacc676
commit 96e173fbc2

1
.gitignore vendored

@ -45,4 +45,5 @@ AppRun
.DirIcon .DirIcon
# Windows build files # Windows build files
platforms/windows
*.exe *.exe

@ -228,7 +228,8 @@ valid_move = "Valid Move Static"
[title] [title]
image = "images/title.png" image = "images/title.png"
fade_in_seconds = 6.0 fade_in_seconds = 3.0
fade_out_seconds = 6.0
width_px = 400.0 width_px = 400.0
[display3d.models.animations] [display3d.models.animations]

@ -1,6 +1,6 @@
Copy-Item -Force "./target/x86_64-pc-windows-msvc/release/martian-chess.exe" "./platforms/windows/MartianChess.exe" 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 "./lib/windows/*" "./platforms/windows/"
Copy-Item -Force -Recursive "./assets" "./platforms/windows" Copy-Item -Force -Recurse "./assets" "./platforms/windows"
$compress = @{ $compress = @{
Path = "./platforms/windows/*" Path = "./platforms/windows/*"

@ -173,7 +173,7 @@ impl Plugin for Display3dPlugin {
fade_title.run_if(any_with_component::<Fading>), fade_title.run_if(any_with_component::<Fading>),
continue_title continue_title
.run_if(in_state(GameState::Title)) .run_if(in_state(GameState::Title))
.run_if(can_continue_title) .run_if(not(any_with_component::<Fading>))
.run_if(just_pressed(KeyCode::Enter).or_else(just_pressed(MouseButton::Left))), .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<NextState<GameState>>) { fn continue_title(mut next_state: ResMut<NextState<GameState>>) {
next_state.set(GameState::Play) next_state.set(GameState::Play)
} }

Loading…
Cancel
Save