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

rudimentary reimplementation of the log

Browse source
This commit is contained in:
Llywelwyn 2023-09-25 04:05:57 +01:00
parent 1cd9f75ecc
commit cdf0257598
3 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gamelog/logstore.rs
View file

@ -3,7 +3,7 @@ use bracket_lib::prelude::*;
use std::sync::Mutex; use std::sync::Mutex;
lazy_static! { lazy_static! {
static ref LOG: Mutex<Vec<Vec<LogFragment>>> = Mutex::new(Vec::new()); pub static ref LOG: Mutex<Vec<Vec<LogFragment>>> = Mutex::new(Vec::new());
} }
#[allow(dead_code)] #[allow(dead_code)]

2
src/gamelog/mod.rs
View file

@ -2,7 +2,7 @@ mod builder;
pub use builder::*; pub use builder::*;
mod logstore; mod logstore;
use logstore::*; use logstore::*;
pub use logstore::{ clear_log, clone_log, print_log, restore_log, setup_log }; pub use logstore::{ LOG, clear_log, clone_log, print_log, restore_log, setup_log };
mod events; mod events;
pub use events::*; pub use events::*;

29
src/main.rs
View file

@ -448,7 +448,9 @@ fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
_ => { _ => {
draw_bg(&gs.ecs, &mut draw, &gs.atlas); draw_bg(&gs.ecs, &mut draw, &gs.atlas);
draw_camera(&gs.ecs, &mut draw, &gs.atlas, &gs.font); draw_camera(&gs.ecs, &mut draw, &gs.atlas, &gs.font);
crate::gui::draw_ui2(&gs.ecs, &mut draw, &gs.atlas, &gs.font); gui::draw_ui2(&gs.ecs, &mut draw, &gs.atlas, &gs.font);
// print_log
draw_log(&mut draw, &gs.font);
} }
} }
match *gs.ecs.fetch::<RunState>() { match *gs.ecs.fetch::<RunState>() {
@ -456,11 +458,11 @@ fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
draw.text(&gs.font, "RunState::Farlook") draw.text(&gs.font, "RunState::Farlook")
.position(((x + 2) as f32) * TILESIZE, (y as f32) * TILESIZE) .position(((x + 2) as f32) * TILESIZE, (y as f32) * TILESIZE)
.size(FONTSIZE); .size(FONTSIZE);
crate::gui::draw_farlook(x, y, &mut draw, &gs.atlas); gui::draw_farlook(x, y, &mut draw, &gs.atlas);
//draw_tooltips(&gs.ecs, ctx, Some((x, y))); TODO: Put this in draw loop //draw_tooltips(&gs.ecs, ctx, Some((x, y))); TODO: Put this in draw loop
} }
RunState::ShowCheatMenu => { RunState::ShowCheatMenu => {
crate::gui::draw_cheat_menu(&mut draw, &gs.atlas, &gs.font); gui::draw_cheat_menu(&mut draw, &gs.atlas, &gs.font);
} }
_ => {} _ => {}
} }
@ -478,3 +480,24 @@ fn idx_to_px(idx: usize, map: &Map) -> (f32, f32) {
fn update(ctx: &mut App, state: &mut State) { fn update(ctx: &mut App, state: &mut State) {
state.update(ctx); state.update(ctx);
} }
// TODO: This is *very* temporary, like with the rest of the UI rendering. It
// needs returning to how it was pre-port to Notan, eventually.
fn draw_log(draw: &mut notan::draw::Draw, font: &notan::draw::Font) {
let log = gamelog::LOG.lock().unwrap();
let mut text: String = Default::default();
log.iter()
.rev()
.take(9)
.for_each(|log| {
log.iter().for_each(|frag| {
text += &frag.text.to_string();
});
text += "\n";
});
draw.text(font, &text)
.position(TILESIZE, TILESIZE)
.size(FONTSIZE)
.color(Color::WHITE)
.max_width((VIEWPORT_W as f32) * TILESIZE);
}