Merge pull request #1159 from hannobraun/intersection

Add `HorizontalRayToTheRight::direction`
hannobraun · Sep 30, 2022 · 37c3382 · 37c3382
2 parents ccd97c3 + bbe501f
commit 37c3382
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/crates/fj-kernel/src/algorithms/intersect/mod.rs b/crates/fj-kernel/src/algorithms/intersect/mod.rs
@@ -11,7 +11,7 @@ mod face_face;
 mod line_segment;
 mod surface_surface;
 
-use fj_math::Point;
+use fj_math::{Point, Vector};
 
 pub use self::{
     curve_edge::CurveEdgeIntersection,
@@ -45,6 +45,15 @@ pub struct HorizontalRayToTheRight<const D: usize> {
     pub origin: Point<D>,
 }
 
+impl<const D: usize> HorizontalRayToTheRight<D> {
+    /// Access the direction of this ray
+    pub fn direction(&self) -> Vector<D> {
+        let mut components = [0.; D];
+        components[0] = 1.;
+        components.into()
+    }
+}
+
 impl<P, const D: usize> From<P> for HorizontalRayToTheRight<D>
 where
     P: Into<Point<D>>,

diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_face.rs b/crates/fj-kernel/src/algorithms/intersect/ray_face.rs
@@ -1,6 +1,6 @@
 //! Intersection between a ray and a face, in 3D
 
-use fj_math::{Point, Scalar, Vector};
+use fj_math::{Point, Scalar};
 
 use crate::{
     algorithms::intersect::face_point::FacePointIntersection,
@@ -28,9 +28,7 @@ impl Intersect for (&HorizontalRayToTheRight<3>, &Face) {
 
         let plane_and_ray_are_parallel = {
             let plane_normal = plane_direction_1.cross(&plane_direction_2);
-            let ray_direction = Vector::from([1., 0., 0.]);
-
-            plane_normal.dot(&ray_direction) == Scalar::ZERO
+            plane_normal.dot(&ray.direction()) == Scalar::ZERO
         };
 
         if plane_and_ray_are_parallel {

diff --git a/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs b/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs
@@ -81,6 +81,7 @@ fn plane_from_surface(surface: &Surface) -> Plane {
 #[cfg(test)]
 mod tests {
     use fj_math::Transform;
+    use pretty_assertions::assert_eq;
 
     use crate::{
         algorithms::transform::TransformObject,