From 02bb2d797cc83b0f84db525b380e41f715467c15 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Sun, 5 Jan 2025 03:45:58 -0800 Subject: [PATCH] functions not needed --- lib/common/src/controls_bitflag.rs | 11 +++-------- lib/common/src/gameplay_style.rs | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/lib/common/src/controls_bitflag.rs b/lib/common/src/controls_bitflag.rs index f7e7def..a1eaf31 100644 --- a/lib/common/src/controls_bitflag.rs +++ b/lib/common/src/controls_bitflag.rs @@ -18,13 +18,8 @@ bitflags::bitflags!{ const Use=1<<14;//Interact with object const PrimaryAction=1<<15;//LBM/Shoot/Melee const SecondaryAction=1<<16;//RMB/ADS/Block + + const WASD=Self::MoveForward.union(Self::MoveLeft).union(Self::MoveBackward).union(Self::MoveRight).bits(); + const WASDQE=Self::MoveForward.union(Self::MoveLeft).union(Self::MoveBackward).union(Self::MoveRight).union(Self::MoveUp).union(Self::MoveDown).bits(); } } -impl Controls{ - pub const fn wasd()->Self{ - Self::MoveForward.union(Self::MoveLeft).union(Self::MoveBackward).union(Self::MoveRight) - } - pub const fn wasdqe()->Self{ - Self::MoveForward.union(Self::MoveLeft).union(Self::MoveBackward).union(Self::MoveRight).union(Self::MoveUp).union(Self::MoveDown) - } -} \ No newline at end of file diff --git a/lib/common/src/gameplay_style.rs b/lib/common/src/gameplay_style.rs index d56fa50..ec49ce1 100644 --- a/lib/common/src/gameplay_style.rs +++ b/lib/common/src/gameplay_style.rs @@ -199,8 +199,8 @@ impl ControlsActivation{ } pub const fn full_3d()->Self{ Self{ - controls_mask:Controls::wasdqe(), - controls_intersects:Controls::wasdqe(), + controls_mask:Controls::WASDQE, + controls_intersects:Controls::WASDQE, controls_contains:Controls::empty(), } } @@ -208,8 +208,8 @@ impl ControlsActivation{ //Normal pub const fn full_2d()->Self{ Self{ - controls_mask:Controls::wasd(), - controls_intersects:Controls::wasd(), + controls_mask:Controls::WASD, + controls_intersects:Controls::WASD, controls_contains:Controls::empty(), } }