diff --git a/src/display3d.rs b/src/display3d.rs index 5156f04..b68b46a 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -92,7 +92,7 @@ impl Plugin for Display3dPlugin { gizmo_system, selected_gizmo, moves_gizmo, - debug_selected.run_if(any_with_component::()) + debug_selected.run_if(any_with_component::()), ) .run_if(resource_exists::()) .run_if(in_state(GameState::Play)) @@ -392,7 +392,13 @@ fn fix_skybox( /// Set the model for each piece based on the game::Piece::* marker fn set_piece_model( - mut events: Query<(&mut Handle, &Piece), (Or<(Added, Changed)>, With)>, + mut events: Query< + (&mut Handle, &Piece), + ( + Or<(Added, Changed)>, + With, + ), + >, gltfs: Res>, tweaks: Res>, tweaks_file: Res, @@ -1526,6 +1532,12 @@ fn debug_selected( mut debug_info: ResMut, ) { query.iter().for_each(|(e, bi, p, s)| { - debug_info.set("Active".into(), format!("\n>>ID: {:?}\n>>Piece: {:?}\n>>Side: {:?}\n>>Index: {:?}", e, p, s, bi)); + debug_info.set( + "Active".into(), + format!( + "\n>>ID: {:?}\n>>Piece: {:?}\n>>Side: {:?}\n>>Index: {:?}", + e, p, s, bi + ), + ); }); -} \ No newline at end of file +} diff --git a/src/game.rs b/src/game.rs index 7d720a2..4c394d2 100644 --- a/src/game.rs +++ b/src/game.rs @@ -30,8 +30,9 @@ impl Plugin for GamePlugin { hide_valid_moves.run_if(any_component_removed::()), manage_score.run_if(any_component_added::), check_endgame.run_if(resource_changed::()), - reset_game - .run_if(|keys: Res>| -> bool { keys.just_pressed(KeyCode::R) }), + reset_game.run_if(|keys: Res>| -> bool { + keys.just_pressed(KeyCode::R) + }), ), ) .add_systems(OnEnter(GameState::Endgame), set_endgame) @@ -663,7 +664,9 @@ fn manage_score( }); } -pub(crate) fn set_side(mut events: Query<(&mut Side, &BoardIndex), Or<(Changed, Added)>>) { +pub(crate) fn set_side( + mut events: Query<(&mut Side, &BoardIndex), Or<(Changed, Added)>>, +) { events .iter_mut() .for_each(|(mut side, idx)| match Board::side(*idx) { @@ -831,7 +834,13 @@ fn reset_game( *score = Score { ..default() }; // Move all pieces to their correct spots - pieces.iter().zip(board.pieces().iter()).for_each(|(e, (i, p))| { - commands.entity(e).insert((i.clone(), p.clone())).remove::(); - }); -} \ No newline at end of file + pieces + .iter() + .zip(board.pieces().iter()) + .for_each(|(e, (i, p))| { + commands + .entity(e) + .insert((i.clone(), p.clone())) + .remove::(); + }); +} diff --git a/src/ui.rs b/src/ui.rs index 27c4898..e52004b 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -66,7 +66,6 @@ fn interactive_button( }); } - fn scale_ui( mut windows: Query<&mut Window, Changed>, mut ui_scale: ResMut, @@ -78,7 +77,7 @@ fn scale_ui( assert_eq!(windows.iter().count(), 1); if !tweaks.contains(tweakfile.handle.clone()) { - return + return; } let tweak = tweaks.get(tweakfile.handle.clone()).unwrap(); let width = tweak.get::("resolution_x").unwrap(); @@ -93,10 +92,10 @@ fn scale_ui( // Setting UI Scale based on ratio of expected to current ratio let width_ratio = w.resolution.width() / width; - let height_ratio = w.resolution.height() / height; + let height_ratio = w.resolution.height() / height; let new_scale = (width_ratio).min(height_ratio) as f64; if ui_scale.0 != new_scale { ui_scale.0 = new_scale; } }); -} \ No newline at end of file +}