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

Make Transform triat use Affine3 instead of the more general Tramsform3

This commit is contained in:
Matthew Gordon 2020-04-03 22:56:28 -04:00
parent 9904d3f06e
commit a856fcbc21
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/raycasting/mod.rs
View File

@ -1,4 +1,4 @@
use nalgebra::{Point3, Transform3, Vector3}; use nalgebra::{Affine3, Point3, Vector3};
use super::materials::Material; use super::materials::Material;
use crate::Real; use crate::Real;
@ -69,7 +69,7 @@ pub trait HasBoundingBox<T: Real>: Send + Sync {
} }
pub trait Transform<T: Real>: Send + Sync { pub trait Transform<T: Real>: Send + Sync {
fn transform(&mut self, transformation: &Transform3<T>) -> &Self; fn transform(&mut self, transformation: &Affine3<T>) -> &Self;
} }
pub trait Primitive<T: Real>: Intersect<T> + HasBoundingBox<T> {} pub trait Primitive<T: Real>: Intersect<T> + HasBoundingBox<T> {}

10
src/raycasting/sphere.rs
View File

@ -1,4 +1,4 @@
use nalgebra::{convert, Point3, Transform3, Vector3}; use nalgebra::{convert, Affine3, Point3, Vector3};
use crate::materials::Material; use crate::materials::Material;
use crate::Real; use crate::Real;
@ -25,7 +25,7 @@ impl<T: Real> Sphere<T> {
} }
impl<T: Real> Transform<T> for Sphere<T> { impl<T: Real> Transform<T> for Sphere<T> {
fn transform(&mut self, transformation: &Transform3<T>) -> &Self { fn transform(&mut self, transformation: &Affine3<T>) -> &Self {
self.centre = transformation.transform_point(&self.centre); self.centre = transformation.transform_point(&self.centre);
// This is not the most efficient way of calculating the radius, // This is not the most efficient way of calculating the radius,
//but will work as long as the resulting shape is still a sphere. //but will work as long as the resulting shape is still a sphere.
@ -213,7 +213,7 @@ mod tests {
Arc::new(LambertianMaterial::new_dummy()), Arc::new(LambertianMaterial::new_dummy()),
); );
let expected_centre = sphere.centre + translation_vector; let expected_centre = sphere.centre + translation_vector;
let mut transformation = Transform3::identity(); let mut transformation = Affine3::identity();
transformation *= Translation3::from(translation_vector); transformation *= Translation3::from(translation_vector);
sphere.transform(&transformation); sphere.transform(&transformation);
TestResult::from_bool(expected_centre == sphere.centre) TestResult::from_bool(expected_centre == sphere.centre)
@ -234,7 +234,7 @@ mod tests {
Arc::new(LambertianMaterial::new_dummy()), Arc::new(LambertianMaterial::new_dummy()),
); );
let expected_radius = sphere.radius; let expected_radius = sphere.radius;
let mut transformation = Transform3::identity(); let mut transformation = Affine3::identity();
transformation *= Translation3::from(translation_vector); transformation *= Translation3::from(translation_vector);
sphere.transform(&transformation); sphere.transform(&transformation);
TestResult::from_bool(expected_radius == sphere.radius) TestResult::from_bool(expected_radius == sphere.radius)
@ -255,7 +255,7 @@ mod tests {
Arc::new(LambertianMaterial::new_dummy()), Arc::new(LambertianMaterial::new_dummy()),
); );
let expected_centre = sphere.centre; let expected_centre = sphere.centre;
let mut transformation = Transform3::identity(); let mut transformation = Affine3::identity();
transformation *= Translation3::from(sphere.centre.coords) transformation *= Translation3::from(sphere.centre.coords)
* Rotation3::new(rotation_vector) * Rotation3::new(rotation_vector)
* Translation3::from(-sphere.centre.coords); * Translation3::from(-sphere.centre.coords);