1 files changed, 40 insertions, 22 deletions

diff --git a/src/viewport.rs b/src/viewport.rs
index afd11c1..37dfd21 100644
--- a/src/viewport.rs
+++ b/src/viewport.rs
@@ -1,5 +1,6 @@
 use crossterm::cursor::MoveTo;
 use crossterm::{execute, queue, Output};
+use log::debug;
 use std::io::{stdout, Write};
 
 use crate::entities::{Character, Entity, Player};
@@ -7,21 +8,28 @@ use crate::state::State;
 use crate::tiling::{tile_to_str, Tile, TileGrid, TileType};
 use crate::world::{apply_movement, Dungeon, Generatable, Level, Movement};
 
-
 pub trait ViewPort {
-    fn render_state(&mut self, &State);
+    fn render_state(&mut self, state: &State);
 }
 
 pub struct CrossTermViewPort {
     xsize: usize,
-    ysize: usize
+    ysize: usize,
+    // Use below when switching to moveable window
+    //start: (usize, usize)
 }
 
 impl CrossTermViewPort {
-    pub fn render_level(&self) {
+    pub fn new(xsize: usize, ysize: usize) -> CrossTermViewPort {
+        CrossTermViewPort { xsize, ysize }
+    }
+
+    fn draw_level(&self, state: &State) {
         let mut sout = stdout();
+        let grid = state.get_grid().unwrap();
         execute!(sout, MoveTo(0, 0)).unwrap();
-        for (linenum, line) in self.grid.as_ref().unwrap().raw_data().iter().enumerate() {
+        for (linenum, line) in grid.raw_data().iter().enumerate() {
+            debug!("Drawing linenum {} -- {:?}", linenum, line);
             let linestr = line.iter().map(tile_to_str).collect::<Vec<&str>>();
             let mut linestr2 = String::from("");
             for chr in linestr {
@@ -32,12 +40,13 @@ impl CrossTermViewPort {
         }
     }
 
-    fn render_entity(&self, entity: &dyn Entity) {
+    fn draw_entity(&self, state: &State, entity: &dyn Entity) {
         if !entity.is_visible() || !entity.is_dirty() {
             return;
         }
+        let grid = state.get_grid().unwrap();
         let dirt = entity.previous_location();
-        let background = self.grid.as_ref().unwrap().block_at(dirt.0, dirt.1);
+        let background = grid.block_at(dirt.0, dirt.1);
         let mut sout = stdout();
         queue!(
             sout,
@@ -50,32 +59,32 @@ impl CrossTermViewPort {
         sout.flush().unwrap();
     }
 
-    pub fn render_entities(&self) {
-        for e in self.current_level().entities.iter() {
-            self.render_entity(&**e);
+    fn draw_entities(&self, state: &State) {
+        for e in state.current_level().entities.iter() {
+            self.draw_entity(state, &**e);
         }
     }
 
-    pub fn render_player(&mut self) {
-        self.render_entity(&self.player);
-
-        self.grid
-            .as_mut()
-            .unwrap()
-            .clear_fog_of_war(self.player.location(), PLAYER_SIGHT);
+    fn draw_player(&mut self, state: &State) {
+        self.draw_entity(state, state.get_player());
     }
 
     fn ui_state_position(&self) -> MoveTo {
-        MoveTo(0, (self.dungeon.ysize()) as u16)
+        MoveTo(0, (self.ysize) as u16)
     }
 
     fn ui_notification_position(&self) -> MoveTo {
-        MoveTo(0, (self.dungeon.ysize() + 1) as u16)
+        MoveTo(0, (self.ysize + 1) as u16)
     }
 
-    pub fn render_ui(&self) {
+    fn draw_ui(&self, state: &State) {
         let mut sout = stdout();
-        queue!(sout, self.ui_state_position(), Output(self.player.stats())).unwrap();
+        queue!(
+            sout,
+            self.ui_state_position(),
+            Output(state.get_player().stats())
+        )
+        .unwrap();
         sout.flush().unwrap();
     }
 
@@ -84,7 +93,7 @@ impl CrossTermViewPort {
         queue!(
             sout,
             self.ui_notification_position(),
-            Output(" ".repeat(self.dungeon.xsize())),
+            Output(" ".repeat(self.xsize)),
             self.ui_notification_position(),
             Output(message)
         )
@@ -98,3 +107,12 @@ impl CrossTermViewPort {
         ))
     }
 }
+
+impl ViewPort for CrossTermViewPort {
+    fn render_state(&mut self, state: &State) {
+        self.draw_level(state);
+        self.draw_entities(state);
+        self.draw_player(state);
+        self.draw_ui(state);
+    }
+}