clean

Author: donbright

src/base/context.rs

@@ -1,6 +1,6 @@
-use crate::base::SimpleMesh;
 use nalgebra::Matrix4;
-use std::f32;
+use crate::base::SimpleMesh;
+use std::{f32};
 
 pub struct Context {
     pub utransform: Matrix4<f32>,
@@ -15,12 +15,15 @@ impl Context {
         //TODO: Make this a constant struct
         Context {
             utransform: Matrix4::new(
-                1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
+                1.0, 0.0, 0.0, 0.0,
+                0.0, 1.0, 0.0, 0.0,
+                0.0, 0.0, 1.0, 0.0,
+                0.0, 0.0, 0.0, 1.0,
             ),
             width: 0,
             height: 0,
             frame_buffer: vec![],
-            z_buffer: vec![],
+            z_buffer: vec![]
         }
     }
     pub fn clear(&mut self) {
@@ -36,14 +39,11 @@ impl Context {
         for pixel in &self.frame_buffer {
             x.push_str(pixel);
         }
-        println!(
-            "{}{}{}",
-            termion::clear::All,
-            termion::cursor::Goto(1, 1),
-            x
-        );
+        println!("{}{}{}", termion::clear::All, termion::cursor::Goto(1, 1), x);
     }
-    pub fn update(&mut self, mut old_size: (u16, u16), meshes: &[SimpleMesh]) {
+    pub fn update(&mut self, mut old_size: (u16, u16),
+        meshes: &[SimpleMesh],
+        ) {
         let terminal_size = termion::terminal_size().unwrap(); // Temporary size
         if old_size != terminal_size {
             // Check if the size changed
@@ -57,23 +57,10 @@ impl Context {
                     .max(mesh.bounding_box.max.z);
             }
             scale = f32::from(old_size.1).min(f32::from(old_size.0) / 2.0) / scale / 2.0; // Constrain to width and height, whichever is smaller
-            let t = Matrix4::new(
-                scale,
-                0.0,
-                0.0,
-                f32::from(old_size.0) / 4.0, // X translation is divided by 4 because there's a 1 char space between charxels
-                0.0,
-                -scale,
-                0.0,
-                f32::from(old_size.1) / 2.0, // Y translation is divided by 2 to center
-                0.0,
-                0.0,
-                scale,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                1.0,
+            let t = Matrix4::new(scale,    0.0,   0.0, f32::from(old_size.0) / 4.0, // X translation is divided by 4 because there's a 1 char space between charxels
+                                0.0, -scale,   0.0, f32::from(old_size.1) / 2.0, // Y translation is divided by 2 to center
+                                0.0,    0.0, scale,                         0.0,
+                                0.0,    0.0,   0.0,                         1.0,
             );
             self.utransform = t;
             self.width = (old_size.0) as usize;

src/base/rasterizer.rs

@@ -1,6 +1,6 @@
 use crate::base::{Context, SimpleMesh, Triangle};
+use termion::{color};
 use nalgebra::{Matrix4, Vector4};
-use termion::color;
 
 pub fn default_shader(shade: f32) -> String {
     let string = if shade <= 0.20 {
@@ -37,44 +37,25 @@ fn orient_triangle(triangle: &Triangle) -> f32 {
 }
 
 // Writes multiple meshes to context
-pub fn draw_mesh<F>(context: &mut Context, mesh: &SimpleMesh, transform: Matrix4<f32>, shader: F)
-where
-    F: Fn(f32) -> String,
-{
+pub fn draw_mesh<F>(context: &mut Context, mesh: &SimpleMesh, transform: Matrix4<f32>, shader: F) where F: Fn(f32) -> String {
     for triangle in &mesh.triangles {
         draw_triangle(context, &triangle, transform, &shader);
     }
 }
 
 fn bg(src: String, bg: (u8, u8, u8)) -> String {
-    format!(
-        "{}{}{}{}",
-        color::Fg(color::Rgb(bg.0, bg.1, bg.2)),
-        color::Bg(color::Rgb(25, 25, 25)),
-        src,
-        color::Fg(color::Reset)
-    )
+    format!("{}{}{}{}", color::Fg(color::Rgb(bg.0, bg.1, bg.2)),
+                        color::Bg(color::Rgb(25,25,25)), 
+                      src, 
+                      color::Fg(color::Reset))
 }
 
-pub fn draw_triangle<F>(
-    context: &mut Context,
-    triangle: &Triangle,
-    transform: Matrix4<f32>,
-    shader: F,
-) where
-    F: Fn(f32) -> String,
-{
+pub fn draw_triangle<F>(context: &mut Context, triangle: &Triangle, transform: Matrix4<f32>, shader: F) where F: Fn(f32) -> String {
     let mut dist_triangle = triangle.clone();
     dist_triangle.mul(context.utransform * transform);
     let aabb = dist_triangle.to_aabb(); // Calculate triangle bounds
-    let mins: (usize, usize) = (
-        aabb.min[0].max(1.0).ceil() as usize,
-        aabb.min[1].max(1.0).ceil() as usize,
-    );
-    let maxs: (usize, usize) = (
-        (aabb.max[0] * 2.0).min((context.width - 1) as f32).ceil() as usize,
-        aabb.max[1].min((context.height - 1) as f32).ceil() as usize,
-    );
+    let mins: (usize, usize) = (aabb.min[0].max(1.0).ceil() as usize, aabb.min[1].max(1.0).ceil() as usize);
+    let maxs: (usize, usize) = ((aabb.max[0] * 2.0).min((context.width - 1) as f32).ceil() as usize, aabb.max[1].min((context.height - 1) as f32).ceil() as usize);
     let a = 1.0 / orient_triangle(&dist_triangle);
 
     for y in mins.1..maxs.1 {
@@ -87,13 +68,13 @@ pub fn draw_triangle<F>(
                 let pixel_shade = dist_triangle.normal().z * a * (w0 + w1 + w2);
                 let z = dist_triangle.v1[2]
                     + a * (w1 * (dist_triangle.v2[2] - dist_triangle.v1[2])
-                        + w2 * (dist_triangle.v3[2] - dist_triangle.v1[2]));
+                         + w2 * (dist_triangle.v3[2] - dist_triangle.v1[2]));
                 let id = y * context.width + x * 2;
                 if z < context.z_buffer[id] {
                     context.z_buffer[id] = z;
                     let pixel = bg(shader(pixel_shade), dist_triangle.color);
                     context.frame_buffer[id] = (&pixel).to_string();
-                    context.frame_buffer[id + 1] = (&pixel).to_string();
+                    context.frame_buffer[id+1] = (&pixel).to_string();
                 }
             }
         }