From b79bf002272951b27ce56d780f19eec29f67deb0 Mon Sep 17 00:00:00 2001 From: Franklin Date: Wed, 15 Nov 2023 08:01:14 -0400 Subject: [PATCH] Inventory screen and project organization --- src/comps/core/controller.rs | 11 +-- src/comps/core/markers/inventory_screen.rs | 6 ++ src/comps/core/markers/mod.rs | 2 + src/comps/core/markers/settings_screen.rs | 4 + src/logic/core/player/camera_player_sync.rs | 28 +++++-- src/logic/core/player/hands.rs | 15 ++-- src/ui/game/game_ui_state.rs | 33 ++++++++ src/ui/game/{ => hud}/fps_counter.rs | 0 src/ui/game/hud/interact_clue.rs | 8 +- src/ui/game/hud/mod.rs | 1 + src/ui/game/hud/plugin.rs | 4 +- src/ui/game/inventory/menu.rs | 78 ++++++++++++++++++- src/ui/game/mod.rs | 3 +- src/ui/game/plugin.rs | 24 +----- src/ui/game/settings.rs | 29 ------- .../{settings_screen.rs => settings/menu.rs} | 15 ++-- src/ui/game/settings/mod.rs | 2 + src/ui/game/settings/plugin.rs | 13 ++++ 18 files changed, 184 insertions(+), 92 deletions(-) create mode 100644 src/comps/core/markers/inventory_screen.rs create mode 100644 src/comps/core/markers/settings_screen.rs create mode 100644 src/ui/game/game_ui_state.rs rename src/ui/game/{ => hud}/fps_counter.rs (100%) delete mode 100644 src/ui/game/settings.rs rename src/ui/game/{settings_screen.rs => settings/menu.rs} (92%) create mode 100644 src/ui/game/settings/mod.rs create mode 100644 src/ui/game/settings/plugin.rs diff --git a/src/comps/core/controller.rs b/src/comps/core/controller.rs index fa853f2..456f530 100644 --- a/src/comps/core/controller.rs +++ b/src/comps/core/controller.rs @@ -1,15 +1,12 @@ use bevy::prelude::*; use bevy_rapier3d::prelude::*; -use crate::{ - logic::core::player::{ +use crate::{logic::core::player::{ player_movement::{ move_player, PlayerLinearXZState, PlayerLinearYState, PlayerMovementInput, }, player_values_state::PlayerValuesState, - }, - ui::game::settings::SettingsScreenUIConfiguration, -}; + }, ui::game::game_ui_state::GameUiState}; use super::markers::player::Player; @@ -28,7 +25,7 @@ pub fn capture_input( With, >, time: Res