fix it with enums (incredibly unreadable - im sorry me)

Author: Jeremy5909

src/camera.rs

@@ -2,8 +2,8 @@ use std::{f64::INFINITY, io::stdout};
 
 use rand::{thread_rng, Rng};
 
-use crate::{color::{write_color, Color}, hittable::{HitRecord, Hittable}, interval::Interval, ray::Ray, vec3::{random_unit_vector, unit_vector, Point3, Vec3}};
-
+use crate::{color::{write_color, Color}, hittable::{HitRecord, Hittable}, interval::Interval, ray::Ray, vec3::{unit_vector, Point3, Vec3}};
+use crate::material::Material;
 #[derive(Default)]
 pub struct Camera {
 	pub aspect_ratio: f64,

src/hittable.rs

@@ -1,10 +1,10 @@
-use crate::{interval::Interval, material::Material, ray::Ray, vec3::{dot, Point3, Vec3}};
+use crate::{interval::Interval, material::EMaterial, ray::Ray, vec3::{dot, Point3, Vec3}};
 
 #[derive(Clone, Default)]
 pub struct HitRecord {
 	pub p: Point3,
 	pub normal: Vec3,
-	pub mat: Box<dyn Material>,
+	pub mat: Box<EMaterial>,
 	pub t: f64,
 	pub front_face: bool,
 }

src/hittable_list.rs

@@ -20,8 +20,8 @@ impl Hittable for HittableList {
 		for object in &self.objects {
 			if object.hit(r, Interval::from(ray_t.min, closest_so_far), &mut temp_rec) {
 				hit_anything = true;
-				closest_so_far = temp_rec.t;
-				*rec = temp_rec;
+				closest_so_far = temp_rec.clone().t;
+				*rec = temp_rec.clone();
 			}
 		}
 		hit_anything

src/main.rs

@@ -1,5 +1,6 @@
 use camera::Camera;
-use material::Lambertian;
+use color::Color;
+use material::{Lambertian, Metal};
 
 use crate::{hittable_list::HittableList, sphere::Sphere, vec3::Point3};
 
@@ -14,14 +15,22 @@ mod camera;
 mod material;
 
 fn main() {
-    let mat1 = Lambertian::default();
+    let ground = material::EMaterial::Lambertian(Lambertian {albedo: Color::new(0.8,0.8,0.0)});
+    let center = material::EMaterial::Lambertian(Lambertian {albedo: Color::new(0.1, 0.2, 0.5)});
+    let left = material::EMaterial::Metal(Metal {albedo: Color::new(0.8, 0.8, 0.8)});
+    let right = material::EMaterial::Metal(Metal {albedo: Color::new(0.8, 0.6, 0.2)});
+    
     let mut world = HittableList::new();
 
-    let sphere1 = Sphere::new(Point3::new(0.0, 0.0, -1.0), 0.5, Box::new(mat1));
-    let sphere2 = Sphere::new(Point3::new(0.0, -100.5, -1.0), 100.0, Box::new(mat1));
+    let ground = Sphere::new(Point3::new(0.0, -100.5, -1.0), 100.0, Box::new(ground));
+    let center = Sphere::new(Point3::new(0.0, 0.0, -1.2), 0.5, Box::new(center));
+    let left = Sphere::new(Point3::new(-1.0, 0.0, -1.0), 0.5, Box::new(left));
+    let right = Sphere::new(Point3::new(1.0, 0.0, -1.0), 0.5, Box::new(right));
 
-    world.add(Box::new(sphere1));
-    world.add(Box::new(sphere2));
+    world.add(Box::new(ground));
+    world.add(Box::new(center));
+    world.add(Box::new(left));
+    world.add(Box::new(right));
 
     let mut cam = Camera::new(16.0/9.0, 400);
     cam.samples_per_pixel = 100;

src/material.rs

@@ -1,10 +1,30 @@
+use std::default;
+
 use crate::{color::Color, hittable::HitRecord, ray::Ray, vec3::{random_unit_vector, reflect, Vec3}};
 
-pub trait Material: Clone + Default {
+#[derive(Clone, Copy, Default)]
+pub enum EMaterial {
+	Lambertian(Lambertian),
+	Metal(Metal),
+	#[default]
+	DefaultMaterial
+}
+
+impl Material for EMaterial {
+    fn scatter(&self, r_in: &Ray, rec: &HitRecord, attenuation: &mut Color, scattered: &mut Ray) -> bool {
+        match self {
+            EMaterial::Lambertian(mat) => mat.scatter(r_in, rec, attenuation, scattered),
+            EMaterial::Metal(mat) => mat.scatter(r_in, rec, attenuation, scattered),
+            EMaterial::DefaultMaterial => false,
+			// Implement scatter method for other variants
+        }
+    }
+}
+pub trait Material {
 	fn scatter(&self, r_in: &Ray, rec: &HitRecord, attenuation: &mut Color, scattered: &mut Ray) -> bool;
 }
 #[derive(Default, Clone, Copy)]
-pub struct Lambertian { albedo: Color }
+pub struct Lambertian { pub albedo: Color }
 impl Material for Lambertian {
 	fn scatter(&self, r_in: &Ray, rec: &HitRecord, attenuation: &mut Color, scattered: &mut Ray) -> bool {
 		let mut scatter_dir = rec.normal + random_unit_vector();
@@ -21,7 +41,7 @@ impl Material for Lambertian {
 }
 
 #[derive(Default, Clone, Copy)]
-pub struct Metal { albedo: Color }
+pub struct Metal { pub albedo: Color }
 impl Material for Metal {
 	fn scatter(&self, r_in: &Ray, rec: &HitRecord, attenuation: &mut Color, scattered: &mut Ray) -> bool {
 		let reflected = reflect(r_in.dir(), &rec.normal);

src/sphere.rs

@@ -1,12 +1,12 @@
-use crate::{hittable::{HitRecord, Hittable}, interval::Interval, material::Material, vec3::{dot, Point3}};
+use crate::{hittable::{HitRecord, Hittable}, interval::Interval, material::EMaterial, vec3::{dot, Point3}};
 
 pub struct Sphere {
 	center: Point3,
 	radius: f64,
-	mat: Box<dyn Material>
+	mat: Box<EMaterial>
 }
 impl Sphere {
-	pub fn new(center: Point3, radius: f64, mat: Box<dyn Material>) -> Self {
+	pub fn new(center: Point3, radius: f64, mat: Box<EMaterial>) -> Self {
 		Sphere {center, radius, mat}
 	}
 }
@@ -36,6 +36,7 @@ impl Hittable for Sphere {
 		rec.p = r.at(rec.t);
 		let outward_normal = (rec.p - self.center) / self.radius;
 		rec.set_face_normal(r, &outward_normal);
+		rec.mat = self.mat.clone();
 
 		true
 	}