lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

notan::text message log tests

Browse source
This commit is contained in:
Llywelwyn 2023-09-25 17:40:48 +01:00
parent 093f9df86e
commit 8de3648bae
3 changed files with 66 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
notan = { version = "0.10.0" }
notan = { version = "0.10.0", features = ["text"] }
bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = ["serde"] }
regex = "1.3.6"
specs = { version = "0.16.1", features = ["serde"] }

66
src/main.rs
View file

@ -454,7 +454,7 @@ fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
draw_bg(&gs.ecs, &mut draw, &gs.atlas);
draw_camera(&gs.ecs, &mut draw, &gs.atlas, &gs.font);
gui::draw_ui2(&gs.ecs, &mut draw, &gs.atlas, &gs.font);
print_log(&mut draw, &gs.font, Point::new(1, 7), false, 7, VIEWPORT_W + 22);
//print_log(&mut draw, &gs.font, Point::new(1, 7), false, 7, VIEWPORT_W + 22);
}
}
match *gs.ecs.fetch::<RunState>() {
@ -474,6 +474,7 @@ fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
_ => {}
}
gfx.render(&draw);
write(gfx, &gs.font, &(TILESIZE, TILESIZE * 8.0), true);
}
fn idx_to_px(idx: usize, map: &Map) -> (f32, f32) {
@ -558,3 +559,66 @@ pub fn print_log(
x_px = (x as f32) * TILESIZE;
});
}
use std::collections::BTreeMap;
fn write(gfx: &mut Graphics, font: &notan::draw::Font, pos: &(f32, f32), desc: bool) {
use notan::text::CreateText;
let mut text = gfx.create_text();
let log = get_log();
let latest: Vec<_> = log.iter().rev().take(4).rev().collect();
let mut initial = true;
for (_, entries) in latest {
let mut wrote = false;
for (message, colour) in entries.iter() {
if initial {
if desc {
text.add(&message)
.font(font)
.position(pos.0, pos.1)
.size(FONTSIZE)
.max_width((VIEWPORT_W as f32) * TILESIZE)
.color(*colour)
.v_align_bottom();
} else {
text.add(&message)
.font(font)
.position(pos.0, pos.1)
.size(FONTSIZE)
.max_width((VIEWPORT_W as f32) * TILESIZE)
.color(*colour);
}
initial = false;
} else {
text.chain(&message).color(*colour).size(FONTSIZE);
}
wrote = true;
}
if wrote {
text.chain("\n");
}
}
gfx.render(&text);
}
fn get_log() -> BTreeMap<i32, Vec<(String, Color)>> {
let mut log: BTreeMap<i32, Vec<(String, Color)>> = BTreeMap::new();
log.entry(4).or_insert_with(Vec::new).push(("This is a".to_string(), Color::WHITE));
log.entry(4).or_insert_with(Vec::new).push((" test".to_string(), Color::RED));
log.entry(5).or_insert_with(Vec::new).push(("This is the fifth".to_string(), Color::WHITE));
log.entry(5).or_insert_with(Vec::new).push((" test".to_string(), Color::BLUE));
log.entry(6).or_insert_with(Vec::new).push(("This is the sixth".to_string(), Color::WHITE));
log.entry(6).or_insert_with(Vec::new).push((" test".to_string(), Color::BLUE));
log.entry(7).or_insert_with(Vec::new).push(("This is the seventh".to_string(), Color::WHITE));
log.entry(7).or_insert_with(Vec::new).push((" test".to_string(), Color::BLUE));
log.entry(8).or_insert_with(Vec::new).push(("This is the eighth".to_string(), Color::WHITE));
log.entry(8)
.or_insert_with(Vec::new)
.push((
" test with a very long message, so that I can test the line wrapping.".to_string(),
Color::BLUE,
));
log.entry(9).or_insert_with(Vec::new).push(("This is the ninth".to_string(), Color::WHITE));
log.entry(9).or_insert_with(Vec::new).push((" test".to_string(), Color::BLUE));
log
}

1
src/states/state.rs
View file

@ -299,7 +299,6 @@ impl State {
// RunState::HelpScreen
RunState::MagicMapReveal { row, cursed } => {
let mut map = self.ecs.fetch_mut::<Map>();
// Could probably toss this into a function somewhere, and/or
// have multiple simple animations for it.
for x in 0..map.width {