Pass 1/z into rasterizer and already interpolate on polygon edges

Georg Hopp
1 parent 9911ab01
Showing 4 changed files with 114 additions and 97 deletions
fractional/src/easel.rs
fractional/src/geometry.rs
fractional/src/main.rs
fractional/src/xcb.rs
--- a/fractional/src/easel.rs
View file @df1eb1c
+++ b/fractional/src/easel.rs
View file @df1eb1c
@@ -22,13 +22,14 @@
 //
 use std::cmp;
 use std::fmt::{Formatter, Display, Result};
+use std::ops::{Add, Sub, Div};
 use std::sync::mpsc;
 pub trait Easel {
     //fn canvas(&mut self, width :u16, height :u16) -> Option<&dyn Canvas>;
 }
-pub trait Canvas {
+pub trait Canvas<T> {
     fn init_events(&self);
     fn start_events(&self, tx :mpsc::Sender<i32>);
@@ -36,65 +37,71 @@ pub trait Canvas {
     fn height(&self) -> u16;
     fn clear(&mut self);
-    fn draw(&mut self, c :&dyn Drawable, ofs :Coordinate, color :u32);
-    fn put_text(&self, ofs :Coordinate, s :&str);
+    fn draw(&mut self, c :&dyn Drawable<T>, ofs :Coordinate<T>, color :u32);
+    fn put_text(&self, ofs :Coordinate<T>, s :&str);
     fn show(&self);
 }
-pub trait Drawable {
-    fn plot(&self) -> Coordinates;
+pub trait Drawable<T> {
+    fn plot(&self) -> Coordinates<T>;
 }
 #[derive(Debug, Clone, Copy)]
-pub struct Coordinate(pub i32, pub i32);
+pub struct Coordinate<T>(pub i32, pub i32, pub T);
 #[derive(Debug, Clone)]
-pub struct Coordinates(pub Vec<Coordinate>);
+pub struct Coordinates<T>(pub Vec<Coordinate<T>>);
-impl Coordinate {
+impl<T> Coordinate<T>
+where T: Add<Output = T> + Sub<Output = T> + Div<Output = T>
+       + Clone + Copy + From<i32> {
     // Tail recursive Bresenham line with integer incremental error.
     fn line(self, b :&Self) -> Vec<Self> {
-        fn inner( v :&mut [Coordinate]
+        fn inner<T>( v :&mut [Coordinate<T>]
                   , bx :i32, by :i32
                   , dx :i32, dy :i32
                   , sx :i32, sy :i32
-                  , err :i32) {
-            let Coordinate(x, y) = v[0];
+                  , dz :T, err :i32)
+            where T: Add<Output = T> + Copy {
+
+            let Coordinate(x, y, z) = v[0];
             if x != bx || y != by {
-                let (x, y, err) = match (2*err >= dy, 2*err <= dx) {
-                    (true, false) => (x + sx,      y, err + dy),
-                    (false, true) => (     x, y + sy, err + dx),
-                    _             => (x + sx, y + sy, err + dx + dy ),
+                let (x, y, z, err) = match (2*err >= dy, 2*err <= dx) {
+                    (true, false) => (x + sx,      y, z + dz,      err + dy ),
+                    (false, true) => (     x, y + sy, z + dz,      err + dx ),
+                    _             => (x + sx, y + sy, z + dz, err + dx + dy ),
                 };
-                v[1] = Coordinate(x, y);
-                inner(&mut v[1..], bx, by, dx, dy, sx, sy, err);
+                v[1] = Coordinate(x, y, z);
+                inner(&mut v[1..], bx, by, dx, dy, sx, sy, dz, err);
             }
         }
-        let Coordinate(ax, ay) = self;
-        let Coordinate(bx, by) = *b;
+        let Coordinate(ax, ay, az) = self;
+        let Coordinate(bx, by, bz) = *b;
         let dx      = (bx - ax).abs();
         let sx :i32 = if ax < bx { 1 } else { -1 };
         let dy      = -(by - ay).abs();
         let sy :i32 = if ay < by { 1 } else { -1 };
+        let size    = cmp::max(dx, -dy);
+        let dz      = (bz - az) / size.into();
-        let mut v :Vec<Self> = vec!( Coordinate(0, 0)
-                                   ; cmp::max(dx, -dy) as usize + 1);
-        v[0] = Coordinate(ax, ay);
-        inner(&mut v, bx, by, dx, dy, sx, sy, dx + dy);
+        let mut v :Vec<Self> = vec!( Coordinate(0, 0, 0.into())
+                                   ; (size as usize) + 1);
+        v[0] = Coordinate(ax, ay, az);
+        inner(&mut v, bx, by, dx, dy, sx, sy, dz, dx + dy);
         v
     }
 }
-impl Display for Coordinate {
+impl<T> Display for Coordinate<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         write!(f, "<{},{}>", self.0, self.1)
     }
 }
-impl Display for Coordinates {
+impl<T> Display for Coordinates<T> where T: Copy {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         let Coordinates(is) = self;
@@ -116,16 +123,16 @@ impl Display for Coordinates {
 #[derive(Debug, Clone, Copy)]
-pub struct Point(pub Coordinate);
+pub struct Point<T>(pub Coordinate<T>);
-impl Drawable for Point{
-    fn plot(&self) -> Coordinates {
+impl<T> Drawable<T> for Point<T> where T: Copy {
+    fn plot(&self) -> Coordinates<T> {
         let Point(c) = *self;
         Coordinates(vec!(c))
     }
 }
-impl Display for Point {
+impl<T> Display for Point<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         let Point(p) = self;
         write!(f, "Point[{}]", p)
@@ -133,30 +140,36 @@ impl Display for Point {
 }
 #[derive(Debug, Clone, Copy)]
-pub struct Line(pub Coordinate, pub Coordinate);
+pub struct Line<T>(pub Coordinate<T>, pub Coordinate<T>);
-impl Drawable for Line {
-    fn plot(&self) -> Coordinates {
+impl<T> Drawable<T> for Line<T>
+where T: Add<Output = T> + Sub<Output = T> + Div<Output = T>
+       + Clone + Copy + From<i32> {
+    fn plot(&self) -> Coordinates<T> {
         let Line(a, b) = *self;
         Coordinates(a.line(&b))
     }
 }
-impl Display for Line {
+impl<T> Display for Line<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         let Line(a, b) = self;
         write!(f, "Line[{},{}]", a, b)
     }
 }
+// In 3D a rectangle is not as trivial as in 2D, it might be somehow rotate
+// and thus we need to specify a Z offset for the other two corners.
+// As I do not need rectangle at all I just comment out this code for now.
+/*
 #[derive(Debug, Clone, Copy)]
-pub struct Rectangle(pub Coordinate, pub Coordinate);
+pub struct Rectangle<T>(pub Coordinate<T>, pub Coordinate<T>);
-impl Drawable for Rectangle {
-    fn plot(&self) -> Coordinates {
+impl<T> Drawable<T> for Rectangle<T> {
+    fn plot(&self) -> Coordinates<T> {
         let Rectangle(a, c)    = *self;
-        let Coordinate(ax, ay) = a;
-        let Coordinate(cx, cy) = c;
+        let Coordinate(ax, ay, az) = a;
+        let Coordinate(cx, cy, cz) = c;
         let b = Coordinate(cx, ay);
         let d = Coordinate(ax, cy);
@@ -177,16 +190,19 @@ impl Display for Rectangle {
         write!(f, "Rec[{},{}]", a, b)
     }
 }
+*/
 #[derive(Debug, Clone)]
-pub struct Polyline(pub Coordinates);
+pub struct Polyline<T>(pub Coordinates<T>);
-impl Drawable for Polyline {
-    fn plot(&self) -> Coordinates {
+impl<T> Drawable<T> for Polyline<T>
+where T: Add<Output = T> + Sub<Output = T> + Div<Output = T>
+       + Clone + Copy + From<i32> {
+    fn plot(&self) -> Coordinates<T> {
         let Polyline(Coordinates(cs)) = self;
         match cs[..] {
-            []     => Coordinates(Vec::<Coordinate>::new()),
+            []     => Coordinates(Vec::<Coordinate<T>>::new()),
             [a]    => Coordinates(vec!(a)),
             [a, b] => Coordinates(a.line(&b)),
             _      => {
@@ -203,7 +219,7 @@ impl Drawable for Polyline {
     }
 }
-impl Display for Polyline {
+impl<T> Display for Polyline<T> where T: Copy {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         let Polyline(a) = self;
         write!(f, "PLine[{}]", a)
@@ -211,14 +227,16 @@ impl Display for Polyline {
 }
 #[derive(Debug, Clone)]
-pub struct Polygon(pub Coordinates);
+pub struct Polygon<T>(pub Coordinates<T>);
-impl Drawable for Polygon {
-    fn plot(&self) -> Coordinates {
+impl<T> Drawable<T> for Polygon<T>
+where T: Add<Output = T> + Sub<Output = T> + Div<Output = T>
+       + Clone + Copy + From<i32> {
+    fn plot(&self) -> Coordinates<T> {
         let Polygon(Coordinates(cs)) = self;
         match cs[..] {
-            []     => Coordinates(Vec::<Coordinate>::new()),
+            []     => Coordinates(Vec::<Coordinate<T>>::new()),
             [a]    => Coordinates(vec!(a)),
             [a, b] => Coordinates(a.line(&b)),
             _      => {
@@ -240,7 +258,7 @@ impl Drawable for Polygon {
     }
 }
-impl Display for Polygon {
+impl<T> Display for Polygon<T> where T: Copy {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         let Polygon(a) = self;
         write!(f, "Poly[{}]", a)
--- a/fractional/src/geometry.rs
View file @df1eb1c
+++ b/fractional/src/geometry.rs
View file @df1eb1c
@@ -150,7 +150,7 @@ where T: Add + Sub + Neg + Mul + Div + Debug + Copy + Trig + From<i32> {
     fn project( &self
               , camera :&Camera<T>
               , light :&DirectLight<T>
-              , col :u32 ) -> Vec<(Polygon, u32)>;
+              , col :u32 ) -> Vec<(Polygon<T>, u32)>;
 }
 pub struct Camera<T>
@@ -173,7 +173,7 @@ where T: Add<Output = T> + Sub<Output = T> + Neg<Output = T>
     // equal to the size of the physical screen… e.g. window/canvas thus some
     // effects can't be done. See book for examples with different viewport
     // and screen sizes.
-    pub fn new(c :&dyn Canvas, angle :i32) -> Self {
+    pub fn new(c :&dyn Canvas<T>, angle :i32) -> Self {
         let  width :T = (c.width() as i32).into();
         let height :T = (c.height() as i32).into();
         let      d :T = 1.into();
@@ -194,9 +194,8 @@ where T: Add<Output = T> + Sub<Output = T> + Neg<Output = T>
         self.project
     }
-    pub fn project(&self, p :Point<T>) -> Coordinate {
-        let Point(v, _) = p.transform(&self.project);
-        Coordinate(T::round(&v.x()), T::round(&v.y()))
+    pub fn project(&self, p :Point<T>) -> Point<T> {
+        p.transform(&self.project)
     }
 }
@@ -318,6 +317,7 @@ impl<T> Primitives<T> for Polyeder<T>
 where T: Add<Output = T> + Sub<Output = T> + Neg<Output = T>
        + Mul<Output = T> + Div<Output = T>
        + Debug + Copy + Trig + From<i32> + PartialOrd {
+    // TODO Maybe this should also be an instance of Transformable…
     fn transform(&self, m :&TMatrix<T>) -> Self {
         let Polyeder{ points: ps, faces: fs } = self;
@@ -332,23 +332,24 @@ where T: Add<Output = T> + Sub<Output = T> + Neg<Output = T>
         p
     }
-    // TODO for now we assume already prejected vertices (points)
-    // in future we need to distinguish more clear between vertex and point
-    // and projected_point.
     fn project( &self
               , camera :&Camera<T>
               , light :&DirectLight<T>
-              , color :u32 ) -> Vec<(Polygon, u32)> {
+              , color :u32 ) -> Vec<(Polygon<T>, u32)> {
         // Helper to create a Polygon from Coordinates…
         // TODO probably there needs to be a Polygon constructor for this.
-        fn polygon<I>(c :I) -> Polygon
-        where I: Iterator<Item = Coordinate> {
+        fn polygon<I, T>(c :I) -> Polygon<T>
+        where I: Iterator<Item = Coordinate<T>> {
             Polygon(Coordinates(c.collect()))
         }
         // this one does the projection... as the projection was the last
         // matrix we do not need to do it here.
-        let to_coord = |p :&usize| camera.project(self.points[*p]);
+        let to_coord = |p :&usize| {
+            let Point(v, _) = camera.project(self.points[*p]);
+            println!("== {:?} / {:?}", self.points[*p], (v.z() - 1.into()).recip());
+            Coordinate(T::round(&v.x()), T::round(&v.y()), v.z() - 1.into())
+        };
         let to_poly  = |f :&Face<T>| {
                        let     pg    = polygon(f.corners.iter().map(to_coord));
                        let mut  r :T = (((color >> 16) & 0xFF) as i32).into();
@@ -374,7 +375,8 @@ where T: Add<Output = T> + Sub<Output = T> + Neg<Output = T>
                            None
                        }};
-        let mut ps :Vec<(Polygon, u32)> = self.faces.iter().filter_map(to_poly).collect();
+        let mut ps :Vec<(Polygon<T>, u32)> = self.faces.iter()
+                                        . filter_map(to_poly).collect();
         ps.sort_by(|a, b| a.1.cmp(&b.1));
         ps
     }
--- a/fractional/src/main.rs
View file @df1eb1c
+++ b/fractional/src/main.rs
View file @df1eb1c
@@ -30,13 +30,13 @@ use std::time::{Duration, Instant};
 use fractional::continuous::Continuous;
 use fractional::easel::{ Coordinate, Coordinates, Drawable, Line, Polyline
-                       , Polygon, Rectangle};
+                       , Polygon};
 use fractional::fractional::{Fractional, from_vector};
 use fractional::trigonometry::Trig;
 use fractional::vector::Vector;
 use fractional::transform::{TMatrix, Transformable};
-use fractional::xcb::XcbEasel;
+use fractional::xcb::{XcbEasel, XcbCanvas};
 use fractional::easel::Canvas;
 use fractional::geometry::{Camera,DirectLight,Polyeder,Primitives};
@@ -243,10 +243,10 @@ fn _transform<T>(v :Vector<T>, v1 :Vector<T>, v2 :Vector<T>, v3 :Vector<T>)
 }
 fn _line() {
-    let a = (Coordinate(0, 1), Coordinate(6, 4));
-    let b = (Coordinate(0, 4), Coordinate(6, 1));
-    let c = (Coordinate(1, 0), Coordinate(6, 8));
-    let d = (Coordinate(1, 8), Coordinate(6, 0));
+    let a = (Coordinate(0, 1, 0.0), Coordinate(6, 4, 0.0));
+    let b = (Coordinate(0, 4, 0.0), Coordinate(6, 1, 0.0));
+    let c = (Coordinate(1, 0, 0.0), Coordinate(6, 8, 0.0));
+    let d = (Coordinate(1, 8, 0.0), Coordinate(6, 0, 0.0));
     for i in [a, b, c, d].iter() {
         println!("{:>14} : {}", Line(i.0, i.1), Line(i.0, i.1).plot());
@@ -254,19 +254,15 @@ fn _line() {
     }
     println!();
-    let r = Rectangle(Coordinate(1, 1), Coordinate(10, 5));
-    println!("{:>14} : {}", r, r.plot());
-
-    println!();
     let pl = Polyline(
         Coordinates(vec!(a.0, a.1, b.0, b.1, c.0, c.1, d.0, d.1)));
     println!("{:>14} : {}", pl, pl.plot());
     println!();
     let pg = Polygon(
-        Coordinates(vec!( Coordinate(  0, -10)
-                        , Coordinate( 10,  10)
-                        , Coordinate(-10,  10) )));
+        Coordinates(vec!( Coordinate(  0, -10, 0.0)
+                        , Coordinate( 10,  10, 0.0)
+                        , Coordinate(-10,  10, 0.0) )));
     println!("{:>14} : {}", pg, pg.plot());
     let i = Vector(Fractional(  0,1), Fractional(-30,1), Fractional(0,1));
@@ -285,9 +281,9 @@ fn _line() {
     println!();
     let pg = Polygon(
-        Coordinates(vec!( Coordinate(to_i32(ix) + 100, to_i32(iy) + 100)
-                        , Coordinate(to_i32(jx) + 100, to_i32(jy) + 100)
-                        , Coordinate(to_i32(kx) + 100, to_i32(ky) + 100) )));
+        Coordinates(vec!( Coordinate(to_i32(ix) + 100, to_i32(iy) + 100, 0.0)
+                        , Coordinate(to_i32(jx) + 100, to_i32(jy) + 100, 0.0)
+                        , Coordinate(to_i32(kx) + 100, to_i32(ky) + 100, 0.0) )));
     println!("{:>14} : {}", pg, pg.plot());
     let i = Vector(  0.0, -30.0, 0.0);
@@ -305,9 +301,9 @@ fn _line() {
     println!();
     let pg = Polygon(
-        Coordinates(vec!( Coordinate(to_i32_2(ix) + 100, to_i32_2(iy) + 100)
-                        , Coordinate(to_i32_2(jx) + 100, to_i32_2(jy) + 100)
-                        , Coordinate(to_i32_2(kx) + 100, to_i32_2(ky) + 100) )));
+        Coordinates(vec!( Coordinate(to_i32_2(ix) + 100, to_i32_2(iy) + 100, 0.0)
+                        , Coordinate(to_i32_2(jx) + 100, to_i32_2(jy) + 100, 0.0)
+                        , Coordinate(to_i32_2(kx) + 100, to_i32_2(ky) + 100, 0.0) )));
     println!("{:>14} : {}", pg, pg.plot());
 }
@@ -327,8 +323,8 @@ fn _democanvas<T>( xcb         :&XcbEasel
                                                     // was 50.
     canvas.set_title(title);
-    canvas.init_events();
-    canvas.start_events(tx.clone());
+    <XcbCanvas as Canvas<T>>::init_events(&canvas);
+    <XcbCanvas as Canvas<T>>::start_events(&canvas, tx.clone());
     thread::spawn(move || {
         let     start = Instant::now();
@@ -351,11 +347,11 @@ fn _democanvas<T>( xcb         :&XcbEasel
                               , (       cube.transform(&rot2), 0x0000FF) );
             //let objects = vec!( (triangle.transform(&rot1), 0xFFFF00) );
-            canvas.clear();
+            <XcbCanvas as Canvas<T>>::clear(&mut canvas);
             for (o, color) in objects {
                 for (pg, c) in o.project(&camera, &light, color) {
-                    canvas.draw(&pg, Coordinate(0,0), c);
+                    canvas.draw(&pg, Coordinate(0, 0, 0.into()), c);
                 }
             }
@@ -367,10 +363,11 @@ fn _democanvas<T>( xcb         :&XcbEasel
             }
             last = last + step*(f + 1);
-            canvas.put_text( Coordinate(10, 15)
-                           , &format!( "sleep: {:?}"
-                                     , last - Instant::now() ));
-            canvas.show();
+            <XcbCanvas as Canvas<T>>::put_text( &canvas
+                                              , Coordinate(10, 15, 0.into())
+                                              , &format!( "sleep: {:?}"
+                                              , last - Instant::now() ));
+            <XcbCanvas as Canvas<T>>::show(&canvas);
             thread::sleep(last - Instant::now());
         }
     });
--- a/fractional/src/xcb.rs
View file @df1eb1c
+++ b/fractional/src/xcb.rs
View file @df1eb1c
@@ -129,7 +129,7 @@ fn getshm<'a>(size :usize) -> (i32, &'a mut [u32]) {
 impl Easel for XcbEasel {}
-impl<'a> Canvas for XcbCanvas<'a> {
+impl<'a,T> Canvas<T> for XcbCanvas<'a> {
     fn init_events(&self) {
         let mask = [( xcb::CW_EVENT_MASK, xcb::EVENT_MASK_EXPOSURE
                                         | xcb::EVENT_MASK_KEY_PRESS
@@ -223,18 +223,18 @@ impl<'a> Canvas for XcbCanvas<'a> {
         }
     }
-    fn draw(&mut self, d :&dyn Drawable, ofs :Coordinate, color: u32) {
-        let Coordinates(c)         = d.plot();
-        let Coordinate(xofs, yofs) = ofs;
+    fn draw(&mut self, d :&dyn Drawable<T>, ofs :Coordinate<T>, color: u32) {
+        let Coordinates(c)            = d.plot();
+        let Coordinate(xofs, yofs, _) = ofs;
-        for Coordinate(x, y) in c {
+        for Coordinate(x, y, _) in c {
             let idx :usize = ((y+yofs)*(self.width as i32)+x+xofs) as usize;
             self.shm[idx] = color;
         }
     }
-    fn put_text(&self, ofs :Coordinate, s :&str) {
-        let Coordinate(xofs, yofs) = ofs;
+    fn put_text(&self, ofs :Coordinate<T>, s :&str) {
+        let Coordinate(xofs, yofs, _) = ofs;
         xcb::xproto::image_text_8( &self.conn, self.pixmap, self.gc
                                  , xofs as i16, yofs as i16, s );
         self.conn.flush();
@@ -242,8 +242,8 @@ impl<'a> Canvas for XcbCanvas<'a> {
     fn show(&self) {
         xcb::copy_area( &self.conn, self.pixmap, self.window, self.gc
-                        , 0, 0, 0, 0
-                        , self.width, self.height );
+                      , 0, 0, 0, 0
+                      , self.width, self.height );
         self.conn.flush();
     }
 }