Clientside Backpack UI (#84)
This commit is contained in:
@@ -8,9 +8,8 @@ use bevy::{
|
||||
};
|
||||
use shared::{
|
||||
control::{
|
||||
BackpackLeftPressed, BackpackRightPressed, BackpackSwapPressed, BackpackTogglePressed,
|
||||
CashHealPressed, ClientInputs, ControllerSet, Inputs, LocalInputs, LookDirMovement,
|
||||
SelectLeftPressed, SelectRightPressed,
|
||||
BackpackButtonPress, CashHealPressed, ClientInputs, ControllerSet, Inputs, LocalInputs,
|
||||
LookDirMovement, SelectLeftPressed, SelectRightPressed,
|
||||
},
|
||||
player::{LocalPlayer, PlayerBodyMesh},
|
||||
};
|
||||
@@ -98,10 +97,7 @@ fn gamepad_controls(
|
||||
gamepads: Query<&Gamepad>,
|
||||
mut inputs: Single<&mut LocalInputs>,
|
||||
mut look_dir: ResMut<LookDirMovement>,
|
||||
mut backpack_toggle_pressed: MessageWriter<BackpackTogglePressed>,
|
||||
mut backpack_swap_pressed: MessageWriter<BackpackSwapPressed>,
|
||||
mut backpack_left_pressed: MessageWriter<BackpackLeftPressed>,
|
||||
mut backpack_right_pressed: MessageWriter<BackpackRightPressed>,
|
||||
mut backpack_inputs: MessageWriter<BackpackButtonPress>,
|
||||
mut select_left_pressed: MessageWriter<SelectLeftPressed>,
|
||||
mut select_right_pressed: MessageWriter<SelectRightPressed>,
|
||||
mut cash_heal_pressed: MessageWriter<CashHealPressed>,
|
||||
@@ -139,19 +135,19 @@ fn gamepad_controls(
|
||||
inputs.0.trigger |= gamepad.pressed(GamepadButton::RightTrigger2);
|
||||
|
||||
if gamepad.just_pressed(GamepadButton::DPadUp) {
|
||||
backpack_toggle_pressed.write(BackpackTogglePressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Toggle);
|
||||
}
|
||||
|
||||
if gamepad.just_pressed(GamepadButton::DPadDown) {
|
||||
backpack_swap_pressed.write(BackpackSwapPressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Swap);
|
||||
}
|
||||
|
||||
if gamepad.just_pressed(GamepadButton::DPadLeft) {
|
||||
backpack_left_pressed.write(BackpackLeftPressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Left);
|
||||
}
|
||||
|
||||
if gamepad.just_pressed(GamepadButton::DPadRight) {
|
||||
backpack_right_pressed.write(BackpackRightPressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Right);
|
||||
}
|
||||
|
||||
if gamepad.just_pressed(GamepadButton::LeftTrigger) {
|
||||
@@ -181,10 +177,7 @@ fn keyboard_controls(
|
||||
keyboard: Res<ButtonInput<KeyCode>>,
|
||||
mouse: Res<ButtonInput<MouseButton>>,
|
||||
mut inputs: Single<&mut LocalInputs>,
|
||||
mut backpack_toggle_pressed: MessageWriter<BackpackTogglePressed>,
|
||||
mut backpack_swap_pressed: MessageWriter<BackpackSwapPressed>,
|
||||
mut backpack_left_pressed: MessageWriter<BackpackLeftPressed>,
|
||||
mut backpack_right_pressed: MessageWriter<BackpackRightPressed>,
|
||||
mut backpack_inputs: MessageWriter<BackpackButtonPress>,
|
||||
mut select_left_pressed: MessageWriter<SelectLeftPressed>,
|
||||
mut select_right_pressed: MessageWriter<SelectRightPressed>,
|
||||
mut cash_heal_pressed: MessageWriter<CashHealPressed>,
|
||||
@@ -209,19 +202,19 @@ fn keyboard_controls(
|
||||
inputs.0.trigger = mouse.pressed(MouseButton::Left);
|
||||
|
||||
if keyboard.just_pressed(KeyCode::KeyB) {
|
||||
backpack_toggle_pressed.write(BackpackTogglePressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Toggle);
|
||||
}
|
||||
|
||||
if keyboard.just_pressed(KeyCode::Enter) {
|
||||
backpack_swap_pressed.write(BackpackSwapPressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Swap);
|
||||
}
|
||||
|
||||
if keyboard.just_pressed(KeyCode::Comma) {
|
||||
backpack_left_pressed.write(BackpackLeftPressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Left);
|
||||
}
|
||||
|
||||
if keyboard.just_pressed(KeyCode::Period) {
|
||||
backpack_right_pressed.write(BackpackRightPressed);
|
||||
backpack_inputs.write(BackpackButtonPress::Right);
|
||||
}
|
||||
|
||||
if keyboard.just_pressed(KeyCode::KeyQ) {
|
||||
|
||||
Reference in New Issue
Block a user