From 58573dbc1c79db71357004b122d4c4de979a8563 Mon Sep 17 00:00:00 2001 From: yukkop Date: Sat, 6 Apr 2024 01:29:03 +0200 Subject: [PATCH] feat: InputValue::to_float() --- Cargo.lock | 8 +++--- TODO.md | 1 + crate/bevy_controls/example/basic/Cargo.lock | 27 +++----------------- crate/bevy_controls/src/resource.rs | 8 ++++++ 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 256eac3..7ce57bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2867,15 +2867,15 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", diff --git a/TODO.md b/TODO.md index cd77041..7ef50ff 100644 --- a/TODO.md +++ b/TODO.md @@ -1,4 +1,5 @@ # v0.1.0 +- [ ] debug log for trigered actions - [ ] core - [x] single keys - [ ] chords diff --git a/crate/bevy_controls/example/basic/Cargo.lock b/crate/bevy_controls/example/basic/Cargo.lock index dbbb5fc..fdd3894 100644 --- a/crate/bevy_controls/example/basic/Cargo.lock +++ b/crate/bevy_controls/example/basic/Cargo.lock @@ -268,8 +268,8 @@ dependencies = [ "bevy", "bevy_controls", "bevy_controls_derive", - "strum 0.26.2", - "strum_macros 0.26.2", + "strum", + "strum_macros", ] [[package]] @@ -365,8 +365,8 @@ dependencies = [ "bevy_input", "bevy_utils 0.12.1", "log", - "strum 0.25.0", - "strum_macros 0.25.3", + "strum", + "strum_macros", ] [[package]] @@ -2614,31 +2614,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" - [[package]] name = "strum" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.48", -] - [[package]] name = "strum_macros" version = "0.26.2" diff --git a/crate/bevy_controls/src/resource.rs b/crate/bevy_controls/src/resource.rs index 27a4996..73b455a 100644 --- a/crate/bevy_controls/src/resource.rs +++ b/crate/bevy_controls/src/resource.rs @@ -424,6 +424,14 @@ impl InputValue { InputValue::Empty => false, } } + + pub fn to_float(&self) -> f32 { + match self { + InputValue::Boolean(value) => if *value { 1. } else { 0. }, + InputValue::Float(value) => *value, + InputValue::Empty => 0., + } + } } common_traits_conditions! {