Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions src/s2/edge_clipping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ pub fn clip_to_padded_face(
}
norm_uvw = norm_uvw.normalize();
let a_tan = norm_uvw.cross(&a_uvw);
let b_tan = norm_uvw.cross(&b_uvw);
let b_tan = b_uvw.cross(&norm_uvw);

// As described in clipDestination, if the sum of the scores from clipping the two
// endpoints is 3 or more, then the segment does not intersect this face
let (a_uv, a_score) = clip_destination(b_uvw, a_uvw, scaled_n * -1_f64, b_tan, a_tan, scale_uv);
let (b_uv, b_score) = clip_destination(a_uvw, b_uvw, scaled_n * -1_f64, a_tan, b_tan, scale_uv);
let (b_uv, b_score) = clip_destination(a_uvw, b_uvw, scaled_n, a_tan, b_tan, scale_uv);

(a_uv, b_uv, a_score + b_score < 3)
}
Expand Down Expand Up @@ -774,6 +774,34 @@ fn next_face(face: u8, exit: r2::point::Point, axis: Axis, n: PointUVW, target_f
#[cfg(test)]
pub mod test {
use super::*;

#[test]
fn test_clip_to_padded_face_edge_cases() {
let face: u8 = 0; // +X face (U = Y, V = Z)
let padding = 0.0;

// Case 1: Edge crosses the face boundary (U=2.0 to U=-2.0)
let a = Point::from_coords(1.0, 2.0, 0.0).normalize();
let b = Point::from_coords(1.0, -2.0, 0.0).normalize();
let (a_uv, b_uv, intersects) = super::clip_to_padded_face(a, b, face, padding);

assert_eq!(intersects, true, "Case 1: Should intersect");
assert!((a_uv.x - 1.0).abs() < 1e-9, "Case 1: A_UV x should be 1.0");
assert!(
(b_uv.x - -1.0).abs() < 1e-9,
"Case 1: B_UV x should be -1.0"
);

// Case 2: Edge completely outside the face bounds (U=5.0 to U=4.0)
let a_out = Point::from_coords(1.0, 5.0, 0.0).normalize();
let b_out = Point::from_coords(1.0, 4.0, 0.0).normalize();
let (_, _, intersects_out) = super::clip_to_padded_face(a_out, b_out, face, padding);

assert_eq!(
intersects_out, false,
"Case 2: Should correctly reject out-of-bounds edge"
);
}
use crate::consts::DBL_EPSILON;
use crate::s2::random;
use float_extras::f64::nextafter;
Expand Down
Loading