matthew
/
vanrijn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add type alias for the return type of Material::bsdf()

This commit is contained in:
Matthew Gordon 2019-12-07 10:31:55 -05:00
parent 52da1bc952
commit a7e1f1c134
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/materials.rs
View File

@ -4,10 +4,11 @@ use super::colour::{ColourRgbF, NamedColour};
use std::fmt::Debug; 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 { pub trait Material<T: RealField>: Debug {
fn bsdf<'a>( fn bsdf<'a>(&'a self) -> Bsdf<'a, T>;
&'a self,
) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a>;
fn sample(&self, _w_o: &Vector3<T>) -> Vec<Vector3<T>> { fn sample(&self, _w_o: &Vector3<T>) -> Vec<Vector3<T>> {
vec![] vec![]
@ -30,9 +31,7 @@ impl<T: RealField> LambertianMaterial<T> {
} }
impl<T: RealField> Material<T> for LambertianMaterial<T> { impl<T: RealField> Material<T> for LambertianMaterial<T> {
fn bsdf<'a>( fn bsdf<'a>(&'a self) -> Bsdf<'a, T> {
&'a self,
) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a> {
Box::new( Box::new(
move |_w_o: Vector3<T>, _w_i: Vector3<T>, colour_in: ColourRgbF<T>| { move |_w_o: Vector3<T>, _w_i: Vector3<T>, colour_in: ColourRgbF<T>| {
self.colour * colour_in * self.diffuse_strength self.colour * colour_in * self.diffuse_strength
@ -50,9 +49,7 @@ pub struct PhongMaterial<T: RealField> {
} }
impl<T: RealField> Material<T> for PhongMaterial<T> { impl<T: RealField> Material<T> for PhongMaterial<T> {
fn bsdf<'a>( fn bsdf<'a>(&'a self) -> Bsdf<'a, T> {
&'a self,
) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a> {
Box::new( Box::new(
move |w_o: Vector3<T>, w_i: Vector3<T>, colour_in: ColourRgbF<T>| { move |w_o: Vector3<T>, w_i: Vector3<T>, colour_in: ColourRgbF<T>| {
if w_i.z < T::zero() || w_o.z < T::zero() { 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> { impl<T: RealField> Material<T> for ReflectiveMaterial<T> {
fn bsdf<'a>( fn bsdf<'a>(&'a self) -> Bsdf<'a, T> {
&'a self,
) -> Box<dyn Fn(Vector3<T>, Vector3<T>, ColourRgbF<T>) -> ColourRgbF<T> + 'a> {
Box::new( Box::new(
move |w_o: Vector3<T>, w_i: Vector3<T>, colour_in: ColourRgbF<T>| { move |w_o: Vector3<T>, w_i: Vector3<T>, colour_in: ColourRgbF<T>| {
if w_i.z < T::zero() || w_o.z < T::zero() { if w_i.z < T::zero() || w_o.z < T::zero() {