feat: update strum version

This commit is contained in:
2024-04-05 13:19:17 +02:00
parent 7e00ce3fda
commit 8aae841930
3 changed files with 31 additions and 11 deletions
+28 -9
View File
@@ -268,8 +268,8 @@ dependencies = [
"bevy", "bevy",
"bevy_controls", "bevy_controls",
"bevy_controls_derive", "bevy_controls_derive",
"strum", "strum 0.26.2",
"strum_macros", "strum_macros 0.26.2",
] ]
[[package]] [[package]]
@@ -365,8 +365,8 @@ dependencies = [
"bevy_input", "bevy_input",
"bevy_utils 0.12.1", "bevy_utils 0.12.1",
"log", "log",
"strum", "strum 0.25.0",
"strum_macros", "strum_macros 0.25.3",
] ]
[[package]] [[package]]
@@ -1348,7 +1348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"libloading 0.7.4", "libloading 0.8.3",
"winapi", "winapi",
] ]
@@ -1370,7 +1370,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [ dependencies = [
"libloading 0.7.4", "libloading 0.8.3",
] ]
[[package]] [[package]]
@@ -1721,7 +1721,7 @@ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"com", "com",
"libc", "libc",
"libloading 0.7.4", "libloading 0.8.3",
"thiserror", "thiserror",
"widestring", "widestring",
"winapi", "winapi",
@@ -1886,7 +1886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-targets 0.48.5", "windows-targets 0.52.4",
] ]
[[package]] [[package]]
@@ -2620,6 +2620,12 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
[[package]]
name = "strum"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.25.3" version = "0.25.3"
@@ -2633,6 +2639,19 @@ dependencies = [
"syn 2.0.48", "syn 2.0.48",
] ]
[[package]]
name = "strum_macros"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.48",
]
[[package]] [[package]]
name = "svg_fmt" name = "svg_fmt"
version = "0.4.1" version = "0.4.1"
@@ -3199,7 +3218,7 @@ dependencies = [
"js-sys", "js-sys",
"khronos-egl", "khronos-egl",
"libc", "libc",
"libloading 0.7.4", "libloading 0.8.3",
"log", "log",
"metal", "metal",
"naga", "naga",
+2 -2
View File
@@ -21,5 +21,5 @@ bevy = { version = "0.13.2", default-features = false, features = [
]} ]}
bevy_controls = { path = "./../../" } bevy_controls = { path = "./../../" }
bevy_controls_derive = { path = "./../../../bevy_controls_derive" } bevy_controls_derive = { path = "./../../../bevy_controls_derive" }
strum = "0.25.0" strum_macros = "0.26.2"
strum_macros = "0.25.3" strum = "0.26.2"
+1
View File
@@ -158,6 +158,7 @@ impl<A: Action, Ic: InputsContainer<A>, Gs: GameState> ControlsPlugin<A, Ic, Gs>
match &binding.input { match &binding.input {
ButtonCombination::Single(input_type) => { ButtonCombination::Single(input_type) => {
// TODO: exclude if used
if collected_inputs.contains_key(&*input_type) { if collected_inputs.contains_key(&*input_type) {
inputs.forced_set(**action, true); inputs.forced_set(**action, true);
} else { } else {