wathiede/raytracers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shapes: fix inverse_transform on ShapeBuilder.

Browse Source
This commit is contained in:
Bill Thiede 2021-07-21 21:30:26 -07:00
parent 44b46187a0
commit 28fe6fe982
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtchallenge/src/shapes.rs
View File

@ -47,11 +47,18 @@ impl PartialEq for Geometry {
#[builder(default)] #[builder(default)]
pub struct Shape { pub struct Shape {
transform: Matrix4x4, transform: Matrix4x4,
#[builder(private, default = "self.default_inverse_transform()?")]
inverse_transform: Matrix4x4, inverse_transform: Matrix4x4,
pub material: Material, pub material: Material,
geometry: Geometry, geometry: Geometry,
} }
impl ShapeBuilder {
fn default_inverse_transform(&self) -> Result<Matrix4x4, String> {
Ok(self.transform.unwrap_or(Matrix4x4::identity()).inverse())
}
}
impl Default for Shape { impl Default for Shape {
fn default() -> Shape { fn default() -> Shape {
Shape { Shape {