ft: texture loading err handling

now uses a default placeholder texture + colour source

scenes/bench.json

@@ -13,15 +13,15 @@
     "focus_dist": 15.68
   },
   "materials": [
-    { "type": "lambertian", "albedo": [0.2, 0.2, 0.2], "prob": 0.8 },
-    { "type": "lambertian", "albedo": [0.9, 0.9, 0.0], "prob": 1.0, "fuzz": 0.1 },
+    { "type": "lambertian", "colour": [0.2, 0.2, 0.2], "prob": 0.8 },
+    { "type": "lambertian", "colour": [0.9, 0.9, 0.0], "prob": 1.0, "fuzz": 0.1 },
     { "type": "dielectric", "refraction_index": 1.5},
     { "type": "normal"}
  ],
   "objects": [
-    { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.5, "material": { "type": "metal", "albedo": [0.7, 0.4, 0.2], "prob": 1.0, "fuzz": 0.1 }},
+    { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.5, "material": { "type": "metal", "colour": [0.7, 0.4, 0.2], "prob": 1.0, "fuzz": 0.1 }},
     { "type": "sphere", "center": [-1, 0, -1], "radius": 0.4, "material": 3},
-    { "type": "sphere", "center": [1, 0, -1], "radius": 0.5, "material": { "type": "metal", "albedo": [0.8, 0.6, 0.2], "prob": 1.0, "fuzz": 1.0 }},
+    { "type": "sphere", "center": [1, 0, -1], "radius": 0.5, "material": { "type": "metal", "colour": [0.8, 0.6, 0.2], "prob": 1.0, "fuzz": 1.0 }},
     { "type": "triangle", "p1": [-4, 0, -4], "p2": [0, 0, -4], "p3": [-2, 2, -4], "material": 1},
     { "type": "triangle", "p1": [0, 0, -4], "p2": [4, 0, -4], "p3": [2, 2, -4], "material": 1},
     { "type": "triangle", "p1": [-2, 2, -4], "p2": [2, 2, -4], "p3": [0, 4, -4], "material": 3},
@@ -30,7 +30,7 @@
     { "type": "quad", "p1": [-20, -1, 20], "p2": [20, -1, 20], "p3": [20, -1, -20], "p4": [-20, -1, -20], "material": 0},
     { "type": "quad", "p1": [20, -1, 20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [20, 20, 20], "material": 0},
     { "type": "cube", "p1": [8, 0, 2], "p2": [12, 0, 2], "p3": [12, 4, 2], "p4": [8, 4, 2], "p5": [8, 0, -2], "p6": [12, 0, -2], "p7": [12, 4, -2], "p8": [8, 4, -2], "material": 3},
-    { "type": "circle", "center": [-9, 3, 0], "radius": 3, "normal": [0, 1, 0.5], "material": {"type": "metal", "albedo": [0.9, 0.9, 0.9], "prob": 1.0, "fuzz": 0.3}}
+    { "type": "circle", "center": [-9, 3, 0], "radius": 3, "normal": [0, 1, 0.5], "material": {"type": "metal", "colour": [0.9, 0.9, 0.9], "prob": 1.0, "fuzz": 0.3}}
  ]
 }
 

scenes/highDef.json

@@ -13,13 +13,13 @@
     "focus_dist": 15.68
   },
   "materials": [
-    { "type": "metal", "albedo": [0.2, 0.4, 0.8 ], "prob": 1.0, "fuzz": 0.1},
-    { "type": "metal", "albedo": [0.7, 0.4, 0.2 ], "prob": 1.0, "fuzz": 0.1},
-    { "type": "lambertian", "albedo": [0.8, 0.8, 0.0 ], "prob": 1.0},
-    { "type": "lambertian", "albedo": [0.1, 0.2, 0.5 ], "prob": 1.0},
+    { "type": "metal", "colour": [0.2, 0.4, 0.8 ], "prob": 1.0, "fuzz": 0.1},
+    { "type": "metal", "colour": [0.7, 0.4, 0.2 ], "prob": 1.0, "fuzz": 0.1},
+    { "type": "lambertian", "colour": [0.8, 0.8, 0.0 ], "prob": 1.0},
+    { "type": "lambertian", "colour": [0.1, 0.2, 0.5 ], "prob": 1.0},
     { "type": "dielectric", "refraction_index": 1.5},
     { "type": "dielectric", "refraction_index": 0.67},
-    { "type": "metal", "albedo": [0.8, 0.6, 0.2 ], "prob": 1.0, "fuzz": 1.0}
+    { "type": "metal", "colour": [0.8, 0.6, 0.2 ], "prob": 1.0, "fuzz": 1.0}
 
   ],
   "objects": [

scenes/lowDef.json

@@ -0,0 +1,37 @@
+{
+  "filename": "lowDef.png",
+  "image_width": 1920,
+  "image_height": 1080,
+  "max_depth": 50,
+  "camera": { 
+    "anti_alias_rate": 7,
+    "fov": 20.0,
+    "look_from": [10, 5, 10],
+    "look_at": [0.0, 0.0, -1.0], 
+    "vup": [0.0, 1.0, 0.0],
+    "defocus_angle": 0,
+    "focus_dist": 15.68
+  },
+  "materials": [
+    { "type": "metal", "colour": "./balls", "prob": 1.0, "fuzz": 0.1},
+    { "type": "metal", "colour": "./balls", "prob": 1.0, "fuzz": 0.1},
+    { "type": "lambertian", "colour": "balls", "prob": 1.0},
+    { "type": "metal", "colour": "./balls", "prob": 1.0, "fuzz": 0.1},
+    { "type": "dielectric", "colour": "balls", "refraction_index": 1.5},
+    { "type": "dielectric", "colour": "balls", "refraction_index": 1.5},
+    { "type": "dielectric", "colour": "balls", "refraction_index": 1.5}
+
+  ],
+  "objects": [
+    { "type": "sphere", "center": [0, 0.7, -0.4], "radius": 0.2, "material": 0},
+    { "type": "sphere", "center": [0.0, 0.5, -0.8], "radius": 0.1, "material": 1},
+    { "type": "sphere", "center": [0.0, -100.5, -1.0], "radius": 100.0, "material": 2},
+    { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.5, "material": 3},
+    { "type": "sphere", "center": [-1, 0, -1], "radius": 0.4, "material": 5},
+    { "type": "sphere", "center": [1, 0, -1], "radius": 0.5, "material": 6},
+    { "type": "sphere", "center": [20, 7, -15], "radius": 10.5, "material": 0}
+  ]
+}
+
+
+

scenes/scene.json

@@ -4,7 +4,7 @@
   "image_height": 1080,
   "max_depth": 50,
   "camera": { 
-    "anti_alias_rate": 23,
+    "anti_alias_rate": 2,
     "fov": 70.0,
     "look_from": [-10, 4, 15],
     "look_at": [-11.0, 0.0, 0.0], 
@@ -13,15 +13,15 @@
     "focus_dist": 15.68
   },
   "materials": [
-    { "type": "lambertian", "albedo": [0.2, 0.2, 0.2], "prob": 0.8 },
-    { "type": "lambertian", "albedo": [0.9, 0.9, 0.0], "prob": 1.0, "fuzz": 0.1 },
+    { "type": "lambertian", "colour": [0.2, 0.2, 0.2], "prob": 0.8 },
+    { "type": "lambertian", "colour": "./textures/ballnold.png", "prob": 1.0, "fuzz": 0.1 },
     { "type": "dielectric", "refraction_index": 1.5},
     { "type": "normal"}
  ],
   "objects": [
-    { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.5, "material": { "type": "metal", "albedo": [0.7, 0.4, 0.2], "prob": 1.0, "fuzz": 0.1 }},
+    { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.5, "material": { "type": "metal", "colour": [0.7, 0.4, 0.2], "prob": 1.0, "fuzz": 0.1 }},
     { "type": "sphere", "center": [-1, 0, -1], "radius": 0.4, "material": 3},
-    { "type": "sphere", "center": [1, 0, -1], "radius": 0.5, "material": { "type": "metal", "albedo": [0.8, 0.6, 0.2], "prob": 1.0, "fuzz": 1.0 }},
+    { "type": "sphere", "center": [1, 0, -1], "radius": 0.5, "material": { "type": "metal", "colour": [0.8, 0.6, 0.2], "prob": 1.0, "fuzz": 1.0 }},
     { "type": "triangle", "p1": [-4, 0, -4], "p2": [0, 0, -4], "p3": [-2, 2, -4], "material": 1},
     { "type": "triangle", "p1": [0, 0, -4], "p2": [4, 0, -4], "p3": [2, 2, -4], "material": 1},
     { "type": "triangle", "p1": [-2, 2, -4], "p2": [2, 2, -4], "p3": [0, 4, -4], "material": 3},
@@ -30,7 +30,7 @@
     { "type": "quad", "p1": [-20, -1, 20], "p2": [20, -1, 20], "p3": [20, -1, -20], "p4": [-20, -1, -20], "material": 0},
     { "type": "quad", "p1": [20, -1, 20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [20, 20, 20], "material": 0},
     { "type": "cube", "p1": [8, 0, 2], "p2": [12, 0, 2], "p3": [12, 4, 2], "p4": [8, 4, 2], "p5": [8, 0, -2], "p6": [12, 0, -2], "p7": [12, 4, -2], "p8": [8, 4, -2], "material": 3},
-    { "type": "circle", "center": [-9, 3, 0], "radius": 3, "normal": [0, 1, 0.5], "material": {"type": "metal", "albedo": [0.9, 0.9, 0.9], "prob": 1.0, "fuzz": 0.3}}
+    { "type": "circle", "center": [-9, 3, 0], "radius": 3, "normal": [0, 1, 0.5], "material": {"type": "metal", "colour": [0.9, 0.9, 0.9], "prob": 1.0, "fuzz": 0.3}}
  ]
 }
 

scenes/texture.json

@@ -1,35 +0,0 @@
-{
-  "filename": "textured.png",
-  "image_width": 1920,
-  "image_height": 1080,
-  "max_depth": 50,
-  "camera": { 
-    "anti_alias_rate": 2,
-    "fov": 50.0,
-    "look_from": [-3, 4, 10],
-    "look_at": [-3, 0.0, -10.0], 
-    "vup": [0.0, 1.0, 0.0],
-    "defocus_angle": 0,
-    "focus_dist": 15.68
-  },
-  "materials": [
-    { "type": "lambertian", "albedo": [0.2, 0.2, 0.2], "prob": 0.8 },
-    {"type": "texture", "source": "./textures/earthmap1k.png"},
-    {"type": "texture", "source": "./textures/bluegrid.png"}
- ],
-  "objects": [
-    { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.9, "material": 2},
-    { "type": "sphere", "center": [-2, 0, -1], "radius": 0.8, "material": 1},
-    { "type": "triangle", "p1": [0, 0, -4], "p2": [4, 0, -4], "p3": [2, 2, -4], "material": 2},
-    { "type": "triangle", "p1": [-2, 2, -4], "p2": [2, 2, -4], "p3": [0, 4, -4], "material": 1},
-    { "type": "quad", "p1": [-20, -1, -20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [-20, 20, -20], "material": 0},
-    { "type": "quad", "p1": [-20, -1, 20], "p2": [-20, -1, -20], "p3": [-20, 20, -20], "p4": [-20, 20, 20], "material": 0},
-    { "type": "quad", "p1": [-20, -1, 20], "p2": [20, -1, 20], "p3": [20, -1, -20], "p4": [-20, -1, -20], "material": 0},
-    { "type": "quad", "p1": [20, -1, 20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [20, 20, 20], "material": 0},
-    { "type": "quad", "p1": [-4, 3, -4], "p2": [-1, 3, -4], "p3": [-1, 6, -4], "p4": [-4, 6, -4], "material": 1},
-    { "type": "quad", "p1": [-8, 3, -4], "p2": [-5, 3, -4], "p3": [-5, 6, -4], "p4": [-8, 6, -4], "material": 2}
- ]
-}
-
-
-

src/camera.rs

@@ -1,11 +1,9 @@
-use std::{f32::consts::PI};
-
-use crate::{ray::Ray, vec3::Vec3};
+use crate::{ray::Ray, util::deg_to_rad, vec3::Vec3};
 
 #[derive(Debug)]
 pub struct Camera {
     // raytracing
-    pub anti_alias_rate: u32,
+    anti_alias_rate: u32,
     pixel00_loc: Vec3,
     pixel_delta_u: Vec3,
     pixel_delta_v: Vec3,
@@ -27,11 +25,6 @@ pub struct Camera {
     defocus_disk_v: Vec3,
 }
 
-// FIXME: kinda out of place in this file.
-fn deg_to_rad(deg: f32) -> f32 {
-    deg * PI / 180.
-}
-
 impl Camera {
     pub fn new() -> Self {
         Self {
@@ -83,7 +76,7 @@ impl Camera {
         }
     }
 
-    pub fn init(&mut self, w: f32, hi: f32) {
+    pub fn init(&mut self, width: u32, height: u32) {
         if !self.dirty {
             return;
         }
@@ -97,13 +90,13 @@ impl Camera {
 
         // viewport
         let viewport_height = 2. * h * self.focus_dist;
-        let viewport_width = viewport_height * (w / hi);
+        let viewport_width = viewport_height * (width as f32 / height as f32);
         let viewport_u = viewport_width * self.u;
         let viewport_v = viewport_height * -self.v;
 
         // variables
-        self.pixel_delta_u = viewport_u / w;
-        self.pixel_delta_v = viewport_v / hi;
+        self.pixel_delta_u = viewport_u / width;
+        self.pixel_delta_v = viewport_v / height;
         self.pixel00_loc =
             self.look_from - (self.focus_dist * self.w) - viewport_u / 2. - viewport_v / 2.;
         self.dirty = false;

src/main.rs

@@ -5,29 +5,23 @@ mod objects;
 mod ray;
 mod raytracer;
 mod scenes;
+mod util;
 mod vec3;
 
 use std::{env, fs};
-use std::sync::Arc;
 
-use crate::camera::Camera;
-use crate::objects::materials::dielectric::Dielectric;
-use crate::objects::materials::lambertian::{Lambertian, Metal};
-use crate::objects::sphere::Sphere;
-use crate::objects::traits::Hittable;
 use crate::ray::Ray;
 use crate::raytracer::render;
 use crate::scenes::scene::Scene;
 use crate::vec3::Vec3;
 use dotenv::dotenv;
-use rand::RngExt;
 
-// TODO: implement scene serialization
+// TODO (low priority): implement scene serialization
 fn main() {
     dotenv().ok();
     pretty_env_logger::init();
 
-    // TODO: better cli parsing
+    // TODO (medium priority): better cli parsing || add random flag to generate random scene
     let mut json_file = "./scenes/scene.json";
     let args: Vec<String> = env::args().collect();
     if args.len() > 1 {
@@ -37,92 +31,4 @@ fn main() {
     let json_str = fs::read_to_string(json_file).expect("Reading specified scene file failed!");
     let mut scene: Scene = serde_json::from_str(&json_str).unwrap();
     render(&mut scene);
-    return;
-
-    // random spheres code; thought: make this available as cli flag?
-    let ground = Lambertian::rgb(-2.5, 0.5, 0.5, 1.);
-    let mut world: Vec<Arc<dyn Hittable>> = vec![Arc::new(Sphere::xyz(
-        0.,
-        -1000.,
-        0.,
-        1000.,
-        Arc::new(ground),
-    ))];
-
-    let mut rng = rand::rng();
-    let point = Vec3::new(4., 0.2, 0.);
-    for a in -11..11 {
-        for b in -11..11 {
-            let mat = rng.random_range((0.)..1.);
-            let center = Vec3::new(
-                a as f32 + 0.9 * rng.random_range((0.)..1.),
-                0.2,
-                b as f32 + 0.9 * rng.random_range((0.)..1.),
-            );
-
-            if (center - point).length() > 0.9 {
-                if mat < 0.8 {
-                    // diffuse
-                    world.push(Arc::new(Sphere::new(
-                        center,
-                        0.2,
-                        Arc::new(Lambertian::new(Vec3::random() * Vec3::random(), 1.)),
-                    )));
-                } else if mat < 0.95 {
-                    // metal
-                    world.push(Arc::new(Sphere::new(
-                        center,
-                        0.2,
-                        Arc::new(Metal::rgb(
-                            rng.random_range(0.5..1.),
-                            rng.random_range(0.5..1.),
-                            rng.random_range(0.5..1.),
-                            1.,
-                            rng.random_range((0.)..0.5),
-                        )),
-                    )));
-                } else {
-                    // glass
-                    world.push(Arc::new(Sphere::new(
-                        center,
-                        0.2,
-                        Arc::new(Dielectric::new(1.5)),
-                    )));
-                }
-            }
-        }
-    }
-
-    world.push(Arc::new(Sphere::xyz(
-        0.,
-        1.,
-        0.,
-        1.,
-        Arc::new(Dielectric::new(1.5)),
-    )));
-    world.push(Arc::new(Sphere::xyz(
-        -4.,
-        1.,
-        0.,
-        1.,
-        Arc::new(Lambertian::rgb(0.4, 0.2, 0.1, 1.)),
-    )));
-    world.push(Arc::new(Sphere::xyz(
-        4.,
-        1.,
-        0.,
-        1.,
-        Arc::new(Metal::rgb(0.7, 0.6, 0.5, 1., 0.)),
-    )));
-
-    let mut c = Camera::new();
-    c.set_fov(20.);
-    c.set_anti_alias_rate(23);
-    c.set_vup(Vec3::new(0., 1., 0.));
-    c.set_look_from(Vec3::new(13., 2., 3.));
-    c.set_look_at(Vec3::new(0., 0., 0.));
-    c.add_defocus_blur(0.6, 10.);
-
-    let mut s = Scene::new(c, world, "output.png".to_string(), 1920, 1080, 50);
-    render(&mut s);
 }

src/objects.rs

@@ -1,6 +1,5 @@
 pub mod circle;
 pub mod cube;
-pub mod cylinder;
 pub mod hit;
 pub mod materials;
 pub mod mesh;

src/objects/circle.rs

@@ -61,7 +61,7 @@ impl Hittable for Circle {
 
     fn to_uv(&self, point: &Vec3) -> Vec3 {
         let p = *point - self.center;
-        // TODO: add rotated texture support
+        // TODO (low priority): add rotated texture support
         Vec3::new(
             0.5 + p.y().atan2(*p.x()) / (2. * PI),
             1. - (p.z() / self.radius).acos() / PI,

src/objects/cube.rs

@@ -43,7 +43,7 @@ impl Hittable for Cube {
     }
 
     fn to_uv(&self, _point: &Vec3) -> Vec3 {
-        // TODO: map to [0.1] relative to specific face
+        // TODO (low priority): map to [0.1] relative to specific face
         todo!()
     }
 }

src/objects/cylinder.rs

@@ -1,30 +0,0 @@
-use crate::{objects::traits::Hittable, vec3::Vec3};
-
-#[derive(Debug)]
-pub struct Cylinder {
-    radius: f32,
-    length: f32,
-    up: Vec3,
-    bottom_center: Vec3,
-}
-
-impl Cylinder {
-    pub fn new(radius: f32, length: f32, up: Vec3, bottom_center: Vec3) -> Self {
-        Self {
-            radius,
-            length,
-            up,
-            bottom_center,
-        }
-    }
-}
-
-impl Hittable for Cylinder {
-    fn hit(&self, _r: &crate::ray::Ray) -> Option<super::hit::Hit> {
-        todo!()
-    }
-
-    fn to_uv(&self, _point: &Vec3) -> Vec3 {
-        todo!()
-    }
-}

src/objects/hit.rs

@@ -17,7 +17,15 @@ pub struct Hit {
 }
 
 impl Hit {
-    pub fn new(t: f32, p: Vec3, n: Vec3, mat: Arc<dyn Material>, front_face: bool, u: f32, v: f32) -> Self {
+    pub fn new(
+        t: f32,
+        p: Vec3,
+        n: Vec3,
+        mat: Arc<dyn Material>,
+        front_face: bool,
+        u: f32,
+        v: f32,
+    ) -> Self {
         Self {
             t,
             p,
@@ -25,7 +33,26 @@ impl Hit {
             mat,
             front_face,
             u,
-            v
+            v,
+        }
+    }
+
+    pub fn from_minimal(
+        mh: MinimalHit,
+        n: Vec3,
+        mat: Arc<dyn Material>,
+        front_face: bool,
+        u: f32,
+        v: f32,
+    ) -> Self {
+        Self {
+            t: mh.t,
+            p: mh.p,
+            n,
+            mat,
+            front_face,
+            u,
+            v,
         }
     }
 
@@ -53,7 +80,7 @@ impl Hit {
         (self.u, self.v)
     }
 
-    // TODO: use front_face to discard back-hits for culling
+    // TODO (low priority): use front_face to discard back-hits for culling
     pub fn hit_list(hittables: &Vec<Arc<dyn Hittable>>, r: &Ray) -> Option<Hit> {
         let mut closest: Option<Hit> = None;
         for hittable in hittables {
@@ -69,3 +96,22 @@ impl Hit {
         closest
     }
 }
+
+pub struct MinimalHit {
+    t: f32,
+    p: Vec3,
+}
+
+impl MinimalHit {
+    pub fn new(t: f32, p: Vec3) -> Self {
+        Self { t, p }
+    }
+
+    pub fn t(&self) -> f32 {
+        self.t
+    }
+
+    pub fn p(&self) -> &Vec3 {
+        &self.p
+    }
+}

src/objects/materials.rs

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

src/objects/materials/colour_source.rs

@@ -0,0 +1,57 @@
+use serde::Deserialize;
+
+use crate::{
+    objects::{hit::Hit, materials::texture::Texture},
+    vec3::Colour,
+};
+
+#[derive(Debug)]
+pub enum ColourSource {
+    Colour(Colour),
+    Texture(Texture),
+}
+
+impl Default for ColourSource {
+    fn default() -> Self {
+        Self::rgb(1., 1., 1.)
+    }
+}
+
+impl ColourSource {
+    pub fn get_colour(&self, hit: &Hit) -> Colour {
+        match self {
+            ColourSource::Colour(vec3) => *vec3,
+            ColourSource::Texture(texture) => texture.colour_at(hit),
+        }
+    }
+
+    pub fn rgb(r: f32, g: f32, b: f32) -> Self {
+        Self::Colour(Colour::new(r, g, b))
+    }
+}
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum RawColourSource {
+    Colour(Colour),
+    Texture(String),
+}
+
+impl From<RawColourSource> for ColourSource {
+    fn from(value: RawColourSource) -> Self {
+        match value {
+            RawColourSource::Colour(c) => Self::Colour(c),
+            RawColourSource::Texture(t) => Self::Texture(Texture::new(&t)),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ColourSource {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let raw = RawColourSource::deserialize(deserializer)?;
+        Ok(raw.into())
+    }
+}

src/objects/materials/dielectric.rs

@@ -4,19 +4,33 @@ use rand::RngExt;
 use serde::Deserialize;
 
 use crate::{
-    objects::{hit::Hit, materials::traits::Material},
+    objects::{
+        hit::Hit,
+        materials::{colour_source::ColourSource, traits::Material},
+    },
     ray::Ray,
     vec3::Colour,
 };
 
+// THOUGHT: not entirely happy with this implementation; i ideally want to specify transparent
+// dielectrics, but that will require a more substantial refactor wrt compositing + vec4 colours.
 #[derive(Debug, Deserialize)]
 pub struct Dielectric {
+    #[serde(default)]
+    colour: ColourSource,
     refraction_index: f32,
 }
 
 impl Dielectric {
     pub fn new(refraction_index: f32) -> Self {
-        Self { refraction_index }
+        Self::new_coloured(refraction_index, ColourSource::rgb(1., 1., 1.))
+    }
+
+    pub fn new_coloured(refraction_index: f32, colour: ColourSource) -> Self {
+        Self {
+            refraction_index,
+            colour,
+        }
     }
 
     fn reflectance(cos: f32, refraction_index: f32) -> f32 {
@@ -50,6 +64,6 @@ impl Material for Dielectric {
         } else {
             unit.refract(hit.n(), ri)
         };
-        Some((Some(Ray::new(*hit.p(), dir)), Colour::new(1., 1., 1.)))
+        Some((Some(Ray::new(*hit.p(), dir)), self.colour.get_colour(hit)))
     }
 }

src/objects/materials/lambertian.rs

@@ -1,31 +1,44 @@
 use rand::RngExt;
 use serde::Deserialize;
+use std::fmt::Debug;
 
 use crate::{
-    objects::{hit::Hit, materials::traits::Material},
+    objects::{
+        hit::Hit,
+        materials::{colour_source::ColourSource, traits::Material},
+    },
     ray::Ray,
     vec3::{Colour, Vec3},
 };
 
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 pub struct Lambertian {
-    albedo: Colour,
+    colour: ColourSource,
     prob: f32,
 }
 
 impl Lambertian {
-    pub fn new(albedo: Colour, prob: f32) -> Self {
-        Self { albedo, prob }
+    pub fn new(colour: ColourSource, prob: f32) -> Self {
+        Self { colour, prob }
     }
 
     pub fn rgb(r: f32, g: f32, b: f32, prob: f32) -> Self {
         Self {
-            albedo: Colour::new(r, g, b),
+            colour: ColourSource::rgb(r, g, b),
             prob,
         }
     }
 }
 
+impl Debug for Lambertian {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Lambertian")
+            .field("prob", &self.prob)
+            .field("colour", &self.colour)
+            .finish()
+    }
+}
+
 impl Material for Lambertian {
     fn scatter(&self, hit: &Hit, _ray: &Ray) -> Option<(Option<Ray>, Colour)> {
         let mut rng = rand::rng();
@@ -35,7 +48,7 @@ impl Material for Lambertian {
                 dir = *hit.n();
             }
             let scattered = Ray::new(*hit.p(), dir);
-            return Some((Some(scattered), self.albedo));
+            return Some((Some(scattered), self.colour.get_colour(hit)));
         }
         None
     }
@@ -43,19 +56,19 @@ impl Material for Lambertian {
 
 #[derive(Debug, Deserialize)]
 pub struct Metal {
-    albedo: Colour,
+    colour: ColourSource,
     prob: f32,
     fuzz: f32,
 }
 
 impl Metal {
-    pub fn new(albedo: Colour, prob: f32, fuzz: f32) -> Self {
-        Self { albedo, prob, fuzz }
+    pub fn new(colour: ColourSource, prob: f32, fuzz: f32) -> Self {
+        Self { colour, prob, fuzz }
     }
 
     pub fn rgb(r: f32, g: f32, b: f32, prob: f32, fuzz: f32) -> Self {
         Self {
-            albedo: Colour::new(r, g, b),
+            colour: ColourSource::rgb(r, g, b),
             prob,
             fuzz,
         }
@@ -68,7 +81,7 @@ impl Material for Metal {
         if self.prob >= rng.random::<f32>() {
             let mut refl = ray.dir().reflect(hit.n());
             refl = refl.get_unit() + self.fuzz * Vec3::random_unit();
-            return Some((Some(Ray::new(*hit.p(), refl)), self.albedo));
+            return Some((Some(Ray::new(*hit.p(), refl)), self.colour.get_colour(hit)));
         }
         None
     }

src/objects/materials/texture.rs

@@ -1,11 +1,10 @@
-use image::{DynamicImage, ImageReader};
-use log::trace;
+use std::error::Error;
 
-use crate::{
-    objects::{hit::Hit, materials::traits::Material},
-    ray::Ray,
-    vec3::Vec3,
-};
+use image::{DynamicImage, ImageReader, Rgb};
+use image::{RgbImage};
+use log::warn;
+
+use crate::{objects::hit::Hit, vec3::Vec3};
 
 #[derive(Debug)]
 pub struct Texture {
@@ -17,14 +16,26 @@ pub struct Texture {
 
 impl Texture {
     pub fn new(texture: &str) -> Self {
-        let img = ImageReader::open(texture).unwrap().decode().unwrap(); // FIXME: unwraps
-        trace!(
-            "texture '{}' is {} by {} pixels, with {} bytes total",
-            texture,
-            img.width(),
-            img.height(),
-            img.as_bytes().len()
-        );
+        match ImageReader::open(texture) {
+            Ok(r) => {
+                match r.decode() {
+                    Ok(img) => Self::_build(img),
+                    Err(e) => {
+                        // ImageError
+                        warn!("Failed to parse image \"{}\": {}", texture, e); 
+                        Self::default()
+                    }
+                }
+            }
+            Err(e) => {
+                // IoError
+                warn!("Failed to read file \"{}\": {}", texture, e);
+                Self::default()
+            }
+        }
+    }
+
+    fn _build(img: DynamicImage) -> Self {
         let stride = match img.color() {
             // TODO: support other types of image
             image::ColorType::L8 => todo!(),
@@ -39,6 +50,7 @@ impl Texture {
             image::ColorType::Rgba32F => todo!(),
             _ => 3,
         };
+
         Self {
             width: img.width(),
             height: img.height(),
@@ -48,7 +60,7 @@ impl Texture {
     }
 
     fn _idx(&self, u: f32, v: f32) -> usize {
-        let x: usize = (u * ((self.width - 1) as f32)) as usize; // TODO: check these calcs work
+        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
@@ -64,12 +76,22 @@ impl Texture {
             b[self.stride * idx + 1],
         )
     }
-}
 
-impl Material for Texture {
-    fn scatter(&self, hit: &Hit, _ray: &Ray) -> Option<(Option<Ray>, Vec3)> {
+    pub fn colour_at(&self, hit: &Hit) -> Vec3 {
         let (u, v) = hit.uv();
-        let col = self._at(u, 1. - v);
-        Some((None, col))
+        self._at(u, 1. - v)
+    }
+}
+
+impl Default for Texture {
+    fn default() -> Self {
+        let mut img = RgbImage::new(1, 1);
+        img.put_pixel(0,0,Rgb([250,0,250]));
+        Self {
+            source: DynamicImage::ImageRgb8(img),
+            width: 1,
+            height: 1,
+            stride: 3,
+        }
     }
 }

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/quad.rs

@@ -13,6 +13,10 @@ pub struct Quad {
     p4: Vec3,
     material: Arc<dyn Material>,
     normal: Vec3,
+
+    // helpers
+    t1: Triangle,
+    t2: Triangle,
 }
 
 impl Quad {
@@ -22,27 +26,12 @@ impl Quad {
             p2,
             p3,
             p4,
-            material,
+            material: material.clone(),
             normal: (p2 - p1).cross(&(p4 - p1)).get_unit(),
+            t1: Triangle::new(p1, p2, p4, material.clone()),
+            t2: Triangle::new(p2, p3, p4, material),
         }
     }
-
-    pub fn hit(
-        p1: Vec3,
-        p2: Vec3,
-        p3: Vec3,
-        p4: Vec3,
-        material: Arc<dyn Material>,
-        normal: Vec3,
-        r: &Ray,
-    ) -> Option<Hit> {
-        let isct1 = Triangle::hit(p1, p2, p4, material.clone(), normal, r);
-        let isct2 = Triangle::hit(p2, p3, p4, material.clone(), normal, r);
-        if isct1.is_some() {
-            return isct1;
-        }
-        isct2
-    }
 }
 
 impl Debug for Quad {
@@ -57,20 +46,19 @@ impl Debug for Quad {
     }
 }
 
-// FIXME: texture mapping does not work properly for quads
 impl Hittable for Quad {
     fn hit(&self, r: &Ray) -> Option<Hit> {
-        let hit = Quad::hit(
-            self.p1,
-            self.p2,
-            self.p3,
-            self.p4,
-            self.material.clone(),
-            self.normal,
-            r,
-        );
+        let mh = self.t1.calculate_hit(r).or(self.t2.calculate_hit(r))?;
+        let uvw = self.to_uv(mh.p());
 
-        return hit
+        Some(Hit::from_minimal(
+            mh,
+            self.normal,
+            self.material.clone(),
+            false,
+            *uvw.x(),
+            *uvw.y(),
+        ))
     }
 
     fn to_uv(&self, point: &Vec3) -> Vec3 {

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,
@@ -74,7 +74,7 @@ impl Hittable for Sphere {
 
     fn to_uv(&self, point: &Vec3) -> Vec3 {
         let p = *point - self.center;
-        // TODO: add rotated texture support
+        // TODO (medium priority): add rotated texture support
         Vec3::new(
             0.5 + p.y().atan2(*p.x()) / (2. * PI),
             1. - (p.z() / self.radius).acos() / PI,

src/objects/traits.rs

@@ -1,11 +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 hit(&self, r: &Ray) -> Option<Hit>;
-    fn to_uv(&self, point: &Vec3) -> Vec3; // TODO: overhaul; remove u,v in Hit and change Mat ref to
-    // Hittable ref. Then call this function to calculate u,v coords as necessary.
 }

src/objects/triangle.rs

@@ -1,4 +1,4 @@
-use crate::objects::hit::Hit;
+use crate::objects::hit::{Hit, MinimalHit};
 use crate::objects::traits::Hittable;
 use crate::ray::Ray;
 use crate::{objects::materials::traits::Material, vec3::Vec3};
@@ -19,6 +19,7 @@ pub struct Triangle {
     d01: f32,
     d11: f32,
     denom: f32,
+    a4: f32,
 }
 
 impl Triangle {
@@ -29,6 +30,7 @@ impl Triangle {
         let d00 = v0.dot(&v0);
         let d01 = v0.dot(&v1);
         let d11 = v1.dot(&v1);
+        let a4 = (p3 - p1).cross(&(p2 - p1)).length();
 
         Self {
             p1,
@@ -42,69 +44,33 @@ impl Triangle {
             d01,
             d11,
             denom: d00 * d11 - d01 * d01,
+            a4,
         }
     }
 
-    // TODO: make the global Triangle::hit function not take precomped u,v somehow
-    // FIXME/DEBT: this function recalculates values for each pass that can be cached on the
-    // triangle struct itself. REFACTOR to not use this function
-    pub fn to_uv(p1: &Vec3, p2: &Vec3, p3: &Vec3, point: &Vec3) -> Vec3 {
-        let v0 = *p2 - p1;
-        let v1 = *p3 - p1;
-        let v2 = *point - p1;
-        let d00 = v0.dot(&v0);
-        let d01 = v0.dot(&v1);
-        let d11 = v1.dot(&v1);
-        let denom = d00 * d11 - d01 * d01;
-
-        let d20 = v2.dot(&v0);
-        let d21 = v2.dot(&v1);
-
-        let v = (d11 * d20 - d01 * d21) / denom;
-        let w = (d00 * d21 - d01 * d20) / denom;
-        Vec3::new(1. - v - w, v, w)
-    }
-
-    pub fn hit(
-        p1: Vec3,
-        p2: Vec3,
-        p3: Vec3,
-        material: Arc<dyn Material>,
-        normal: Vec3,
-        r: &Ray,
-    ) -> Option<Hit> {
+    pub fn calculate_hit(&self, r: &Ray) -> Option<MinimalHit> {
         // check if ray parallel to plane
-        let dot = normal.dot(r.dir());
+        let dot = self.normal.dot(r.dir());
         if dot == 0.0 {
             return None;
         }
 
-        let d = (-normal).dot(&p1);
+        let d = (-self.normal).dot(&self.p1);
         // hitpoint on plane
-        let t = -(normal.dot(&(r.origin() + d))) / dot;
+        let t = -(self.normal.dot(&(r.origin() + d))) / dot;
         // hits behind camera
         if t < 0. {
             return None;
         };
-        let uvw = Triangle::to_uv(&p1, &p2, &p3, &r.at(t));
 
         let p = r.at(t);
-        let a4 = (p3 - p1).cross(&(p2 - p1)).length();
-        let a3 = (p3 - p).cross(&(p2 - p)).length();
-        let a2 = (p3 - p).cross(&(p1 - p)).length();
-        let a1 = (p2 - p).cross(&(p1 - p)).length();
+        let a3 = (self.p3 - p).cross(&(self.p2 - p)).length();
+        let a2 = (self.p3 - p).cross(&(self.p1 - p)).length();
+        let a1 = (self.p2 - p).cross(&(self.p1 - p)).length();
 
-        let diff = (a4 - a1 - a2 - a3).abs();
+        let diff = (self.a4 - a1 - a2 - a3).abs();
         if diff < 0.001 {
-            Some(Hit::new(
-                t,
-                p,
-                normal,
-                material,
-                normal.dot(r.dir()) < 0.,
-                *uvw.x(),
-                *uvw.y(),
-            ))
+            Some(MinimalHit::new(t, p))
         } else {
             None
         }
@@ -124,14 +90,17 @@ impl Debug for Triangle {
 
 impl Hittable for Triangle {
     fn hit(&self, r: &Ray) -> Option<Hit> {
-        Triangle::hit(
-            self.p1,
-            self.p2,
-            self.p3,
-            self.material.clone(),
+        let mh = self.calculate_hit(r)?;
+        let uvw = self.to_uv(mh.p());
+
+        Some(Hit::from_minimal(
+            mh,
             self.normal,
-            r,
-        )
+            self.material.clone(),
+            self.normal.dot(r.dir()) < 0.,
+            *uvw.x(),
+            *uvw.y(),
+        ))
     }
 
     fn to_uv(&self, point: &Vec3) -> Vec3 {

src/raytracer.rs

@@ -26,10 +26,10 @@ pub fn write_image(filename: &str, pixels: &[u8], width: u32, height: u32) {
 pub fn render(scene: &mut Scene) {
     scene.init();
 
-    // TODO: currently splits per vertical line, but could be more granular (per chunk)
-    let mut pixels = vec![0_u8; (scene.image_width * scene.image_height * 3) as usize];
+    // TODO (low priority): currently splits per vertical line, but could be more granular (per chunk)
+    let mut pixels = vec![0_u8; (scene.get_image_width() * scene.get_image_height() * 3) as usize];
     let scanlines: Vec<(usize, &mut [u8])> = pixels
-        .chunks_mut(scene.image_width as usize * 3)
+        .chunks_mut(scene.get_image_width() as usize * 3)
         .enumerate()
         .collect();
 
@@ -37,39 +37,42 @@ pub fn render(scene: &mut Scene) {
     scanlines.into_par_iter().for_each(|(i, chunk)| {
         render_chunk(chunk, scene, i as u32);
     });
-    info!("rendering took {}.{} seconds.", now.elapsed().as_secs(), now.elapsed().subsec_nanos());
+    info!(
+        "rendering took {}.{} seconds.",
+        now.elapsed().as_secs(),
+        now.elapsed().subsec_nanos()
+    );
 
     info!("Writing image file...");
     write_image(
-        &scene.filename,
+        &scene.get_filename(),
         &pixels,
-        scene.image_width,
-        scene.image_height,
+        scene.get_image_width() as u32,
+        scene.get_image_height() as u32,
     );
 }
 
 pub fn render_chunk(chunk: &mut [u8], scene: &Scene, y: u32) {
     let camera = &scene.get_camera();
-    let aa_rate = &scene.get_camera().get_anti_alias_rate();
+    let aa_rate = camera.get_anti_alias_rate();
 
-    for i in 0..scene.image_width {
+    for i in 0..scene.get_image_width() {
         let pixel_tl = camera.get_pixel_tl(i, y);
 
         let mut pixel_colour = Colour::default();
         for y in 1..(aa_rate + 1) {
             for x in 1..(aa_rate + 1) {
                 let r = camera.get_ray(pixel_tl, x, y);
-                pixel_colour += ray_colour(&scene.objects, &r, scene.max_depth);
+                pixel_colour += ray_colour(&scene.get_objects(), &r, scene.get_max_depth());
             }
         }
 
-        let (r, g, b) =
-            (pixel_colour / (aa_rate * aa_rate) as f32).output();
+        let (r, g, b) = (pixel_colour / (aa_rate * aa_rate) as f32).output();
         chunk[(i * 3) as usize] = r;
         chunk[(i * 3) as usize + 1] = g;
         chunk[(i * 3) as usize + 2] = b;
     }
-    trace!("Line {}\tfinished.", y);
+    trace!("Line {:4} finished.", y);
 }
 
 pub fn ray_colour(hittables: &Vec<Arc<dyn Hittable>>, r: &Ray, depth: u32) -> Colour {

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,12 @@ 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,
+    traits::Material,
+};
 
 #[derive(Deserialize)]
 #[serde(tag = "type", rename_all = "lowercase")]
@@ -12,7 +16,6 @@ pub(crate) enum MaterialDef {
     Metal(Metal),
     Dielectric(Dielectric),
     Normal(Normal),
-    Texture(RawTexture),
 }
 
 impl MaterialDef {
@@ -22,13 +25,6 @@ impl MaterialDef {
             MaterialDef::Metal(m) => Arc::new(m),
             MaterialDef::Dielectric(d) => Arc::new(d),
             MaterialDef::Normal(n) => Arc::new(n),
-            MaterialDef::Texture(t) => Arc::new(Texture::new(&t.source)), // FIXME: error handling
         }
     }
 }
-
-#[derive(Deserialize)]
-pub(crate) struct RawTexture {
-    pub source: String,
-}
-

src/scenes/scene.rs

@@ -1,23 +1,36 @@
+use crate::objects::materials::colour_source::ColourSource;
 use std::sync::Arc;
 
+use rand::RngExt;
 use serde::Deserialize;
 
 use crate::{
     camera::Camera,
-    objects::{materials::traits::Material, traits::Hittable},
+    objects::{
+        materials::{
+            dielectric::Dielectric,
+            lambertian::{Lambertian, Metal},
+            traits::Material,
+        },
+        sphere::Sphere,
+        traits::Hittable,
+    },
     scenes::{hittable_def::HittableDef, material_def::MaterialDef, raw_camera::RawCamera},
+    vec3::Vec3,
 };
 
 #[derive(Debug)]
 pub struct Scene {
-    pub camera: Camera, // FIXME: should not be public
-    pub objects: Vec<Arc<dyn Hittable>>,
+    camera: Camera,
+    objects: Vec<Arc<dyn Hittable>>,
+
     // image
-    pub filename: String,
-    pub image_width: u32,
-    pub image_height: u32,
-    // raytracing // TODO: think about organisation of these vars, also in Camera
-    pub max_depth: u32,
+    filename: String,
+    image_width: u32,
+    image_height: u32,
+
+    // raytracing
+    max_depth: u32,
 }
 
 impl Scene {
@@ -39,20 +52,130 @@ impl Scene {
         }
     }
 
+    pub fn random() -> Self {
+        let ground = Lambertian::rgb(-2.5, 0.5, 0.5, 1.);
+        let mut world: Vec<Arc<dyn Hittable>> = vec![Arc::new(Sphere::xyz(
+            0.,
+            -1000.,
+            0.,
+            1000.,
+            Arc::new(ground),
+        ))];
+
+        let mut rng = rand::rng();
+        let point = Vec3::new(4., 0.2, 0.);
+        for a in -11..11 {
+            for b in -11..11 {
+                let mat = rng.random_range((0.)..1.);
+                let center = Vec3::new(
+                    a as f32 + 0.9 * rng.random_range((0.)..1.),
+                    0.2,
+                    b as f32 + 0.9 * rng.random_range((0.)..1.),
+                );
+
+                if (center - point).length() > 0.9 {
+                    if mat < 0.8 {
+                        // diffuse
+                        world.push(Arc::new(Sphere::new(
+                            center,
+                            0.2,
+                            Arc::new(Lambertian::new(
+                                ColourSource::Colour(Vec3::random() * Vec3::random()),
+                                1.,
+                            )),
+                        )));
+                    } else if mat < 0.95 {
+                        // metal
+                        world.push(Arc::new(Sphere::new(
+                            center,
+                            0.2,
+                            Arc::new(Metal::rgb(
+                                rng.random_range(0.5..1.),
+                                rng.random_range(0.5..1.),
+                                rng.random_range(0.5..1.),
+                                1.,
+                                rng.random_range((0.)..0.5),
+                            )),
+                        )));
+                    } else {
+                        // glass
+                        world.push(Arc::new(Sphere::new(
+                            center,
+                            0.2,
+                            Arc::new(Dielectric::new(1.5)),
+                        )));
+                    }
+                }
+            }
+        }
+
+        world.push(Arc::new(Sphere::xyz(
+            0.,
+            1.,
+            0.,
+            1.,
+            Arc::new(Dielectric::new(1.5)),
+        )));
+        world.push(Arc::new(Sphere::xyz(
+            -4.,
+            1.,
+            0.,
+            1.,
+            Arc::new(Lambertian::rgb(0.4, 0.2, 0.1, 1.)),
+        )));
+        world.push(Arc::new(Sphere::xyz(
+            4.,
+            1.,
+            0.,
+            1.,
+            Arc::new(Metal::rgb(0.7, 0.6, 0.5, 1., 0.)),
+        )));
+
+        let mut c = Camera::new();
+        c.set_fov(20.);
+        c.set_anti_alias_rate(4);
+        c.set_vup(Vec3::new(0., 1., 0.));
+        c.set_look_from(Vec3::new(13., 2., 3.));
+        c.set_look_at(Vec3::new(0., 0., 0.));
+        c.add_defocus_blur(0.6, 10.);
+
+        Self {
+            camera: c,
+            objects: world,
+            filename: "random.png".to_string(),
+            image_width: 1920,
+            image_height: 1080,
+            max_depth: 50,
+        }
+    }
+
     pub fn get_camera(&self) -> &Camera {
         &self.camera
     }
 
-    pub fn get_image_width(&self) -> f32 {
-        self.image_width as f32
+    pub fn get_image_width(&self) -> u32 {
+        self.image_width
     }
 
-    pub fn get_image_height(&self) -> f32 {
-        self.image_height as f32
+    pub fn get_image_height(&self) -> u32 {
+        self.image_height
+    }
+
+    pub fn get_objects(&self) -> &Vec<Arc<dyn Hittable>> {
+        &self.objects
+    }
+
+    pub fn get_max_depth(&self) -> u32 {
+        self.max_depth
+    }
+
+    pub fn get_filename(&self) -> &String {
+        &self.filename
     }
 
     pub fn init(&mut self) {
-        self.camera.init(self.get_image_width(), self.get_image_height());
+        self.camera
+            .init(self.get_image_width(), self.get_image_height());
     }
 }
 

src/util.rs

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

src/vec3.rs

@@ -33,7 +33,7 @@ impl Vec3 {
         Self {
             x: r as f32 / 255.,
             y: g as f32 / 255.,
-            z: b as f32/ 255.,
+            z: b as f32 / 255.,
         }
     }
 
@@ -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 {
@@ -444,16 +448,20 @@ impl Div<Vec3> for Vec3 {
         }
     }
 }
+
+impl Div<u32> for Vec3 {
+    type Output = Self;
+
+    fn div(self, u: u32) -> Self::Output {
+        self / u as f32
+    }
+}
+
 impl Div<i32> for Vec3 {
     type Output = Self;
 
     fn div(self, i: i32) -> Self::Output {
-        let f: f32 = i as f32;
-        Self {
-            x: self.x / f,
-            y: self.y / f,
-            z: self.z / f,
-        }
+        self / i as f32
     }
 }
 
@@ -500,4 +508,3 @@ impl Display for Vec3 {
         write!(f, "({}, {}, {})", self.x, self.y, self.z)
     }
 }
-