From 45fafbcd4b41a5388ece377c4e051b5846407288 Mon Sep 17 00:00:00 2001
From: lamp
Date: Sun, 21 Jan 2024 17:03:07 +0000
Subject: fmt and tidy

---
 src/material/isotropic.rs | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/material/isotropic.rs')

diff --git a/src/material/isotropic.rs b/src/material/isotropic.rs
index f59fa7d..9949abd 100644
--- a/src/material/isotropic.rs
+++ b/src/material/isotropic.rs
@@ -1,32 +1,39 @@
 use std::sync::Arc;
 
 use super::Material;
-use crate::{hittable::HitRecord, texture::Texture, vec3::Vec3};
-use crate::vec3::Color;
-use crate::texture::SolidColor;
 use crate::ray::Ray;
+use crate::vec3::Color;
+use crate::{hittable::HitRecord, texture::Texture, vec3::Vec3};
 
 pub struct Isotropic {
     albedo: Arc<dyn Texture>,
 }
 
 impl Isotropic {
-    pub fn from_color(color: Color) -> Self {
-        Self {
-            albedo: Arc::new(SolidColor::from_color(color)),
-        }
-    }
+    // pub fn from_color(color: Color) -> Self {
+    //     Self {
+    //         albedo: Arc::new(SolidColor::from_color(color)),
+    //     }
+    // }
 
     pub fn from_texture(texture: Arc<dyn Texture>) -> Self {
-        Self {
-            albedo: texture,
-        }
+        Self { albedo: texture }
     }
 }
 
 impl Material for Isotropic {
-    fn scatter(&self, ray_in: &Ray, hit_record: &HitRecord, attenuation: &mut Color, scattered: &mut Ray) -> bool {
-        *scattered = Ray { origin: hit_record.p.clone(), direction: Vec3::random_in_unit_sphere(), time: ray_in.time };
+    fn scatter(
+        &self,
+        ray_in: &Ray,
+        hit_record: &HitRecord,
+        attenuation: &mut Color,
+        scattered: &mut Ray,
+    ) -> bool {
+        *scattered = Ray {
+            origin: hit_record.p.clone(),
+            direction: Vec3::random_in_unit_sphere(),
+            time: ray_in.time,
+        };
         *attenuation = self.albedo.value(hit_record.u, hit_record.v, &hit_record.p);
         true
     }
-- 
cgit v1.2.3