Slight cleanup + changed name of cook torrence

Author: nonl4331

implementations/Cargo.toml

@@ -13,4 +13,5 @@ rayon = "1.5.1"
 rt_core = {path = "../rt_core"}
 
 [dev-dependencies]
+chrono = "0.4.19"
 statrs = "0.16.0"

implementations/src/materials/lambertain.rs implementations/src/materials/lambertian.rs

@@ -1,17 +1,17 @@
 use proc::Scatter;
 use rt_core::{Float, Hit, Ray, Scatter, Vec3};
 
-pub mod cook_torrence;
 pub mod emissive;
-pub mod lambertain;
+pub mod lambertian;
 pub mod phong;
 pub mod reflect;
 pub mod refract;
+pub mod trowbridge_reitz;
 
 pub use crate::{
 	materials::{
-		cook_torrence::CookTorrence, emissive::Emit, lambertain::Lambertian, phong::Phong,
-		reflect::Reflect, refract::Refract,
+		emissive::Emit, lambertian::Lambertian, phong::Phong, reflect::Reflect, refract::Refract,
+		trowbridge_reitz::TrowbridgeReitz,
 	},
 	textures::Texture,
 };
@@ -21,7 +21,7 @@ pub enum AllMaterials<T: Texture> {
 	Emit(Emit<T>),
 	Lambertian(Lambertian<T>),
 	Phong(Phong<T>),
-	CookTorrence(CookTorrence<T>),
+	TrowbridgeReitz(TrowbridgeReitz<T>),
 	Reflect(Reflect<T>),
 	Refract(Refract<T>),
 }

implementations/src/materials/mod.rs

@@ -8,7 +8,7 @@ use rt_core::{Float, Hit, Ray, Scatter, Vec3};
 use std::{f32::INFINITY, sync::Arc};
 
 #[derive(Debug)]
-pub struct CookTorrence<T: Texture> {
+pub struct TrowbridgeReitz<T: Texture> {
 	pub texture: Arc<T>,
 	pub alpha: Float,
 	pub ior: Vec3,
@@ -21,7 +21,7 @@ use std::f64::consts::PI;
 #[cfg(not(feature = "f64"))]
 use std::f32::consts::PI;
 
-impl<T> CookTorrence<T>
+impl<T> TrowbridgeReitz<T>
 where
 	T: Texture,
 {
@@ -83,7 +83,7 @@ where
 	}
 }
 
-impl<T> Scatter for CookTorrence<T>
+impl<T> Scatter for TrowbridgeReitz<T>
 where
 	T: Texture,
 {

implementations/src/materials/cook_torrence.rs implementations/src/materials/trowbridge_reitz.rs

@@ -1,12 +1,9 @@
-mod common;
-use common::bsdf_testing;
-
-use rt_core::Hit;
-use rt_core::Ray;
+use crate::common::*;
+use rt_core::*;
 
-use rt_core::{Scatter, Vec3};
+mod common;
 
-fn test_bxdf<B>(bxdf: B) -> bool
+fn test_bxdf<B>(bxdf: B, bxdf_name: String) -> bool
 where
 	B: Scatter,
 {
@@ -26,27 +23,55 @@ where
 	};
 
 	let pdf = |wo: Vec3, wi: Vec3| bxdf.scattering_pdf(&hit, wo, wi);
-	bsdf_testing(&sample, &pdf)
+	for i in 0..CHI_TESTS {
+		let wo = generate_wo();
+		let freq_table = samped_frequency_distribution(&sample, wo, THETA_RES, PHI_RES, SAMPLES);
+		let expected_freq_table: Vec<Float> =
+			integrate_frequency_table(&pdf, wo, THETA_RES, PHI_RES)
+				.into_iter()
+				.map(|x| x * SAMPLES as Float)
+				.collect();
+		if i == 0 {
+			dump_tables(
+				wo,
+				&freq_table
+					.iter()
+					.map(|&v| v as Float)
+					.collect::<Vec<Float>>(),
+				&expected_freq_table,
+				THETA_RES,
+				PHI_RES,
+				&bxdf_name,
+			);
+		}
+		let (df, chi_squared) = chi_squared(freq_table, expected_freq_table, SAMPLES);
+		let p = chi2_probability(df as f64, chi_squared as f64);
+		let threshold = 1.0 - (1.0 - CHI2_THRESHOLD).powf(1.0 / CHI_TESTS as Float);
+		if p < threshold as f64 || p.is_infinite() {
+			return false;
+		}
+	}
+	true
 }
 
-#[test] // change name
-fn ggx_cook_torrence() {
-	let bxdf = implementations::cook_torrence::CookTorrence::new(
+#[test]
+fn trowbridge_reitz() {
+	let bxdf = implementations::trowbridge_reitz::TrowbridgeReitz::new(
 		&std::sync::Arc::new(implementations::SolidColour::new(Vec3::new(0.0, 0.0, 0.0))),
 		0.3,
 		3.2 * Vec3::one(),
 		1.0,
 	);
 
-	assert!(test_bxdf(bxdf))
+	assert!(test_bxdf(bxdf, "ggx".to_string()))
 }
 
-#[test] // change name
+#[test]
 fn lambertian() {
-	let bxdf = implementations::lambertain::Lambertian::new(
+	let bxdf = implementations::lambertian::Lambertian::new(
 		&std::sync::Arc::new(implementations::SolidColour::new(Vec3::new(0.0, 0.0, 0.0))),
 		0.3,
 	);
 
-	assert!(test_bxdf(bxdf))
+	assert!(test_bxdf(bxdf, "lambertain".to_string()))
 }

implementations/tests/bxdf.rs

@@ -9,11 +9,11 @@ use std::{
 
 pub mod int;
 
-const SAMPLES: usize = 10_000_000;
-const THETA_RES: usize = 80;
-const PHI_RES: usize = 2 * THETA_RES;
-const CHI2_THRESHOLD: Float = 0.01;
-const CHI_TESTS: usize = 1;
+pub const SAMPLES: usize = 10_000_000;
+pub const THETA_RES: usize = 80;
+pub const PHI_RES: usize = 2 * THETA_RES;
+pub const CHI2_THRESHOLD: Float = 0.01;
+pub const CHI_TESTS: usize = 1;
 
 use int::*;
 
@@ -29,7 +29,7 @@ pub fn to_vec(sin_theta: Float, cos_theta: Float, phi: Float) -> Vec3 {
 	Vec3::new(phi.cos() * sin_theta, phi.sin() * sin_theta, cos_theta)
 }
 
-fn chi2_probability(dof: f64, distance: f64) -> f64 {
+pub fn chi2_probability(dof: f64, distance: f64) -> f64 {
 	assert!(
 		(gamma_lr(dof * 0.5, distance * 0.5) + gamma_ur(dof * 0.5, distance * 0.5) - 1.0).abs()
 			< 0.0001
@@ -122,7 +122,7 @@ pub fn random_float() -> Float {
 	rng.gen()
 }
 
-fn generate_wo() -> Vec3 {
+pub fn generate_wo() -> Vec3 {
 	let cos_theta = random_float();
 	let phi = TAU as Float * random_float();
 
@@ -176,12 +176,13 @@ pub fn chi_squared(
 	(df, chi_squared)
 }
 
-fn dump_tables(
+pub fn dump_tables(
 	wo: Vec3,
 	freq_table: &[Float],
 	expected_freq_table: &[Float],
 	theta_res: usize,
 	phi_res: usize,
+	bxdf_name: &str,
 ) {
 	let enumerate = |file: &mut File, func: fn(Float, Float) -> Float| {
 		(0..theta_res * phi_res).for_each(|index| {
@@ -198,7 +199,13 @@ fn dump_tables(
 		});
 	};
 
-	let mut file = File::create("chi_test.m").unwrap();
+	let time = chrono::Local::now();
+
+	let mut file = File::create(format!(
+		"chi_test_{bxdf_name}@{}.m",
+		time.format("%Y-%m-%d:%H:%M")
+	))
+	.unwrap();
 
 	file.write_all(format!("% wo = {wo}\nfrequencies = [ ").as_bytes())
 		.unwrap();
@@ -229,38 +236,3 @@ title('expected frequencies');",
 	)
 	.unwrap();
 }
-
-pub fn bsdf_testing<S, P>(sample: &S, pdf: &P) -> bool
-where
-	S: Fn(Vec3) -> Vec3,
-	P: Fn(Vec3, Vec3) -> Float,
-{
-	for i in 0..CHI_TESTS {
-		let wo = generate_wo();
-		let freq_table = samped_frequency_distribution(&sample, wo, THETA_RES, PHI_RES, SAMPLES);
-		let expected_freq_table: Vec<Float> =
-			integrate_frequency_table(pdf, wo, THETA_RES, PHI_RES)
-				.into_iter()
-				.map(|x| x * SAMPLES as Float)
-				.collect();
-		if i == 0 {
-			dump_tables(
-				wo,
-				&freq_table
-					.iter()
-					.map(|&v| v as Float)
-					.collect::<Vec<Float>>(),
-				&expected_freq_table,
-				THETA_RES,
-				PHI_RES,
-			);
-		}
-		let (df, chi_squared) = chi_squared(freq_table, expected_freq_table, SAMPLES);
-		let p = chi2_probability(df as f64, chi_squared as f64);
-		let threshold = 1.0 - (1.0 - CHI2_THRESHOLD).powf(1.0 / CHI_TESTS as Float);
-		if p < threshold as f64 || p.is_infinite() {
-			return false;
-		}
-	}
-	true
-}