From 2447e60f16349c35c3040022f159194f75baaa41 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 13 Jan 2026 17:05:56 -0800 Subject: [PATCH] draw queue --- src/tile.rs | 2 +- src/tui/console.rs | 14 ++++----- src/tui/input/keyboard.rs | 14 +++++---- src/tui/mod.rs | 27 +++++++++++------ src/tui/{ => render}/menu.rs | 56 ++++++++++++++++++++++++------------ src/tui/render/mod.rs | 18 ++++++++++++ 6 files changed, 90 insertions(+), 41 deletions(-) rename src/tui/{ => render}/menu.rs (65%) diff --git a/src/tile.rs b/src/tile.rs index c0941d4..89fe820 100644 --- a/src/tile.rs +++ b/src/tile.rs @@ -6,7 +6,7 @@ pub struct Tile { pub suit: Suit, } -#[derive(MapEntities, Debug, PartialEq, PartialOrd, Eq, Ord, Clone, Copy)] +#[derive(/* MapEntities, */ Debug, PartialEq, PartialOrd, Eq, Ord, Clone, Copy)] pub enum Suit { Man(Rank), Pin(Rank), diff --git a/src/tui/console.rs b/src/tui/console.rs index 2390c5e..7cd2171 100644 --- a/src/tui/console.rs +++ b/src/tui/console.rs @@ -1,8 +1,9 @@ use bevy::prelude::*; -use bevy_ratatui::RatatuiContext; -use ratatui::{layout::Margin, widgets::Block}; +use ratatui::widgets::{Block, Clear}; use tui_logger::TuiLoggerWidget; +use crate::tui::render::WidgetStack; + #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Default, States)] pub(crate) enum ConsoleState { #[default] @@ -21,14 +22,13 @@ impl std::ops::Not for ConsoleState { } } -pub(crate) fn draw_console(mut tui_ctx: ResMut) -> Result { - tui_ctx.draw(|frame| { +pub(crate) fn draw_console(mut widgets: ResMut) { + widgets.0.push(Box::new(|frame| { let block = Block::bordered().title("console"); + frame.render_widget(Clear, frame.area()); frame.render_widget( TuiLoggerWidget::default().block(block), frame.area(), /* .inner(Margin { horizontal: 8, vertical: 8 }) */ ); - })?; - - Ok(()) + })); } diff --git a/src/tui/input/keyboard.rs b/src/tui/input/keyboard.rs index 2a5e760..6e70e66 100644 --- a/src/tui/input/keyboard.rs +++ b/src/tui/input/keyboard.rs @@ -16,7 +16,7 @@ pub(crate) fn input_system( curr_tuistate: Res>, curr_consolestate: Res>, curr_gamestate: Res>, - curr_zenstate: Res>, + curr_zenstate: Option>>, mut next_tuistate: ResMut>, mut next_consolestate: ResMut>, @@ -60,10 +60,14 @@ pub(crate) fn input_system( next_tuistate.set(TuiState::InGame); next_gamestate.set(GameState::Setup); } - KeyCode::Char('z') => match curr_zenstate.get() { - ZenState::Menu => next_zenstate.set(ZenState::Zen), - ZenState::Zen => next_zenstate.set(ZenState::Menu), - }, + KeyCode::Char('z') => { + if let Some(ref curr_zenstate) = curr_zenstate { + match curr_zenstate.get() { + ZenState::Menu => next_zenstate.set(ZenState::Zen), + ZenState::Zen => next_zenstate.set(ZenState::Menu), + } + } + } KeyCode::Char('q') => { exit.write_default(); } diff --git a/src/tui/mod.rs b/src/tui/mod.rs index f3d95e8..1b3a25f 100644 --- a/src/tui/mod.rs +++ b/src/tui/mod.rs @@ -4,11 +4,12 @@ use bevy::{app::ScheduleRunnerPlugin, prelude::*, state::app::StatesPlugin}; use bevy_ratatui::RatatuiPlugins; use jong::game::GameState; + +use crate::tui::render::{WidgetStack, menu::Splash}; // use jong::game::wall::InWall; mod console; -mod menu; mod render; mod input; @@ -58,25 +59,33 @@ impl Plugin for RiichiTui { )) .add_plugins(StatesPlugin) - // console - .init_state::() - .add_systems(Last, console::draw_console.run_if(in_state(console::ConsoleState::Open))) - // general setup .init_state::() .add_computed_state::() + .init_resource::() + .add_sub_state::() + .init_resource::() + .init_state::() + .add_systems(PostUpdate, console::draw_console.run_if(in_state(console::ConsoleState::Open))) + + // input .add_systems(PreUpdate, input::keyboard::input_system) - .add_systems(PreUpdate, input::mouse::input_system.chain()) + .add_systems(PreUpdate, input::mouse::input_system) // main menu - .add_sub_state::() - .add_systems(Update, menu::draw_splash.run_if(in_state(TuiState::MainMenu))) - .add_systems(Update, menu::draw_mainmenu.after(menu::draw_splash).run_if(in_state(TuiState::MainMenu).and(in_state(ZenState::Menu)))) + .add_systems(PostStartup, render::menu::init_splash) + .insert_resource(Time::::from_seconds(1.0)) + .add_systems(FixedUpdate, render::menu::render_splash.run_if(in_state(TuiState::MainMenu))) + .add_systems(Update, render::menu::draw_splash.run_if(in_state(TuiState::MainMenu))) + .add_systems(Update, render::menu::draw_mainmenu.after(render::menu::draw_splash).run_if(in_state(TuiState::MainMenu).and(in_state(ZenState::Menu)))) // gaming .init_resource::() .add_systems(Update, render::hand::render_hands.run_if(in_state(InGame).and(in_state(GameState::Play)))) .add_systems(Update, render::ingame::draw_ingame.run_if(in_state(InGame))) + + // render + .add_systems(Last, render::draw_system.run_if(not(in_state(InGame)))) // semicolon stopper ; diff --git a/src/tui/menu.rs b/src/tui/render/menu.rs similarity index 65% rename from src/tui/menu.rs rename to src/tui/render/menu.rs index c1c455c..2e58526 100644 --- a/src/tui/menu.rs +++ b/src/tui/render/menu.rs @@ -1,5 +1,7 @@ use bevy::prelude::*; use bevy_ratatui::RatatuiContext; +use rand::rng; +use rand::seq::SliceRandom; use ratatui::layout::Constraint; use ratatui::layout::Flex; use ratatui::layout::Layout; @@ -9,6 +11,7 @@ use ratatui::widgets::{Block, Clear}; use jong::tile::Tile; +use crate::tui::render::WidgetStack; use crate::tui::render::tile; const MAINMENU_OPTIONS: [&str; 2] = [ @@ -28,13 +31,13 @@ const MAINMENU_OPTIONS: [&str; 2] = [ ", ]; -pub(crate) fn draw_mainmenu(mut tui_ctx: ResMut) -> Result { +pub(crate) fn draw_mainmenu(mut widgets: ResMut) { let options = MAINMENU_OPTIONS; let layout = Layout::vertical(vec![Constraint::Fill(1); options.len()]).flex(Flex::SpaceBetween); let block = Block::bordered(); - tui_ctx.draw(|frame| { + widgets.0.push(Box::new(move |frame| { let area = frame .area() .centered(Constraint::Max(55), Constraint::Max(19)); @@ -45,34 +48,49 @@ pub(crate) fn draw_mainmenu(mut tui_ctx: ResMut) -> Result { let para = Paragraph::new(opt); frame.render_widget(para, *area) } - })?; - - Ok(()) + })); } -pub(crate) fn draw_splash(mut tui_ctx: ResMut, tiles: Populated<&Tile>) -> Result { - let mut tile_it = tiles.into_iter().cycle(); +#[derive(Resource, Default)] +pub(crate) struct Splash(pub Vec>); - tui_ctx.draw(|frame| { +pub(crate) fn init_splash(mut commands: Commands, tiles: Populated<&Tile>) { + let tiles: Vec<_> = tiles + .iter() + .copied() + .map(|tile| tile::draw_tile(&tile)) + .collect(); + + commands.insert_resource(Splash(tiles)); + trace!("init_splash") +} + +pub(crate) fn render_splash(mut splash: ResMut) { + let mut rng = rng(); + splash.0.shuffle(&mut rng); +} + +pub(crate) fn draw_splash(mut widgets: ResMut, splash: Res) { + let tiles: Vec<_> = splash.0.clone(); + widgets.0.push(Box::new(move |frame| { let area = frame.area().outer(Margin { horizontal: 1, vertical: 1, }); - let layout = Layout::horizontal(vec![Constraint::Max(5); (area.width / 5) as usize]); + let layout = Layout::horizontal(vec![Constraint::Length(5); (area.width / 5) as usize]); let areas = layout.split(area); + let mut tile_chunks = tiles.chunks(areas.len()).cycle(); for area in areas.iter() { - let layout = Layout::vertical(vec![Constraint::Max(4); (area.height / 4) as usize]); + let layout = Layout::vertical(vec![Constraint::Length(4); (area.height / 4) as usize]); let areas = layout.split(*area); - let tiles: Vec<_> = tile_it - .clone() - .take((area.height / 4 + 1) as usize) - .cloned() - .map(|t| tile::draw_tile(&t)) - .collect(); - for (tile, area) in tiles.iter().zip(areas.into_iter()) { + // let tiles: Vec<_> = tile_it + // .by_ref() + // .take((area.height / 4 + 1) as usize) + // .map(|t| tile::draw_tile(&t)) + // .collect(); + for (tile, area) in tile_chunks.next().unwrap().iter().zip(areas.iter()) { frame.render_widget(tile, *area); } } - })?; - Ok(()) + })); } diff --git a/src/tui/render/mod.rs b/src/tui/render/mod.rs index a8aef30..c206fea 100644 --- a/src/tui/render/mod.rs +++ b/src/tui/render/mod.rs @@ -1,8 +1,26 @@ use bevy::prelude::*; +use bevy_ratatui::RatatuiContext; +use ratatui::Frame; pub(crate) mod hand; pub(crate) mod ingame; +pub(crate) mod menu; pub(crate) mod tile; +#[derive(Resource, Default)] +pub(crate) struct WidgetStack(pub(crate) Vec>); + #[derive(Component)] pub(crate) struct Hovered; + +pub(crate) fn draw_system( + mut tui_ctx: ResMut, + mut widgetstack: ResMut, +) -> Result { + tui_ctx.draw(|frame| { + for widget in widgetstack.0.drain(..) { + widget(frame) + } + })?; + Ok(()) +}