draw tile

src/tui/console.rs

@@ -5,8 +5,8 @@ use tui_logger::TuiLoggerWidget;
 
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Default, States)]
 pub(crate) enum ConsoleState {
-    Closed,
     #[default]
+    Closed,
     Open,
 }
 

src/tui/render/ingame.rs

@@ -1,10 +1,13 @@
 use bevy::prelude::*;
 use bevy_ratatui::RatatuiContext;
+use jong::game::hand::DrawnTile;
 use jong::game::player::{MainPlayer, Player};
+use jong::tile::Tile;
 use rand::rand_core::block::BlockRngCore;
 use ratatui::style::Styled;
 use ratatui::widgets::{Block, Borders, Widget};
 
+use crate::tui::render::tile::draw_tile;
 use crate::tui::{
     input::mouse::PickRegion,
     render::{Hovered, hand, tile::RenderedTile},
@@ -13,10 +16,12 @@ use crate::tui::{
 pub(crate) fn draw_ingame(
     mut commands: Commands,
     mut tui_ctx: ResMut<RatatuiContext>,
-    main_player: Single<Entity, (With<Player>, With<MainPlayer>)>,
+    tiles: Query<&Tile>,
     hovered_entity: Query<Entity, With<Hovered>>,
+    main_player: Single<Entity, (With<Player>, With<MainPlayer>)>,
     rendered_tiles: Populated<&RenderedTile>,
     rendered_hand: Res<hand::RenderedHand>,
+    drawn_tile: Option<Single<&DrawnTile, With<MainPlayer>>>,
 ) -> Result {
     use ratatui::layout::Flex;
     use ratatui::prelude::*;
@@ -45,14 +50,15 @@ pub(crate) fn draw_ingame(
         );
         let pond_area = term_area.inner(margin);
         let all_pond = Layout::horizontal([Constraint::Fill(1); 3]);
-        let cross_pond = Layout::vertical([Constraint::Fill(1), Constraint::Max(1),Constraint::Fill(1)]);
+        let cross_pond =
+            Layout::vertical([Constraint::Fill(1), Constraint::Max(1), Constraint::Fill(1)]);
         let [mut left_pond, center, mut right_pond] = all_pond.areas::<3>(pond_area);
         let [cross_pond, compass, this_pond] = cross_pond.areas::<3>(center);
         // let shift = left_pond.height - cross_pond.height;
         left_pond.height = cross_pond.height;
         left_pond.y += cross_pond.height / 2;
         right_pond.height = cross_pond.height;
-        right_pond.y+= cross_pond.height / 2;
+        right_pond.y += cross_pond.height / 2;
 
         let debug_block = Block::new().borders(Borders::ALL);
         frame.render_widget(debug_block.clone(), this_hand);
@@ -65,19 +71,30 @@ pub(crate) fn draw_ingame(
         frame.render_widget(debug_block.clone(), right_pond);
 
         // TODO attempt to merge blocks on smol term?
-        let layout = Layout::horizontal(vec![Constraint::Max(5); 13]).flex(Flex::Start);
-        let this_clamped = this_hand.height.abs_diff(5);
-        if let Some(val) = this_hand.height.checked_sub(this_clamped) {
-            this_hand.height = val
-        } else {
-            // FIXME show error
-            panic!("terminal too small!");
-        }
-        this_hand.y += this_clamped + 1;
-        let areas = layout.areas::<13>(this_hand);
         if let Some(hand) = rendered_hand.0.get(&*main_player) {
-            for (tile, mut tile_area) in hand.iter().zip(areas.into_iter()) {
-                tile_area.height = 4;
+            let hand_area_layout = Layout::horizontal([
+                Constraint::Max(hand.len() as u16 * 5),
+                Constraint::Max(if drawn_tile.is_some() { 7 } else { 0 }),
+                Constraint::Fill(1),
+            ])
+            .flex(Flex::SpaceBetween);
+            let this_clamped = this_hand.height.abs_diff(5);
+            if let Some(val) = this_hand.height.checked_sub(this_clamped) {
+                this_hand.height = 4
+            } else {
+                // FIXME show error
+                panic!("terminal too small!");
+            }
+            this_hand.y += this_clamped + 1;
+            let [this_hand, mut this_drawn, this_meld] = hand_area_layout.areas::<3>(this_hand);
+
+            // this_hand
+            let mut constraints = vec![Constraint::Max(5); hand.len()];
+            constraints.push(Constraint::Fill(1));
+            let layout = Layout::horizontal(constraints).flex(Flex::Start);
+            let hand_areas = layout.split(this_hand);
+            for (tile, mut tile_area) in hand.iter().zip(hand_areas.iter().cloned()) {
+                // tile_area.height = 4;
                 let mut widget = rendered_tiles.get(*tile).unwrap().0.clone();
                 if hovered_entity.contains(*tile) {
                     widget = widget.add_modifier(Modifier::BOLD);
@@ -93,6 +110,27 @@ pub(crate) fn draw_ingame(
                     .insert(PickRegion { area: tile_area });
                 frame.render_widget(widget, tile_area);
             }
+
+            // this_drawn
+            if let Some(tile) = drawn_tile {
+                // this_drawn.height = 4;
+                this_drawn.width = 5;
+                this_drawn.x += 2;
+                let mut widget = draw_tile(tiles.get(tile.0).unwrap());
+                if hovered_entity.contains(tile.0) {
+                    widget = widget.add_modifier(Modifier::BOLD);
+                    if let Some(val) = this_drawn.y.checked_sub(1) {
+                        this_drawn.y = val
+                    } else {
+                        // FIXME show error
+                        panic!("terminal too small!");
+                    }
+                }
+                commands
+                    .entity(tile.0)
+                    .insert(PickRegion { area: this_drawn });
+                frame.render_widget(widget, this_drawn);
+            }
         }
     })?;