From dffad18641ac2c7838ffc701b555e8755eeb0e58 Mon Sep 17 00:00:00 2001
From: treeform <starplant@gmail.com>
Date: Thu, 30 Jun 2022 08:50:02 -0700
Subject: [PATCH 1/2] Quantize each vertex only once.

---
 src/pixie/paths.nim | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
index f2360b92..280f4de2 100644
--- a/src/pixie/paths.nim
+++ b/src/pixie/paths.nim
@@ -1054,8 +1054,21 @@ proc commandsToShapes(
 
 proc shapesToSegments(shapes: seq[Polygon]): seq[(Segment, int16)] =
   ## Converts the shapes into a set of filtered segments with winding value.
-  for shape in shapes:
-    for segment in shape.segments:
+
+  # Quantize the segment to prevent leaks
+  template quantize(v: Vec2, q: float32): Vec2 =
+    vec2(v.x.quantize(q), v.y.quantize(q))
+
+  for poly in shapes:
+    var
+      vec1 = poly[^1].quantize(1 / 256)
+      vec2 = poly[0].quantize(1 / 256)
+      segment: Segment
+    for i in 0 ..< poly.len:
+      if i != 0:
+        vec2 = vec1
+        vec1 = poly[i].quantize(1 / 256)
+      segment = segment(vec1, vec2)
       if segment.at.y == segment.to.y: # Skip horizontal
         continue
       var
@@ -1065,12 +1078,6 @@ proc shapesToSegments(shapes: seq[Polygon]): seq[(Segment, int16)] =
         swap(segment.at, segment.to)
         winding = -1
 
-      # Quantize the segment to prevent leaks
-      segment = segment(
-        vec2(segment.at.x.quantize(1 / 256), segment.at.y.quantize(1 / 256)),
-        vec2(segment.to.x.quantize(1 / 256), segment.to.y.quantize(1 / 256))
-      )
-
       result.add((segment, winding))
 
 proc transform(shapes: var seq[Polygon], transform: Mat3) =

From ba5681e452c80cbf1afa08eefac7f5de07023488 Mon Sep 17 00:00:00 2001
From: treeform <starplant@gmail.com>
Date: Thu, 30 Jun 2022 10:59:38 -0700
Subject: [PATCH 2/2] Cleanup.

---
 src/pixie/paths.nim | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
index 280f4de2..b8fa5a14 100644
--- a/src/pixie/paths.nim
+++ b/src/pixie/paths.nim
@@ -1056,19 +1056,21 @@ proc shapesToSegments(shapes: seq[Polygon]): seq[(Segment, int16)] =
   ## Converts the shapes into a set of filtered segments with winding value.
 
   # Quantize the segment to prevent leaks
-  template quantize(v: Vec2, q: float32): Vec2 =
-    vec2(v.x.quantize(q), v.y.quantize(q))
+  template quantizeY(v: Vec2): Vec2 =
+    vec2(v.x, v.y.quantize(1 / 256))
 
   for poly in shapes:
     var
-      vec1 = poly[^1].quantize(1 / 256)
-      vec2 = poly[0].quantize(1 / 256)
+      vec1 = poly[^1].quantizeY()
+      vec2: Vec2
       segment: Segment
     for i in 0 ..< poly.len:
-      if i != 0:
-        vec2 = vec1
-        vec1 = poly[i].quantize(1 / 256)
+      vec2 = poly[i].quantizeY()
+      if i == 0 and vec1 == vec2:
+        continue
       segment = segment(vec1, vec2)
+      vec1 = vec2
+
       if segment.at.y == segment.to.y: # Skip horizontal
         continue
       var