From 035ce77a356ec1531a6a6dd3ce2d2bcb1cf1824a Mon Sep 17 00:00:00 2001 From: nativerv Date: Fri, 16 Feb 2024 04:31:39 +0300 Subject: [PATCH] style: run `cargo fmt` --- crate/bevy_controls/example/basic/src/main.rs | 287 +++++++++--------- crate/bevy_controls_derive/src/lib.rs | 6 +- 2 files changed, 143 insertions(+), 150 deletions(-) diff --git a/crate/bevy_controls/example/basic/src/main.rs b/crate/bevy_controls/example/basic/src/main.rs index 4336bb3..7590cdf 100644 --- a/crate/bevy_controls/example/basic/src/main.rs +++ b/crate/bevy_controls/example/basic/src/main.rs @@ -4,32 +4,29 @@ //! //! Yeah I know, now it's a bit ugly -use bevy::{ - ecs::schedule::States, - prelude::*, -}; +use bevy::{ecs::schedule::States, prelude::*}; use bevy_controls::{ - contract::{ - Action, ActionInner, GameState, GameStateInner, InputsContainer, InputsContainerInner, - }, - plugin::ControlsPlugin, - resource::{Binding, ButtonCombination, Controls, InputType, InputValue, PlayerInputs}, + contract::{ + Action, ActionInner, GameState, GameStateInner, InputsContainer, InputsContainerInner, + }, + plugin::ControlsPlugin, + resource::{Binding, ButtonCombination, Controls, InputType, InputValue, PlayerInputs}, }; use strum_macros::EnumIter; #[derive(PartialEq, Eq, Hash, EnumIter, Clone, Copy, Debug, bevy_controls_derive::Action)] enum MyAction { - Forward, - Back, - Left, - Right, - Up, + Forward, + Back, + Left, + Right, + Up, } #[derive(States, PartialEq, Eq, Clone, Hash, Debug, Default)] enum MyGameState { - #[default] - InGame, + #[default] + InGame, } impl GameState for MyGameState {} @@ -38,83 +35,85 @@ impl GameStateInner for MyGameState {} #[derive(Resource, Default, Clone, Debug)] struct MyInputsContainer { - // When the game does not provide multiplayer, one field is enough - player_inputs: PlayerInputs, + // When the game does not provide multiplayer, one field is enough + player_inputs: PlayerInputs, } impl InputsContainer for MyInputsContainer {} impl InputsContainerInner for MyInputsContainer { - fn iter_inputs<'a>(&'a self) -> Box> + 'a> { - todo!() - } + fn iter_inputs<'a>(&'a self) -> Box> + 'a> { + todo!() + } - fn me<'a>(&'a self) -> Option<&'a PlayerInputs> { - Some(& self.player_inputs) - } + fn me<'a>(&'a self) -> Option<&'a PlayerInputs> { + Some(&self.player_inputs) + } - fn me_mut<'a>(&'a mut self) -> Option<&'a mut PlayerInputs> { - Some(&mut self.player_inputs) - } + fn me_mut<'a>(&'a mut self) -> Option<&'a mut PlayerInputs> { + Some(&mut self.player_inputs) + } } #[derive(Resource, Default, Deref, DerefMut)] struct JumpsCount(i32); fn main() { - App::new() - .add_plugins(( - DefaultPlugins, - ControlsPlugin::::default(), - )) - .init_resource::() - .add_systems(Startup, (add_bindings, setup)) - .add_systems(Update, text_update_system) - .run(); + App::new() + .add_plugins(( + DefaultPlugins, + ControlsPlugin::::default(), + )) + .init_resource::() + .add_systems(Startup, (add_bindings, setup)) + .add_systems(Update, text_update_system) + .run(); } // TODO: default bingings... fn add_bindings(mut controls: ResMut>) { - controls.force_push( - MyAction::Left, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::A))), - ); - controls.force_push( - MyAction::Left, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::H))), - ); + controls.force_push( + MyAction::Left, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::A))), + ); + controls.force_push( + MyAction::Left, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::H))), + ); - controls.force_push( - MyAction::Back, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::S))), - ); - controls.force_push( - MyAction::Back, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::J))), - ); + controls.force_push( + MyAction::Back, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::S))), + ); + controls.force_push( + MyAction::Back, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::J))), + ); - controls.force_push( - MyAction::Forward, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::W))), - ); - controls.force_push( - MyAction::Forward, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::K))), - ); + controls.force_push( + MyAction::Forward, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::W))), + ); + controls.force_push( + MyAction::Forward, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::K))), + ); - controls.force_push( - MyAction::Right, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::D))), - ); - controls.force_push( - MyAction::Right, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::L))), - ); + controls.force_push( + MyAction::Right, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::D))), + ); + controls.force_push( + MyAction::Right, + Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::L))), + ); - controls.force_push( - MyAction::Up, - Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::Space))), - ); + controls.force_push( + MyAction::Up, + Binding::new(ButtonCombination::Single(InputType::Keyboard( + KeyCode::Space, + ))), + ); } #[derive(Component)] @@ -123,55 +122,55 @@ struct TextBlock; const TEXT_SIZE: f32 = 30.; fn setup(mut commands: Commands) { - commands.spawn(Camera2dBundle::default()); + commands.spawn(Camera2dBundle::default()); - commands.spawn(( - TextBundle::from_sections([ - TextSection::new( - "\nAction: ", - TextStyle { - font_size: TEXT_SIZE, - ..default() - }, - ), - TextSection::new( - "Left (H/A) ", - TextStyle { - font_size: TEXT_SIZE, - ..default() - }, - ), - TextSection::new( - "Back (J/S) ", - TextStyle { - font_size: TEXT_SIZE, - ..default() - }, - ), - TextSection::new( - "Forward (K/W) ", - TextStyle { - font_size: TEXT_SIZE, - ..default() - }, - ), - TextSection::new( - "Right (L/D) ", - TextStyle { - font_size: TEXT_SIZE, - ..default() - }, - ), - TextSection::new( - "Up (Space)", - TextStyle { - font_size: TEXT_SIZE, - ..default() - }, - ), - ]), - TextBlock, - )); + commands.spawn(( + TextBundle::from_sections([ + TextSection::new( + "\nAction: ", + TextStyle { + font_size: TEXT_SIZE, + ..default() + }, + ), + TextSection::new( + "Left (H/A) ", + TextStyle { + font_size: TEXT_SIZE, + ..default() + }, + ), + TextSection::new( + "Back (J/S) ", + TextStyle { + font_size: TEXT_SIZE, + ..default() + }, + ), + TextSection::new( + "Forward (K/W) ", + TextStyle { + font_size: TEXT_SIZE, + ..default() + }, + ), + TextSection::new( + "Right (L/D) ", + TextStyle { + font_size: TEXT_SIZE, + ..default() + }, + ), + TextSection::new( + "Up (Space)", + TextStyle { + font_size: TEXT_SIZE, + ..default() + }, + ), + ]), + TextBlock, + )); } // text sections indexes @@ -182,37 +181,31 @@ const MOVE_RIGHT_INDEX: usize = 4; const JUMP_INDEX: usize = 5; fn text_update_system( - mut query: Query<&mut Text, With>, - inputs_container: Res, - mut jumps_count: ResMut, + mut query: Query<&mut Text, With>, + inputs_container: Res, + mut jumps_count: ResMut, ) { - for text in query.iter_mut() { - - let player_inputs = inputs_container.me().expect("This is bad"); - let mut text = update_text( - text, - player_inputs.get(MyAction::Left), - MOVE_LEFT_INDEX); - text = update_text( - text, - player_inputs.get(MyAction::Back), - MOVE_BACK_INDEX); - text = update_text( - text, - player_inputs.get(MyAction::Forward), - MOVE_FORWARD_INDEX); - text = update_text( - text, - player_inputs.get(MyAction::Right), - MOVE_RIGHT_INDEX); - if player_inputs.get_just_pressed(MyAction::Up).unwrap_or(false) { - **jumps_count += 1; - text.sections[JUMP_INDEX].value = format!("Up (Space) - {}", **jumps_count); - } + for text in query.iter_mut() { + let player_inputs = inputs_container.me().expect("This is bad"); + let mut text = update_text(text, player_inputs.get(MyAction::Left), MOVE_LEFT_INDEX); + text = update_text(text, player_inputs.get(MyAction::Back), MOVE_BACK_INDEX); + text = update_text( + text, + player_inputs.get(MyAction::Forward), + MOVE_FORWARD_INDEX, + ); + text = update_text(text, player_inputs.get(MyAction::Right), MOVE_RIGHT_INDEX); + if player_inputs + .get_just_pressed(MyAction::Up) + .unwrap_or(false) + { + **jumps_count += 1; + text.sections[JUMP_INDEX].value = format!("Up (Space) - {}", **jumps_count); } + } } -fn update_text(mut text: Mut, input_value: InputValue, index: usize) -> Mut{ +fn update_text(mut text: Mut, input_value: InputValue, index: usize) -> Mut { if input_value.is_boolean() && input_value.to_boolean() { text.sections[index].style.color = Color::GOLD; } else { diff --git a/crate/bevy_controls_derive/src/lib.rs b/crate/bevy_controls_derive/src/lib.rs index 74b3f22..51b7d8e 100644 --- a/crate/bevy_controls_derive/src/lib.rs +++ b/crate/bevy_controls_derive/src/lib.rs @@ -1,9 +1,9 @@ extern crate proc_macro; -use proc_macro::TokenStream; -use syn; -use quote::quote; use bevy_controls::contract::{Action, ActionInner}; +use proc_macro::TokenStream; +use quote::quote; +use syn; #[proc_macro_derive(Action)] pub fn action(input: TokenStream) -> TokenStream {