diff --git a/assets/inventory.png b/assets/inventory.png deleted file mode 100644 index f8373fa..0000000 Binary files a/assets/inventory.png and /dev/null differ diff --git a/src/lib.rs b/src/lib.rs index 87169ed..7550e63 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,7 +9,6 @@ use bevy::{ use camera::UserCamera; use market::Market; use player::Player; -use player_inventory_gui::PlayerInventoryGUI; use ui::{FPSText, FishCounterText, KeybindingsText, MoneyText}; use water::Water; @@ -17,7 +16,6 @@ mod camera; mod market; mod player; mod player_inventory; -mod player_inventory_gui; mod ui; mod water; @@ -54,7 +52,6 @@ pub fn start_game() { UserCamera::setup, Water::setup, Market::setup, - PlayerInventoryGUI::setup, Player::setup, FishCounterText::setup, MoneyText::setup, @@ -66,7 +63,6 @@ pub fn start_game() { ( FPSText::update, UserCamera::update, - PlayerInventoryGUI::toggle, Player::r#move.before(FishCounterText::update), Water::fishing, Market::sell.chain().before(MoneyText::update), diff --git a/src/player_inventory_gui.rs b/src/player_inventory_gui.rs deleted file mode 100644 index af54757..0000000 --- a/src/player_inventory_gui.rs +++ /dev/null @@ -1,56 +0,0 @@ -use bevy::prelude::*; - -use crate::{player::Player, PlayerGUIStatus}; - -#[derive(Debug, Default, Component)] -pub struct PlayerInventoryGUI {} - -impl PlayerInventoryGUI { - pub fn setup(mut commands: Commands, asset_server: Res) { - let image = asset_server.load::("inventory.png"); - let sprite = Sprite::from_image(image); - commands.spawn(( - sprite.clone(), - Transform::from_scale(Vec3 { - x: 20.0, - y: 20.0, - z: 0.0, - }), - Visibility::Hidden, - PlayerInventoryGUI::default(), - )); - } - - pub fn toggle( - mut player_inventory_gui_transform_query: Query< - &mut Transform, - (With, Without), - >, - mut player_query: Query<&mut Player, With>, - player_transform_query: Query<&Transform, With>, - mut player_inventory_visibility_query: Query<&mut Visibility, With>, - keyboard: Res>, - mut player_gui_status: ResMut, - ) { - let mut player_inventory_visibility = - player_inventory_visibility_query.get_single_mut().unwrap(); - - if keyboard.just_pressed(KeyCode::Tab) && player_gui_status.looking_inventory == false { - let mut player_inventory_gui_transform = player_inventory_gui_transform_query - .get_single_mut() - .unwrap(); - let player_inventory = &player_query.get_single_mut().unwrap().inventory; - let player_position = player_transform_query.get_single().unwrap(); - - let new_inventory_position = player_position.translation.truncate().extend(2.0); - player_inventory_gui_transform.translation = new_inventory_position; - player_gui_status.looking_inventory = true; - player_inventory_visibility.toggle_visible_hidden(); - println!("{:#?}", player_inventory); - } else if keyboard.just_pressed(KeyCode::Tab) && player_gui_status.looking_inventory == true - { - player_gui_status.looking_inventory = false; - player_inventory_visibility.toggle_visible_hidden(); - } - } -}