Somewhat structure main.rs

src/main.rs

@@ -1,5 +1,5 @@
 use gntag::agent::{Agent, SimpleAgent};
-use gntag::view::TerminalView;
+use gntag::view::{Backend, TerminalView};
 use gntag::world::ActualWorld;
 use std::io;
 use std::io::Read;
@@ -9,6 +9,8 @@ use std::thread;
 
 fn main() {
   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();
   thread::spawn(move || {
     let stdin = io::stdin();
@@ -22,48 +24,52 @@ fn main() {
       }
     }
   });
-  loop {
-    let (width, height) = (*view.lock().unwrap())
-      .as_mut()
-      .unwrap()
-      .content_size()
-      .unwrap();
-    let mut agents: Vec<(_, Box<dyn Agent>)> = vec![];
-    for x in (0..width).step_by(10) {
-      for y in (0..height).step_by(10) {
-        agents.push(((x, y).into(), Box::new(SimpleAgent)));
-      }
-    }
-    let mut world = ActualWorld::new((width, height).into(), agents);
 
-    let mut gen = 0;
+  loop {
-    loop {
+    run_simulation(&view);
-      let resized = (*view.lock().unwrap())
+  }
-        .as_mut()
+}
-        .unwrap()
+
-        .draw(
+fn run_simulation(view: &Arc<Mutex<Option<TerminalView<impl Backend>>>>) {
-          gen,
+  let (width, height) = (*view.lock().unwrap())
-          world
+    .as_mut()
-            .state
+    .unwrap()
-            .agent_positions
+    .content_size()
-            .get(&world.state.tagged)
+    .unwrap();
-            .map(|pos| (pos.x, pos.y))
+  let mut agents: Vec<(_, Box<dyn Agent>)> = vec![];
-            .unwrap(),
+  for x in (0..width).step_by(10) {
-          world
+    for y in (0..height).step_by(10) {
-            .state
+      agents.push(((x, y).into(), Box::new(SimpleAgent)));
-            .agent_positions
+    }
-            .iter()
+  }
-            .map(|(_id, pos)| (pos.x, pos.y))
+  let mut world = ActualWorld::new((width, height).into(), agents);
-            .collect::<Vec<_>>()
+
-            .as_ref(),
+  let mut gen = 0;
-        )
+  loop {
-        .unwrap();
+    let resized = (*view.lock().unwrap())
-      if resized {
+      .as_mut()
-        break;
+      .unwrap()
-      };
+      .draw(
-      world.do_step();
+        gen,
-      gen += 1;
+        world
-      //std::thread::sleep(std::time::Duration::from_millis(500));
+          .state
-    }
+          .agent_positions
+          .get(&world.state.tagged)
+          .map(|pos| (pos.x, pos.y))
+          .unwrap(),
+        world
+          .state
+          .agent_positions
+          .iter()
+          .map(|(_id, pos)| (pos.x, pos.y))
+          .collect::<Vec<_>>()
+          .as_ref(),
+      )
+      .unwrap();
+    if resized {
+      return;
+    };
+    world.do_step();
+    gen += 1;
   }
 }

src/view.rs

@@ -3,7 +3,8 @@ use std::error::Error;
 use std::io::{stdout, Stdout, Write};
 use termion::clear;
 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::style::{Color, Modifier, Style};
 use tui::text::{Span, Spans};