discard a tile
This commit is contained in:
Tao Tien
parent
0c5fc38649
commit
02b40ef344
10 changed files with 315 additions and 210 deletions
153
src/tui/input.rs
153
src/tui/input.rs
|
|
@ -1,149 +1,16 @@
|
|||
use bevy::prelude::*;
|
||||
|
||||
pub(crate) use keyboard::keyboard;
|
||||
pub(crate) use mouse::mouse;
|
||||
|
||||
pub(crate) mod keyboard {
|
||||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::KeyMessage;
|
||||
use ratatui::crossterm::event::KeyCode;
|
||||
use tui_logger::TuiWidgetEvent;
|
||||
pub(crate) mod keyboard;
|
||||
pub(crate) mod mouse;
|
||||
|
||||
use jong::game::GameState;
|
||||
#[derive(Component)]
|
||||
pub(crate) struct Hovered;
|
||||
|
||||
use crate::tui::layout::Overlays;
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
use crate::tui::states::TuiState;
|
||||
#[derive(Component)]
|
||||
pub(crate) struct StartSelect;
|
||||
|
||||
pub(crate) fn keyboard(
|
||||
mut messages: MessageReader<KeyMessage>,
|
||||
mut overlays: ResMut<Overlays>,
|
||||
mut consolewidget: ResMut<ConsoleWidget>,
|
||||
mut exit: MessageWriter<AppExit>,
|
||||
|
||||
curr_gamestate: Res<State<GameState>>,
|
||||
curr_tuistate: Res<State<TuiState>>,
|
||||
|
||||
mut next_gamestate: ResMut<NextState<GameState>>,
|
||||
mut next_tuistate: ResMut<NextState<TuiState>>,
|
||||
) {
|
||||
'message: for message in messages.read() {
|
||||
let key = message.code;
|
||||
if consolewidget.handle_keyboard(key) {
|
||||
continue 'message;
|
||||
}
|
||||
for overlay in overlays.stack.iter().rev() {
|
||||
let consumed = match overlay {
|
||||
_ => false,
|
||||
};
|
||||
if consumed {
|
||||
continue 'message;
|
||||
}
|
||||
}
|
||||
|
||||
match curr_tuistate.get() {
|
||||
TuiState::MainMenu => match key {
|
||||
KeyCode::Char('p') => {
|
||||
next_tuistate.set(TuiState::InGame);
|
||||
next_gamestate.set(GameState::Setup);
|
||||
}
|
||||
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();
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
TuiState::InGame => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ConsoleWidget {
|
||||
pub(crate) fn handle_keyboard(&mut self, key: KeyCode) -> bool {
|
||||
if key == KeyCode::Char('`') {
|
||||
self.open = !self.open;
|
||||
return true;
|
||||
}
|
||||
if self.open {
|
||||
match key {
|
||||
KeyCode::Up => self.state.transition(TuiWidgetEvent::UpKey),
|
||||
KeyCode::Down => self.state.transition(TuiWidgetEvent::DownKey),
|
||||
// KeyCode::Home => self.state.transition(TuiWidgetEvent::),
|
||||
// KeyCode::End => self.state.transition(TuiWidgetEvent::),
|
||||
KeyCode::PageUp => self.state.transition(TuiWidgetEvent::PrevPageKey),
|
||||
KeyCode::PageDown => self.state.transition(TuiWidgetEvent::NextPageKey),
|
||||
KeyCode::Esc => {
|
||||
self.open = false;
|
||||
return true;
|
||||
}
|
||||
_ => return false,
|
||||
}
|
||||
}
|
||||
self.open
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) mod mouse {
|
||||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::MouseMessage;
|
||||
use ratatui::layout::Position;
|
||||
|
||||
use crate::tui::render::{Hovered, PickRegion};
|
||||
|
||||
pub(crate) fn mouse(
|
||||
mut commands: Commands,
|
||||
mut messages: MessageReader<MouseMessage>,
|
||||
entities: Query<(Entity, &PickRegion)>,
|
||||
hovered: Query<(Entity, &PickRegion), With<Hovered>>,
|
||||
) -> Result {
|
||||
for message in messages.read() {
|
||||
let event = message.0;
|
||||
// let term_size = context.size().unwrap();
|
||||
let position = Position::new(event.column, event.row);
|
||||
match event.kind {
|
||||
ratatui::crossterm::event::MouseEventKind::Down(mouse_button) => match mouse_button
|
||||
{
|
||||
ratatui::crossterm::event::MouseButton::Left => {
|
||||
for (_entity, _region) in &entities {}
|
||||
}
|
||||
// ratatui::crossterm::event::MouseButton::Right => todo!(),
|
||||
// ratatui::crossterm::event::MouseButton::Middle => todo!(),
|
||||
_ => {}
|
||||
},
|
||||
// ratatui::crossterm::event::MouseEventKind::Up(mouse_button) => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::Drag(mouse_button) => todo!(),
|
||||
ratatui::crossterm::event::MouseEventKind::Moved => {
|
||||
for (entity, region) in &hovered {
|
||||
if !region.area.contains(position) {
|
||||
commands.get_entity(entity)?.remove::<Hovered>();
|
||||
}
|
||||
}
|
||||
for (entity, region) in &entities {
|
||||
// debug!(
|
||||
// "{:?}, {position:?}",
|
||||
// // region.area.positions().collect::<Vec<_>>()
|
||||
// region.area
|
||||
// );
|
||||
if region.area.contains(position) {
|
||||
commands.get_entity(entity)?.insert(Hovered);
|
||||
// trace!("{entity:?} hovered!")
|
||||
}
|
||||
}
|
||||
}
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollDown => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollUp => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollLeft => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollRight => todo!(),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
#[derive(Message)]
|
||||
pub(crate) struct ConfirmSelect(pub(crate) Entity);
|
||||
|
|
|
|||
85
src/tui/input/keyboard.rs
Normal file
85
src/tui/input/keyboard.rs
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::KeyMessage;
|
||||
use ratatui::crossterm::event::KeyCode;
|
||||
use tui_logger::TuiWidgetEvent;
|
||||
|
||||
use jong::game::GameState;
|
||||
|
||||
use crate::tui::layout::Overlays;
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
use crate::tui::states::TuiState;
|
||||
|
||||
pub(crate) fn keyboard(
|
||||
mut messages: MessageReader<KeyMessage>,
|
||||
mut overlays: ResMut<Overlays>,
|
||||
mut consolewidget: ResMut<ConsoleWidget>,
|
||||
mut exit: MessageWriter<AppExit>,
|
||||
|
||||
curr_gamestate: Res<State<GameState>>,
|
||||
curr_tuistate: Res<State<TuiState>>,
|
||||
|
||||
mut next_gamestate: ResMut<NextState<GameState>>,
|
||||
mut next_tuistate: ResMut<NextState<TuiState>>,
|
||||
) {
|
||||
'message: for message in messages.read() {
|
||||
let key = message.code;
|
||||
if consolewidget.handle_keyboard(key) {
|
||||
continue 'message;
|
||||
}
|
||||
for overlay in overlays.stack.iter().rev() {
|
||||
let consumed = match overlay {
|
||||
_ => false,
|
||||
};
|
||||
if consumed {
|
||||
continue 'message;
|
||||
}
|
||||
}
|
||||
|
||||
match curr_tuistate.get() {
|
||||
TuiState::MainMenu => match key {
|
||||
KeyCode::Char('p') => {
|
||||
next_tuistate.set(TuiState::InGame);
|
||||
next_gamestate.set(GameState::Setup);
|
||||
}
|
||||
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();
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
TuiState::InGame => debug!("unhandled keyboard event"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ConsoleWidget {
|
||||
pub(crate) fn handle_keyboard(&mut self, key: KeyCode) -> bool {
|
||||
if key == KeyCode::Char('`') {
|
||||
self.open = !self.open;
|
||||
return true;
|
||||
}
|
||||
if self.open {
|
||||
match key {
|
||||
KeyCode::Up => self.state.transition(TuiWidgetEvent::UpKey),
|
||||
KeyCode::Down => self.state.transition(TuiWidgetEvent::DownKey),
|
||||
// KeyCode::Home => self.state.transition(TuiWidgetEvent::),
|
||||
// KeyCode::End => self.state.transition(TuiWidgetEvent::),
|
||||
KeyCode::PageUp => self.state.transition(TuiWidgetEvent::PrevPageKey),
|
||||
KeyCode::PageDown => self.state.transition(TuiWidgetEvent::NextPageKey),
|
||||
KeyCode::Esc => {
|
||||
self.open = false;
|
||||
return true;
|
||||
}
|
||||
_ => return false,
|
||||
}
|
||||
}
|
||||
self.open
|
||||
}
|
||||
}
|
||||
81
src/tui/input/mouse.rs
Normal file
81
src/tui/input/mouse.rs
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::MouseMessage;
|
||||
use ratatui::layout::Position;
|
||||
|
||||
use crate::tui::{
|
||||
input::{ConfirmSelect, Hovered, StartSelect},
|
||||
render::PickRegion,
|
||||
};
|
||||
|
||||
pub(crate) fn mouse(
|
||||
mut commands: Commands,
|
||||
mut mouse_reader: MessageReader<MouseMessage>,
|
||||
mut event_writer: MessageWriter<ConfirmSelect>,
|
||||
entities: Query<(Entity, &PickRegion)>,
|
||||
hovered: Query<(Entity, &PickRegion), With<Hovered>>,
|
||||
startselected: Query<(Entity, &PickRegion), With<StartSelect>>,
|
||||
) {
|
||||
for message in mouse_reader.read() {
|
||||
let event = message.0;
|
||||
// let term_size = context.size().unwrap();
|
||||
let position = Position::new(event.column, event.row);
|
||||
match event.kind {
|
||||
#[allow(clippy::single_match)]
|
||||
ratatui::crossterm::event::MouseEventKind::Down(mouse_button) => match mouse_button {
|
||||
ratatui::crossterm::event::MouseButton::Left => {
|
||||
for (entity, region) in &entities {
|
||||
if region.area.contains(position) {
|
||||
commands.entity(entity).insert(StartSelect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ratatui::crossterm::event::MouseButton::Right => debug!("unhandled mouse event"),
|
||||
// ratatui::crossterm::event::MouseButton::Middle => debug!("unhandled mouse event"),
|
||||
_ => {}
|
||||
},
|
||||
ratatui::crossterm::event::MouseEventKind::Moved => {
|
||||
for (entity, region) in &hovered {
|
||||
if !region.area.contains(position) {
|
||||
commands.entity(entity).remove::<Hovered>();
|
||||
}
|
||||
}
|
||||
for (entity, region) in &entities {
|
||||
if region.area.contains(position) {
|
||||
commands.entity(entity).insert(Hovered);
|
||||
}
|
||||
}
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::Up(mouse_button) => match mouse_button {
|
||||
ratatui::crossterm::event::MouseButton::Left => {
|
||||
for (entity, region) in &startselected {
|
||||
if region.area.contains(position) {
|
||||
commands.entity(entity).remove::<StartSelect>();
|
||||
event_writer.write(ConfirmSelect(entity));
|
||||
}
|
||||
}
|
||||
}
|
||||
ratatui::crossterm::event::MouseButton::Right => {
|
||||
for (entity, _) in &startselected {
|
||||
commands.entity(entity).remove::<StartSelect>();
|
||||
}
|
||||
}
|
||||
// ratatui::crossterm::event::MouseButton::Middle => debug!("unhandled mouse event"),
|
||||
_ => {}
|
||||
},
|
||||
ratatui::crossterm::event::MouseEventKind::Drag(mouse_button) => {
|
||||
debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollDown => {
|
||||
debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollUp => debug!("unhandled mouse event"),
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollLeft => {
|
||||
debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollRight => {
|
||||
debug!("unhandled mouse event")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,12 +13,10 @@ use jong::game::player::{MainPlayer, Player};
|
|||
use jong::game::round::Wind;
|
||||
use jong::tile::Tile;
|
||||
|
||||
use crate::tui::input::Hovered;
|
||||
use crate::tui::layout::*;
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
|
||||
#[derive(Component)]
|
||||
pub(crate) struct Hovered;
|
||||
|
||||
#[derive(Component)]
|
||||
pub(crate) struct PickRegion {
|
||||
pub(crate) area: Rect,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue