diff --git a/jong/src/game.rs b/jong/src/game.rs index 128b97b..e72112c 100644 --- a/jong/src/game.rs +++ b/jong/src/game.rs @@ -219,10 +219,8 @@ fn view_hand( tiles: Query<(&Tile, Entity)>, hand_ent: Single>, ) { - trace!("view_hand"); + // trace!("view_hand"); if let Some(view) = stdb.db().view_player_hand().iter().next() { - debug!("view_hand: {view:?}"); - let mut view = view.tiles.iter().map(Tile::from).collect::>(); let tiles = tiles diff --git a/jong/src/tui.rs b/jong/src/tui.rs index b0d60d4..3c2bade 100644 --- a/jong/src/tui.rs +++ b/jong/src/tui.rs @@ -26,6 +26,32 @@ pub enum TuiSet { Render, } +mod states { + use bevy::prelude::*; + use tui_logger::TuiWidgetState; + + #[derive(Resource)] + pub(crate) struct ConsoleWidget { + pub(crate) state: TuiWidgetState, + pub(crate) open: bool, + } + + #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, States, Default)] + pub(crate) enum TuiState { + #[default] + MainMenu, + InGame, + } + + // #[derive(SubStates, Default, Clone, Copy, PartialEq, Eq, Hash, Debug)] + // #[source(TuiState = TuiState::MainMenu)] + // pub(crate) enum ZenState { + // #[default] + // Menu, + // Zen, + // } +} + impl Plugin for TuiPlugin { fn build(&self, app: &mut App) { app.add_plugins(( @@ -60,7 +86,7 @@ impl Plugin for TuiPlugin { .add_systems( Update, ( - render::render_hands.run_if(in_state(GameState::Play)), + (render::render_hands, render::render_arg_check).run_if(in_state(GameState::Play)), render::render, ) .chain() @@ -95,29 +121,3 @@ fn discard_tile( writer.write(GameMessage::Discarded(message.0)); } } - -mod states { - use bevy::prelude::*; - use tui_logger::TuiWidgetState; - - #[derive(Resource)] - pub(crate) struct ConsoleWidget { - pub(crate) state: TuiWidgetState, - pub(crate) open: bool, - } - - #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, States, Default)] - pub(crate) enum TuiState { - #[default] - MainMenu, - InGame, - } - - // #[derive(SubStates, Default, Clone, Copy, PartialEq, Eq, Hash, Debug)] - // #[source(TuiState = TuiState::MainMenu)] - // pub(crate) enum ZenState { - // #[default] - // Menu, - // Zen, - // } -} diff --git a/jong/src/tui/render.rs b/jong/src/tui/render.rs index a81588d..0fd0ced 100644 --- a/jong/src/tui/render.rs +++ b/jong/src/tui/render.rs @@ -95,6 +95,23 @@ pub(crate) fn render( Ok(()) } +pub(crate) fn render_arg_check( + mut commands: Commands, + mut tui: ResMut, + + hovered: Query>, + layouts: Res, + + tiles: Query<&jong_types::Tile>, + // main_player: Single<(&Player, Entity, &Wind), With>, + curr_player: Single>, + players: Query<(&Player, Entity, &Children)>, + hands: Query<(&Children, Entity), (With, Without)>, + // drawn_tile: Single>, +) { + trace!("arg!"); +} + #[allow(clippy::too_many_arguments, clippy::type_complexity)] pub(crate) fn render_hands( mut commands: Commands, @@ -110,6 +127,8 @@ pub(crate) fn render_hands( hands: Query<(&Children, Entity), (With, Without)>, drawn_tile: Single>, ) -> Result { + trace!("render_hands"); + let mut frame = tui.get_frame(); debug_blocks(*layouts, &mut frame);