diff --git a/1 b/1 new file mode 100644 index 0000000..e69de29 diff --git a/crate/bevy_controls/example/basic/src/main.rs b/crate/bevy_controls/example/basic/src/main.rs index d2d1abb..d67f536 100644 --- a/crate/bevy_controls/example/basic/src/main.rs +++ b/crate/bevy_controls/example/basic/src/main.rs @@ -5,6 +5,8 @@ //! Yeah I know, that's kind of weird that it displays //! But it does......... +// TODO strum redefine in bevy_controls + use bevy::{ecs::schedule::States, prelude::*}; use bevy_controls::{ contract::InputsContainer, diff --git a/crate/bevy_controls/macros/src/lib.rs b/crate/bevy_controls/macros/src/lib.rs index 5fca016..e4b192d 100644 --- a/crate/bevy_controls/macros/src/lib.rs +++ b/crate/bevy_controls/macros/src/lib.rs @@ -2,14 +2,12 @@ extern crate proc_macro; use proc_macro::TokenStream; use std::collections::HashMap; -//use quote::quote; use quote::quote; use syn::{ parse::{Parse, ParseStream, Result}, parse_macro_input, punctuated::Punctuated, - token::{Add, Bracket}, - Expr, Ident, ItemTrait, LitStr, Token, TypeParamBound, + ItemTrait, LitStr, Token, TypeParamBound, }; // #[cfg_feature_trait_bounds { @@ -62,8 +60,8 @@ impl Parse for FeatureTraitBoundMap { #[proc_macro_attribute] pub fn cfg_feature_trait_bounds(attr: TokenStream, input: TokenStream) -> TokenStream { - let rules = parse_macro_input!(attr as FeatureTraitBoundMap); - let input = parse_macro_input!(input as ItemTrait); + let _rules = parse_macro_input!(attr as FeatureTraitBoundMap); + let _input = parse_macro_input!(input as ItemTrait); dbg!(std::env::vars().map(|(key, _)| key).collect::>()); diff --git a/crate/bevy_controls/src/lib.rs b/crate/bevy_controls/src/lib.rs index cbd2b56..894dbf3 100644 --- a/crate/bevy_controls/src/lib.rs +++ b/crate/bevy_controls/src/lib.rs @@ -2,5 +2,3 @@ pub mod contract; pub mod plugin; pub mod resource; mod util; - -pub use util::*; diff --git a/crate/bevy_controls/src/plugin.rs b/crate/bevy_controls/src/plugin.rs index d98f891..ea7761e 100644 --- a/crate/bevy_controls/src/plugin.rs +++ b/crate/bevy_controls/src/plugin.rs @@ -1,6 +1,5 @@ use bevy_app::{App, Plugin, PreUpdate}; use bevy_derive::{Deref, DerefMut}; -use bevy_ecs::schedule::IntoSystemConfigs; use bevy_ecs::system::{In, IntoSystem}; use bevy_ecs::{ event::EventReader, @@ -141,7 +140,7 @@ impl, Gs: GameState> ControlsPlugin action_binding_pairs.sort_by(|a, b| b.2.input.len().cmp(&a.2.input.len())); - 'bindings_loop: for (action, config, binding) in action_binding_pairs.iter() { + 'bindings_loop: for (action, _config, binding) in action_binding_pairs.iter() { // check binding conditions for condition in &binding.conditions { match condition { diff --git a/crate/bevy_controls/src/resource.rs b/crate/bevy_controls/src/resource.rs index 8cd1c7d..3327f11 100644 --- a/crate/bevy_controls/src/resource.rs +++ b/crate/bevy_controls/src/resource.rs @@ -123,7 +123,7 @@ impl PlayerActions { self.current.get(&action).unwrap().to_boolean() && !self.previous.get(&action).unwrap().to_boolean(), ); - Err("This input is not boolean".into()) + //Err("This input is not boolean".into()) } /// Set input value to new