style: run cargo fmt

This commit is contained in:
nativerv
2024-02-16 04:31:39 +03:00
parent e01abb2686
commit 035ce77a35
2 changed files with 143 additions and 150 deletions
+15 -22
View File
@@ -4,10 +4,7 @@
//! //!
//! Yeah I know, now it's a bit ugly //! Yeah I know, now it's a bit ugly
use bevy::{ use bevy::{ecs::schedule::States, prelude::*};
ecs::schedule::States,
prelude::*,
};
use bevy_controls::{ use bevy_controls::{
contract::{ contract::{
Action, ActionInner, GameState, GameStateInner, InputsContainer, InputsContainerInner, Action, ActionInner, GameState, GameStateInner, InputsContainer, InputsContainerInner,
@@ -50,7 +47,7 @@ impl InputsContainerInner<MyAction> for MyInputsContainer {
} }
fn me<'a>(&'a self) -> Option<&'a PlayerInputs<MyAction>> { fn me<'a>(&'a self) -> Option<&'a PlayerInputs<MyAction>> {
Some(& self.player_inputs) Some(&self.player_inputs)
} }
fn me_mut<'a>(&'a mut self) -> Option<&'a mut PlayerInputs<MyAction>> { fn me_mut<'a>(&'a mut self) -> Option<&'a mut PlayerInputs<MyAction>> {
@@ -113,7 +110,9 @@ fn add_bindings(mut controls: ResMut<Controls<MyAction, MyGameState>>) {
controls.force_push( controls.force_push(
MyAction::Up, MyAction::Up,
Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::Space))), Binding::new(ButtonCombination::Single(InputType::Keyboard(
KeyCode::Space,
))),
); );
} }
@@ -187,32 +186,26 @@ fn text_update_system(
mut jumps_count: ResMut<JumpsCount>, mut jumps_count: ResMut<JumpsCount>,
) { ) {
for text in query.iter_mut() { for text in query.iter_mut() {
let player_inputs = inputs_container.me().expect("This is bad"); let player_inputs = inputs_container.me().expect("This is bad");
let mut text = update_text( let mut text = update_text(text, player_inputs.get(MyAction::Left), MOVE_LEFT_INDEX);
text, text = update_text(text, player_inputs.get(MyAction::Back), MOVE_BACK_INDEX);
player_inputs.get(MyAction::Left),
MOVE_LEFT_INDEX);
text = update_text(
text,
player_inputs.get(MyAction::Back),
MOVE_BACK_INDEX);
text = update_text( text = update_text(
text, text,
player_inputs.get(MyAction::Forward), player_inputs.get(MyAction::Forward),
MOVE_FORWARD_INDEX); MOVE_FORWARD_INDEX,
text = update_text( );
text, text = update_text(text, player_inputs.get(MyAction::Right), MOVE_RIGHT_INDEX);
player_inputs.get(MyAction::Right), if player_inputs
MOVE_RIGHT_INDEX); .get_just_pressed(MyAction::Up)
if player_inputs.get_just_pressed(MyAction::Up).unwrap_or(false) { .unwrap_or(false)
{
**jumps_count += 1; **jumps_count += 1;
text.sections[JUMP_INDEX].value = format!("Up (Space) - {}", **jumps_count); text.sections[JUMP_INDEX].value = format!("Up (Space) - {}", **jumps_count);
} }
} }
} }
fn update_text(mut text: Mut<Text>, input_value: InputValue, index: usize) -> Mut<Text>{ fn update_text(mut text: Mut<Text>, input_value: InputValue, index: usize) -> Mut<Text> {
if input_value.is_boolean() && input_value.to_boolean() { if input_value.is_boolean() && input_value.to_boolean() {
text.sections[index].style.color = Color::GOLD; text.sections[index].style.color = Color::GOLD;
} else { } else {
+3 -3
View File
@@ -1,9 +1,9 @@
extern crate proc_macro; extern crate proc_macro;
use proc_macro::TokenStream;
use syn;
use quote::quote;
use bevy_controls::contract::{Action, ActionInner}; use bevy_controls::contract::{Action, ActionInner};
use proc_macro::TokenStream;
use quote::quote;
use syn;
#[proc_macro_derive(Action)] #[proc_macro_derive(Action)]
pub fn action(input: TokenStream) -> TokenStream { pub fn action(input: TokenStream) -> TokenStream {