[encoding] Do not encode zero-length path segments
Zero-length segments lead to numerical errors and lead to extra
complexity and wasted work (in the form of thread allocation) for GPU
flattening. We now detect and drop them at encoding time.
Currently, a path segment is considered zero-length if all of its
control points (in local coordinates) are within EPSILON (1e-12) of
each other. This may not be the desired behavior under transform.
Also since the length here isn't in terms of the actual arc length,
this won't detect all curves that are within an EPSILON sized bounding
box (which may have a larger distance between their control points).
For stroking purposes, the distance between the control points is what
matters most as that's what's used to compute a curve's tangent.
diff --git a/crates/encoding/src/path.rs b/crates/encoding/src/path.rs
index a4a8905..91bca2c 100644
--- a/crates/encoding/src/path.rs
+++ b/crates/encoding/src/path.rs
@@ -525,13 +525,15 @@
if self.state == PathState::MoveTo {
let p0 = (self.first_point[0], self.first_point[1]);
// Ensure that we don't end up with a zero-length start tangent.
- let Some((x, y)) = start_tangent_for_curve(p0, (x, y), p0, p0) else {
- // Drop the segment if its length is zero
- // TODO: do this for all not segments, not just start.
+ let Some((x, y)) = start_tangent_for_curve(p0, (x, y), None, None) else {
return;
};
self.first_start_tangent_end = [x, y];
}
+ // Drop the segment if its length is zero
+ if self.is_zero_length_segment((x, y), None, None) {
+ return;
+ }
let buf = [x, y];
let bytes = bytemuck::bytes_of(&buf);
self.data.extend_from_slice(bytes);
@@ -552,13 +554,15 @@
if self.state == PathState::MoveTo {
let p0 = (self.first_point[0], self.first_point[1]);
// Ensure that we don't end up with a zero-length start tangent.
- let Some((x, y)) = start_tangent_for_curve(p0, (x1, y1), (x2, y2), p0) else {
- // Drop the segment if its length is zero
- // TODO: do this for all not segments, not just start.
+ let Some((x, y)) = start_tangent_for_curve(p0, (x1, y1), Some((x2, y2)), None) else {
return;
};
self.first_start_tangent_end = [x, y];
}
+ // Drop the segment if its length is zero
+ if self.is_zero_length_segment((x1, y1), Some((x2, y2)), None) {
+ return;
+ }
let buf = [x1, y1, x2, y2];
let bytes = bytemuck::bytes_of(&buf);
self.data.extend_from_slice(bytes);
@@ -579,13 +583,17 @@
if self.state == PathState::MoveTo {
let p0 = (self.first_point[0], self.first_point[1]);
// Ensure that we don't end up with a zero-length start tangent.
- let Some((x, y)) = start_tangent_for_curve(p0, (x1, y1), (x2, y2), (x3, y3)) else {
- // Drop the segment if its length is zero
- // TODO: do this for all not segments, not just start.
+ let Some((x, y)) =
+ start_tangent_for_curve(p0, (x1, y1), Some((x2, y2)), Some((x3, y3)))
+ else {
return;
};
self.first_start_tangent_end = [x, y];
}
+ // Drop the segment if its length is zero
+ if self.is_zero_length_segment((x1, y1), Some((x2, y2)), Some((x3, y3))) {
+ return;
+ }
let buf = [x1, y1, x2, y2, x3, y3];
let bytes = bytemuck::bytes_of(&buf);
self.data.extend_from_slice(bytes);
@@ -703,6 +711,33 @@
);
}
}
+
+ fn last_point(&self) -> Option<(f32, f32)> {
+ let len = self.data.len();
+ if len < 8 {
+ return None;
+ }
+ let pts: &[f32; 2] = bytemuck::from_bytes(&self.data[len - 8..len]);
+ Some((pts[0], pts[1]))
+ }
+
+ fn is_zero_length_segment(
+ &self,
+ p1: (f32, f32),
+ p2: Option<(f32, f32)>,
+ p3: Option<(f32, f32)>,
+ ) -> bool {
+ let p0 = self.last_point().unwrap();
+ let p2 = p2.unwrap_or(p1);
+ let p3 = p3.unwrap_or(p1);
+
+ let x_min = p0.0.min(p1.0.min(p2.0.min(p3.0)));
+ let x_max = p0.0.max(p1.0.max(p2.0.max(p3.0)));
+ let y_min = p0.1.min(p1.1.min(p2.1.min(p3.1)));
+ let y_max = p0.1.max(p1.1.max(p2.1.max(p3.1)));
+
+ !(x_max - x_min > EPSILON || y_max - y_min > EPSILON)
+ }
}
#[cfg(feature = "full")]
@@ -728,6 +763,8 @@
}
}
+const EPSILON: f32 = 1e-12;
+
// Returns the end point of the start tangent of a curve starting at `(x0, y0)`, or `None` if the
// curve is degenerate / has zero-length. The inputs are a sequence of control points that can
// represent a line, a quadratic Bezier, or a cubic Bezier. Lines and quadratic Beziers can be
@@ -735,24 +772,16 @@
fn start_tangent_for_curve(
p0: (f32, f32),
p1: (f32, f32),
- p2: (f32, f32),
- p3: (f32, f32),
+ p2: Option<(f32, f32)>,
+ p3: Option<(f32, f32)>,
) -> Option<(f32, f32)> {
- debug_assert!(!p0.0.is_nan());
- debug_assert!(!p0.1.is_nan());
- debug_assert!(!p1.0.is_nan());
- debug_assert!(!p1.1.is_nan());
- debug_assert!(!p2.0.is_nan());
- debug_assert!(!p2.1.is_nan());
- debug_assert!(!p3.0.is_nan());
- debug_assert!(!p3.1.is_nan());
-
- const EPS: f32 = 1e-12;
- let pt = if (p1.0 - p0.0).abs() > EPS || (p1.1 - p0.1).abs() > EPS {
+ let p2 = p2.unwrap_or(p0);
+ let p3 = p3.unwrap_or(p0);
+ let pt = if (p1.0 - p0.0).abs() > EPSILON || (p1.1 - p0.1).abs() > EPSILON {
p1
- } else if (p2.0 - p0.0).abs() > EPS || (p2.1 - p0.1).abs() > EPS {
+ } else if (p2.0 - p0.0).abs() > EPSILON || (p2.1 - p0.1).abs() > EPSILON {
p2
- } else if (p3.0 - p0.0).abs() > EPS || (p3.1 - p0.1).abs() > EPS {
+ } else if (p3.0 - p0.0).abs() > EPSILON || (p3.1 - p0.1).abs() > EPSILON {
p3
} else {
return None;
