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

shapes: fix translation handling in intersection test.

Browse Source
This commit is contained in:
Bill Thiede 2021-07-21 15:06:06 -07:00
parent e419994fae
commit fc5ef09cc3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtchallenge/src/shapes.rs
View File

@ -261,9 +261,10 @@ impl Shape {
/// assert_eq!(xs[0].object, &p); /// assert_eq!(xs[0].object, &p);
/// ``` /// ```
pub fn intersect<'s>(shape: &'s Shape, ray: &Ray) -> Intersections<'s> { pub fn intersect<'s>(shape: &'s Shape, ray: &Ray) -> Intersections<'s> {
let local_ray = ray.transform(shape.inverse_transform);
match shape.geometry { match shape.geometry {
Geometry::Sphere => sphere::intersect(shape, ray), Geometry::Sphere => sphere::intersect(shape, &local_ray),
Geometry::Plane => plane::intersect(shape, ray), Geometry::Plane => plane::intersect(shape, &local_ray),
} }
} }
@ -275,7 +276,6 @@ mod sphere {
tuples::{dot, Tuple}, tuples::{dot, Tuple},
}; };
pub fn intersect<'s>(shape: &'s Shape, ray: &Ray) -> Intersections<'s> { pub fn intersect<'s>(shape: &'s Shape, ray: &Ray) -> Intersections<'s> {
let ray = ray.transform(shape.inverse_transform);
let sphere_to_ray = ray.origin - Tuple::point(0., 0., 0.); let sphere_to_ray = ray.origin - Tuple::point(0., 0., 0.);
let a = dot(ray.direction, ray.direction); let a = dot(ray.direction, ray.direction);
let b = 2. * dot(ray.direction, sphere_to_ray); let b = 2. * dot(ray.direction, sphere_to_ray);