soaos/bevy_terminal_dialog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: soaos:master
Branches Tags
soaos:master
soaos:1-add-build-action
soaos:v0.2.0
soaos:v0.1.0
..
compare: soaos:1-add-build-action
Branches Tags
soaos:master
soaos:1-add-build-action
soaos:v0.2.0
soaos:v0.1.0

No commits in common. "master" and "1-add-build-action" have entirely different histories.
master ... 1-add-buil

8 changed files with 5234 additions and 94 deletions
Show Stats Expand all files Collapse all files

2
.cargo/config.toml Normal file
View File

@ -0,0 +1,2 @@
[profile.dev.package."*"]
opt-level = 2

4
.gitignore vendored
View File

@ -1,3 +1 @@
target /target
.cargo/config.toml
Cargo.lock

5183
Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

8
Cargo.toml
View File

@ -3,12 +3,6 @@ name = "bevy_terminal_dialog"
version = "0.2.2" version = "0.2.2"
edition = "2021" edition = "2021"
[profile.dev]
opt-level = 1
[profile.dev.package.'*']
opt-level = 2
[dependencies] [dependencies]
textwrap = "0.16" textwrap = "0.16"
zalgo = "0.2" zalgo = "0.2"
@ -19,7 +13,7 @@ downcast-rs = "2.0"
lazy_static = "1.5" lazy_static = "1.5"
[dependencies.bevy_terminal_display] [dependencies.bevy_terminal_display]
version = "0.7" git = "https://git.soaos.dev/soaos/bevy_terminal_display"
[dependencies.bevy_basic_interaction] [dependencies.bevy_basic_interaction]
git = "https://git.soaos.dev/soaos/bevy_basic_interaction" git = "https://git.soaos.dev/soaos/bevy_basic_interaction"

6
src/events.rs
View File

@ -1,6 +0,0 @@
use bevy::prelude::*;
use yarnspinner::runtime::DialogueOption;
/// Event called when a dialog option is selected
#[derive(Event, Debug)]
pub struct OptionSelectedEvent(pub DialogueOption);

6
src/lib.rs
View File

@ -9,15 +9,11 @@ mod systems;
pub mod widgets; pub mod widgets;
pub mod util; pub mod util;
mod events;
pub use events::*;
/// Plugin which provides dialog functionality /// Plugin which provides dialog functionality
pub struct TerminalDialogPlugin; pub struct TerminalDialogPlugin;
impl Plugin for TerminalDialogPlugin { impl Plugin for TerminalDialogPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems(Startup, systems::setup).add_event::<OptionSelectedEvent>(); app.add_systems(Startup, systems::setup);
} }
} }

69
src/util.rs
View File

@ -18,50 +18,53 @@ pub fn style_line(line: &yarnspinner::runtime::Line) -> Vec<(String, Style)> {
Style::new(), Style::new(),
)); ));
for (i, attribute) in attributes.iter().enumerate() { for (i, attribute) in attributes.iter().enumerate() {
let mut attrib_text = line.text_for_attribute(attribute).to_string(); let mut attrib_text = line.text_for_attribute(&attribute).to_string();
let mut style = Style::new(); let mut style = Style::new();
if attribute.name.as_str() == "style" { match attribute.name.as_str() {
for (property_name, property_value) in attribute.properties.iter() { "style" => {
match property_name.as_str() { for (property_name, property_value) in attribute.properties.iter() {
"bold" => { match property_name.as_str() {
if let MarkupValue::Bool(value) = property_value { "bold" => {
if *value { if let MarkupValue::Bool(value) = property_value {
style = style.bold(); if *value {
style = style.bold();
}
} }
} }
} "italic" => {
"italic" => { if let MarkupValue::Bool(value) = property_value {
if let MarkupValue::Bool(value) = property_value { if *value {
if *value { style = style.italic();
style = style.italic(); }
} }
} }
} "color" => {
"color" => { if let MarkupValue::Integer(value) = property_value {
if let MarkupValue::Integer(value) = property_value { style = style.fg(Color::Indexed(*value as u8))
style = style.fg(Color::Indexed(*value as u8))
}
}
"zalgo" => {
if let MarkupValue::Bool(value) = property_value {
if *value {
let mut generator = Generator::new();
let mut out = String::new();
let args =
GeneratorArgs::new(true, true, true, ZalgoSize::Mini);
generator.gen(&attrib_text, &mut out, &args);
attrib_text = out;
} }
} }
} "zalgo" => {
"bg" => { if let MarkupValue::Bool(value) = property_value {
if let MarkupValue::Integer(value) = property_value { if *value {
style = style.bg(Color::Indexed(*value as u8)) let mut generator = Generator::new();
let mut out = String::new();
let args =
GeneratorArgs::new(true, true, true, ZalgoSize::Mini);
generator.gen(&attrib_text, &mut out, &args);
attrib_text = out;
}
}
} }
"bg" => {
if let MarkupValue::Integer(value) = property_value {
style = style.bg(Color::Indexed(*value as u8))
}
}
_ => (),
} }
_ => (),
} }
} }
_ => (),
} }
if attribute.name != "character" { if attribute.name != "character" {
line_segments.push((attrib_text, style)) line_segments.push((attrib_text, style))

50
src/widgets.rs
View File

@ -5,11 +5,7 @@ use std::time::{Duration, Instant};
use arbitrary_chunks::ArbitraryChunks as _; use arbitrary_chunks::ArbitraryChunks as _;
use bevy::prelude::*; use bevy::prelude::*;
use bevy_terminal_display::{ use bevy_terminal_display::{
crossterm::{ crossterm,
self,
event::{Event, KeyCode, KeyEvent, KeyEventKind},
},
input::events::TerminalInputEvent,
ratatui::{ ratatui::{
layout::{Constraint, Flex, Layout}, layout::{Constraint, Flex, Layout},
style::{Style, Stylize}, style::{Style, Stylize},
@ -24,8 +20,6 @@ use bevy_terminal_display::{
use unicode_segmentation::UnicodeSegmentation as _; use unicode_segmentation::UnicodeSegmentation as _;
use yarnspinner::runtime::DialogueOption; use yarnspinner::runtime::DialogueOption;
use crate::OptionSelectedEvent;
/// Dialog box widget marker /// Dialog box widget marker
#[derive(Component)] #[derive(Component)]
pub struct DialogBox; pub struct DialogBox;
@ -51,9 +45,9 @@ impl DialogBoxWidget {
pub fn new(character: Option<String>, text: Vec<(String, Style)>, speed: Duration) -> Self { pub fn new(character: Option<String>, text: Vec<(String, Style)>, speed: Duration) -> Self {
Self { Self {
character, character,
character_count: text.iter().fold(0, |count, (string, _)| { character_count: text
count + string.graphemes(true).count() .iter()
}), .fold(0, |count, (string, _)| count + string.graphemes(true).count()),
text, text,
speed, speed,
typewriter_index: 0, typewriter_index: 0,
@ -68,9 +62,7 @@ impl DialogBoxWidget {
/// Sets the text contained inside the dialog box /// Sets the text contained inside the dialog box
pub fn set_text(&mut self, text: Vec<(String, Style)>) { pub fn set_text(&mut self, text: Vec<(String, Style)>) {
self.character_count = text.iter().fold(0, |count, (string, _)| { self.character_count = text.iter().fold(0, |count, (string, _)| count + string.graphemes(true).count());
count + string.graphemes(true).count()
});
self.text = text; self.text = text;
self.typewriter_index = 0; self.typewriter_index = 0;
self.last_character = Instant::now(); self.last_character = Instant::now();
@ -125,12 +117,11 @@ impl TerminalWidget for DialogBoxWidget {
} }
fn update(&mut self, _time: &Time, _commands: &mut Commands) { fn update(&mut self, _time: &Time, _commands: &mut Commands) {
if self.character_count > 0 if self.character_count > 0 && self.typewriter_index < self.character_count {
&& self.typewriter_index < self.character_count if self.last_character.elapsed() >= self.speed {
&& self.last_character.elapsed() >= self.speed self.typewriter_index += 1;
{ self.last_character = Instant::now();
self.typewriter_index += 1; }
self.last_character = Instant::now();
} }
} }
} }
@ -229,25 +220,4 @@ impl TerminalWidget for OptionsBoxWidget {
frame.render_widget(Clear, area); frame.render_widget(Clear, area);
frame.render_stateful_widget(list, area, &mut self.state); frame.render_stateful_widget(list, area, &mut self.state);
} }
fn handle_events(&mut self, event: &TerminalInputEvent, commands: &mut Commands) {
if let TerminalInputEvent(Event::Key(KeyEvent { code, kind, .. })) = event {
if kind == &KeyEventKind::Press {
match code {
KeyCode::Up => {
self.state.select_previous();
}
KeyCode::Down => {
self.state.select_next();
}
KeyCode::Char('e') => {
commands.send_event(OptionSelectedEvent(
self.options[self.state.selected().unwrap()].0.clone(),
));
}
_ => (),
}
}
}
}
} }