From a7e1f1c134f9800d2be2e51d1ac46d037b973674 Mon Sep 17 00:00:00 2001
From: Matthew Gordon <matthew.scott.gordon@gmail.com>
Date: Sat, 7 Dec 2019 10:31:55 -0500
Subject: [PATCH] Add type alias for the return type of Material::bsdf()

---
 src/materials.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/materials.rs b/src/materials.rs
index d50ef96..a7b554a 100644
--- a/src/materials.rs
+++ b/src/materials.rs
@@ -4,10 +4,11 @@ use super::colour::{ColourRgbF, NamedColour};
 
 use std::fmt::Debug;
 
+type Bsdf<'a, T> =
+    Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a>;
+
 pub trait Material<T: RealField>: Debug {
-    fn bsdf<'a>(
-        &'a self,
-    ) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a>;
+    fn bsdf<'a>(&'a self) -> Bsdf<'a, T>;
 
     fn sample(&self, _w_o: &Vector3<T>) -> Vec<Vector3<T>> {
         vec![]
@@ -30,9 +31,7 @@ impl<T: RealField> LambertianMaterial<T> {
 }
 
 impl<T: RealField> Material<T> for LambertianMaterial<T> {
-    fn bsdf<'a>(
-        &'a self,
-    ) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a> {
+    fn bsdf<'a>(&'a self) -> Bsdf<'a, T> {
         Box::new(
             move |_w_o: Vector3<T>, _w_i: Vector3<T>, colour_in: ColourRgbF<T>| {
                 self.colour * colour_in * self.diffuse_strength
@@ -50,9 +49,7 @@ pub struct PhongMaterial<T: RealField> {
 }
 
 impl<T: RealField> Material<T> for PhongMaterial<T> {
-    fn bsdf<'a>(
-        &'a self,
-    ) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a> {
+    fn bsdf<'a>(&'a self) -> Bsdf<'a, T> {
         Box::new(
             move |w_o: Vector3<T>, w_i: Vector3<T>, colour_in: ColourRgbF<T>| {
                 if w_i.z < T::zero() || w_o.z < T::zero() {
@@ -77,9 +74,7 @@ pub struct ReflectiveMaterial<T: RealField> {
 }
 
 impl<T: RealField> Material<T> for ReflectiveMaterial<T> {
-    fn bsdf<'a>(
-        &'a self,
-    ) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a> {
+    fn bsdf<'a>(&'a self) -> Bsdf<'a, T> {
         Box::new(
             move |w_o: Vector3<T>, w_i: Vector3<T>, colour_in: ColourRgbF<T>| {
                 if w_i.z < T::zero() || w_o.z < T::zero() {