trying to get new Bsp to work; update docs

engine/src/engine.rs

@@ -78,7 +78,7 @@ impl<N: Coordinate> Size<N> for [N;2] {
     #[inline] fn y (&self) -> N { self[1] }
 }
 
-pub trait Area<N: Coordinate>: Copy {
+pub trait Area<N: Coordinate> {
     fn x (&self) -> N;
     fn y (&self) -> N;
     fn w (&self) -> N;
@@ -133,6 +133,10 @@ pub trait Area<N: Coordinate>: Copy {
         [self.x(), self.y(), self.w(), self.h().minus(y)]
     }
 
+    #[inline] fn center (&self) -> [N;2] {
+        [self.x() + self.w() / 2.into(), self.y() + self.h() / 2.into()]
+    }
+
     fn zero () -> [N;4] {
         [N::zero(), N::zero(), N::zero(), N::zero()]
     }

engine/src/output.rs

@@ -31,17 +31,39 @@ pub trait Content<E: Engine>: Send + Sync {
 }
 
 impl<E: Engine> Content<E> for () {
-    fn area (&self, area: E::Area) -> E::Area {
+    fn area (&self, _: E::Area) -> E::Area {
         [0.into(), 0.into(), 0.into(), 0.into()].into()
     }
-    fn render (&self, output: &mut E::Output) {}
+    fn render (&self, _: &mut E::Output) {}
 }
 
-impl<E: Engine, T: Content<E>> Content<E> for &T {}
+impl<E: Engine, T: Content<E>> Content<E> for &T {
+    fn content (&self) -> impl Content<E> {
+        (*self).content()
+    }
+    fn area (&self, area: E::Area) -> E::Area {
+        (*self).area(area)
+    }
+    fn render (&self, output: &mut E::Output) {
+        (*self).render(output)
+    }
+}
 
-impl<E: Engine, T: Content<E>> Content<E> for Option<T> {}
-
-impl<E: Engine, T: Content<E>> Content<E> for Vec<T> {}
+impl<E: Engine, T: Content<E>> Content<E> for Option<T> {
+    fn content (&self) -> impl Content<E> {
+        self.as_ref()
+            .map(|content|content.content())
+    }
+    fn area (&self, area: E::Area) -> E::Area {
+        self.as_ref()
+            .map(|content|content.area(area))
+            .unwrap_or([0.into(), 0.into(), 0.into(), 0.into(),].into())
+    }
+    fn render (&self, output: &mut E::Output) {
+        self.as_ref()
+            .map(|content|content.render(output));
+    }
+}
 
 pub struct Thunk<E: Engine, T: Content<E>, F: Fn()->T + Send + Sync>(F, PhantomData<E>);
 

engine/src/tui.rs

@@ -255,10 +255,14 @@ impl Output<Tui> for TuiOutput {
     #[inline] fn area (&self) -> [u16;4] { self.area }
     #[inline] fn area_mut (&mut self) -> &mut [u16;4] { &mut self.area }
     #[inline] fn place (&mut self, area: [u16;4], content: &impl Content<Tui>) {
-        let last = self.area();
-        *self.area_mut() = area;
+        let last = self.area().xywh().clone();
+        //panic!("a {last:?} {area:?} {:?}", self.area);
+        *self.area_mut() = area.xywh().clone();
+        //panic!("b {last:?} {area:?} {:?}", self.area);
         content.render(self);
+        //panic!("c {last:?} {area:?} {:?}", self.area);
         *self.area_mut() = last;
+        //panic!("placed");
     }
 }
 
@@ -330,12 +334,18 @@ pub fn half_block (lower: bool, upper: bool) -> Option<char> {
 //impl<T: Content<Tui>> Render<Tui> for T {}
 
 impl Content<Tui> for &str {
+    fn area (&self, to: [u16;4]) -> [u16;4] {
+        [to[0], to[1], self.chars().count() as u16, 1]
+    }
     fn render (&self, to: &mut TuiOutput) {
         to.blit(self, to.area.x(), to.area.y(), None)
     }
 }
 
 impl Content<Tui> for String {
+    fn area (&self, to: [u16;4]) -> [u16;4] {
+        [to[0], to[1], self.chars().count() as u16, 1]
+    }
     fn render (&self, to: &mut TuiOutput) {
         to.blit(self, to.area.x(), to.area.y(), None)
     }