- added tests for cone_vs_plane

Author: polymonster

src/lib.rs

@@ -749,14 +749,14 @@ pub fn capsule_vs_plane<T: Float + FloatOps<T> + SignedNumber + SignedNumberOps<
 }
 
 /// return the classification of cone defined by position cp, direction cv with height h and radius at the base of r. vs the plane defined by point x and normal n
-pub fn cone_vs_plane<T: Float, V: VecN<T> + Cross<T> + SignedVecN<T> + VecFloatOps<T>>(cp: V, cv: V, h: T, r: T, x: V, n: V) -> Classification {
+pub fn cone_vs_plane<T: Float + SignedNumberOps<T>, V: VecN<T> + Cross<T> + Dot<T> + SignedVecN<T> + VecFloatOps<T>>(cp: V, cv: V, h: T, r: T, x: V, n: V) -> Classification {
     let tip = cp + cv * h;
     let pd = plane_distance(x, n);
     // check if the tip and cones extent are on different sides of the plane
     let d1 = dot(n, tip) + pd;
     // extent from the tip is at the base centre point perp of cv at the radius edge... we need to choose the side toward the plane
-    let perp = normalize(cross(cross(n, cv), cv));
-    let extent = cp + perp * r;
+    let perp = normalize(cross(cross(n, -cv), -cv));
+    let extent = cp + perp * r * signum(dot(cv, n));
     let d2 = dot(n, extent);
     if d1 < T::zero() && d2 < T::zero() {
         Classification::Behind
@@ -1350,10 +1350,9 @@ pub fn map_to_range<T: Float, X: Base<T>>(v: X, in_start: X, in_end: X, out_star
 // capsule_vs_sphere
 // obb_vs_aabb
 // obb_vs_sphere
+// obb_vs_obb
 // line_vs_sphere
 // line_vs_aabb
-// obb_vs_aabb
-// obb_vs_sphere
 
 // TODO c++
 // point inside cone test has no passes

tests/tests.rs

@@ -2766,4 +2766,127 @@ fn swizzle() {
     let mut v4x = vec4f(2.0, 2.0, 2.0, 2.0);
     v4x.set_yxzw(v4);
     assert_eq!(v4x, vec4f(7.0, 8.0, 5.0, 3.0));
+}
+
+#[test]
+fn cone_vs_plane_test() {
+    // use a simple plane at 0,0,0 +z
+    let x = Vec3f::zero();
+    let n = Vec3f::unit_z();
+
+    // behind
+    /*    
+        +z
+        ^         
+        |         
+        --------------------- +x (0, 0, 0)
+            cp2 (5,-1)
+        cp1 (0,-5)
+    */
+
+    let cp1 = Vec3f::new(0.0, 0.0, -5.0);
+    let cp2 = Vec3f::new(5.0, 0.0, -1.0);
+    let r = 4.0;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Behind);
+
+    // infront
+    /*    
+        +z
+        ^           cp2 (2,2)
+        |   cp1 (1,1)         
+        --------------------- +x (0, 0, 0)
+    */
+
+    let cp1 = Vec3f::new(1.0, 0.0, 1.0);
+    let cp2 = Vec3f::new(2.0, 0.0, 2.0);
+    let r = 0.5;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Infront);
+
+
+    // intersect fully through the line seg
+    /*    
+        +z
+        ^         cp2 (5,5)
+        |         
+        --------------------- +x (0, 0, 0)
+
+        cp1 (0,-1)
+    */
+    
+    let cp1 = Vec3f::new(0.0, 0.0, -1.0);
+    let cp2 = Vec3f::new(5.0, 0.0, 5.0);
+    let r = 4.0;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Intersects);
+
+    // intersect the base on the right side
+    /*    
+        +z
+        ^
+        |         
+        --------------------- +x (0, 0, 0)
+                cp1 (5, -1)
+        
+        cp2 (0,-5)
+    */
+
+    let cp1 = Vec3f::new(5.0, 0.0, -1.0);
+    let cp2 = Vec3f::new(0.0, 0.0, -5.0);
+    let r = 10.0;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Intersects);
+
+    // intersect the base on the left side
+    /*    
+        +z
+        ^
+        |         
+        --------------------- +x (0, 0, 0)
+                cp1 (5, -1)
+        
+                        cp1 (10,-5)
+    */
+    
+    let cp1 = Vec3f::new(5.0, 0.0, -1.0);
+    let cp2 = Vec3f::new(10.0, 0.0, -5.0);
+    let r = 100.0;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Intersects);
+
+    // intersect the base on the right side
+    /*            
+        cp2 (0,5)
+
+                cp1 (5, 1)
+        --------------------- +x (0, 0, 0)
+    */
+    
+    let cp1 = Vec3f::new(5.0, 0.0, 1.0);
+    let cp2 = Vec3f::new(0.0, 0.0, 5.0);
+    let r = 10.0;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Intersects);
+
+    // intersect the base on the left side
+    /*
+                        cp1 (10,5)
+
+                cp1 (5, 1)
+        --------------------- +x (0, 0, 0)
+    */
+    
+    let cp1 = Vec3f::new(5.0, 0.0, 1.0);
+    let cp2 = Vec3f::new(10.0, 0.0, 5.0);
+    let r = 100.0;
+    let cv = normalize(cp2-cp1);
+    let h = dist(cp1, cp2);
+    assert_eq!(cone_vs_plane(cp1, cv, h, r, x, n), Classification::Intersects);
 }