fmt

src/camera.rs

@@ -1,4 +1,3 @@
-
 use crate::{ray::Ray, util::deg_to_rad, vec3::Vec3};
 
 #[derive(Debug)]

src/main.rs

@@ -1,11 +1,11 @@
 #![feature(core_float_math)]
 
-mod util;
 mod camera;
 mod objects;
 mod ray;
 mod raytracer;
 mod scenes;
+mod util;
 mod vec3;
 
 use std::{env, fs};

src/objects/materials.rs

@@ -1,6 +1,6 @@
+pub mod colour_source;
 pub mod dielectric;
 pub mod lambertian;
 pub mod normal;
-pub mod traits;
 pub mod texture;
-pub mod colour_source;
+pub mod traits;

src/objects/materials/texture.rs

@@ -1,10 +1,7 @@
 use image::{DynamicImage, ImageReader};
 use log::trace;
 
-use crate::{
+use crate::{objects::hit::Hit, vec3::Vec3};
-    objects::hit::Hit,
-    vec3::Vec3,
-};
 
 #[derive(Debug)]
 pub struct Texture {
@@ -47,7 +44,7 @@ impl Texture {
     }
 
     fn _idx(&self, u: f32, v: f32) -> usize {
-        let x: usize = (u * ((self.width - 1) as f32)) as usize; 
+        let x: usize = (u * ((self.width - 1) as f32)) as usize;
         let y: usize = (v * ((self.height - 1) as f32)) as usize;
 
         y * self.width as usize + x

src/objects/materials/traits.rs

@@ -1,6 +1,6 @@
 use crate::{objects::hit::Hit, ray::Ray, vec3::Colour};
 use std::fmt::Debug;
 
-pub trait Material: Debug + Send + Sync{
+pub trait Material: Debug + Send + Sync {
     fn scatter(&self, hit: &Hit, ray: &Ray) -> Option<(Option<Ray>, Colour)>;
 }

src/objects/mesh.rs

@@ -0,0 +1 @@
+

src/objects/sphere.rs

@@ -3,11 +3,11 @@ use std::f32::consts::PI;
 use std::fmt::{self, Debug};
 use std::sync::Arc;
 
-use crate::Vec3;
 use crate::objects::hit::Hit;
 use crate::objects::materials::traits::Material;
 use crate::objects::traits::Hittable;
 use crate::ray::Ray;
+use crate::Vec3;
 
 pub struct Sphere {
     center: Vec3,

src/objects/traits.rs

@@ -1,10 +1,10 @@
 use std::fmt::Debug;
 
-use crate::Ray;
 use crate::objects::hit::Hit;
 use crate::vec3::Vec3;
+use crate::Ray;
 
 pub trait Hittable: Debug + Send + Sync {
-    fn to_uv(&self, point: &Vec3) -> Vec3; 
+    fn to_uv(&self, point: &Vec3) -> Vec3;
     fn hit(&self, r: &Ray) -> Option<Hit>;
 }

src/raytracer.rs

@@ -1,4 +1,4 @@
-use image::{ExtendedColorType, ImageEncoder, codecs::png::PngEncoder};
+use image::{codecs::png::PngEncoder, ExtendedColorType, ImageEncoder};
 use log::{error, info, trace};
 use rayon::iter::IntoParallelIterator;
 use rayon::prelude::*;

src/scenes.rs

@@ -1,4 +1,4 @@
-pub mod raw_camera;
-pub mod material_def;
 pub mod hittable_def;
+pub mod material_def;
+pub mod raw_camera;
 pub mod scene;

src/scenes/material_def.rs

@@ -2,8 +2,13 @@ use std::sync::Arc;
 
 use serde::Deserialize;
 
-use crate::objects::materials::{dielectric::Dielectric, lambertian::{Lambertian, Metal}, normal::Normal, texture::Texture, traits::Material};
+use crate::objects::materials::{
-
+    dielectric::Dielectric,
+    lambertian::{Lambertian, Metal},
+    normal::Normal,
+    texture::Texture,
+    traits::Material,
+};
 
 #[derive(Deserialize)]
 #[serde(tag = "type", rename_all = "lowercase")]

src/util.rs

@@ -3,4 +3,3 @@ use std::f32::consts::PI;
 pub(crate) fn deg_to_rad(deg: f32) -> f32 {
     deg * PI / 180.
 }
-

src/vec3.rs

@@ -67,7 +67,11 @@ impl Vec3 {
 
     pub fn random_unit_hemisphere(n: &Self) -> Self {
         let v = Self::random_unit();
-        if n.dot(&v) > 0.0 { v } else { -v }
+        if n.dot(&v) > 0.0 {
+            v
+        } else {
+            -v
+        }
     }
 
     pub fn x(&self) -> &f32 {