Browse Source

Somewhat structure main.rs

main
Adrian Heine 3 years ago
parent
commit
2f06f9b0b7
  1. 14
      src/main.rs
  2. 3
      src/view.rs

14
src/main.rs

@ -1,5 +1,5 @@
use gntag::agent::{Agent, SimpleAgent}; use gntag::agent::{Agent, SimpleAgent};
use gntag::view::TerminalView;
use gntag::view::{Backend, TerminalView};
use gntag::world::ActualWorld; use gntag::world::ActualWorld;
use std::io; use std::io;
use std::io::Read; use std::io::Read;
@ -9,6 +9,8 @@ use std::thread;
fn main() { fn main() {
let view = Arc::new(Mutex::new(Some(TerminalView::try_new().unwrap()))); let view = Arc::new(Mutex::new(Some(TerminalView::try_new().unwrap())));
// Exit on q, ESC and Ctrl-C and reset terminal
let view2 = view.clone(); let view2 = view.clone();
thread::spawn(move || { thread::spawn(move || {
let stdin = io::stdin(); let stdin = io::stdin();
@ -22,7 +24,13 @@ fn main() {
} }
} }
}); });
loop { loop {
run_simulation(&view);
}
}
fn run_simulation(view: &Arc<Mutex<Option<TerminalView<impl Backend>>>>) {
let (width, height) = (*view.lock().unwrap()) let (width, height) = (*view.lock().unwrap())
.as_mut() .as_mut()
.unwrap() .unwrap()
@ -59,11 +67,9 @@ fn main() {
) )
.unwrap(); .unwrap();
if resized { if resized {
break;
return;
}; };
world.do_step(); world.do_step();
gen += 1; gen += 1;
//std::thread::sleep(std::time::Duration::from_millis(500));
}
} }
} }

3
src/view.rs

@ -3,7 +3,8 @@ use std::error::Error;
use std::io::{stdout, Stdout, Write}; use std::io::{stdout, Stdout, Write};
use termion::clear; use termion::clear;
use termion::raw::{IntoRawMode, RawTerminal}; use termion::raw::{IntoRawMode, RawTerminal};
use tui::backend::{Backend, TermionBackend};
pub use tui::backend::Backend;
use tui::backend::TermionBackend;
use tui::layout::{Alignment, Constraint, Direction, Layout, Rect}; use tui::layout::{Alignment, Constraint, Direction, Layout, Rect};
use tui::style::{Color, Modifier, Style}; use tui::style::{Color, Modifier, Style};
use tui::text::{Span, Spans}; use tui::text::{Span, Spans};

Loading…
Cancel
Save