From 5ec38c068ddf2ed1ef99a597c01b190c611c8a9d Mon Sep 17 00:00:00 2001
From: treeform <starplant@gmail.com>
Date: Fri, 3 Dec 2021 16:50:02 -0800
Subject: [PATCH] f

---
 experiments/sweeps3.nim                 |  13 ++-
 experiments/trapezoids/output_sweep.png | Bin 5147 -> 4542 bytes
 src/pixie/fileformats/svg.nim           |   1 +
 src/pixie/paths.nim                     | 110 +++++++++---------------
 tests/benchmark_svg.nim                 |   5 +-
 5 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/experiments/sweeps3.nim b/experiments/sweeps3.nim
index 655783e..6d81fbd 100644
--- a/experiments/sweeps3.nim
+++ b/experiments/sweeps3.nim
@@ -64,6 +64,10 @@ var hourGlass = parsePath("""
   M 20 20 L 180 20 L 20 180 L 180 180 z
 """)
 
+var hourGlass2 = parsePath("""
+  M 20 20 L 180 20 L 20 180 L 180 180 z M 62 24 L 132 24 L 50 173 L 156 173 z
+""")
+
 # Hole
 var hole = parsePath("""
   M 40 40 L 40 160 L 160 160 L 160 40 z
@@ -88,6 +92,8 @@ when defined(bench):
   test("cricle", cricle, 100)
   test("halfAarc", halfAarc, 100)
   test("hourGlass", hourGlass, 100)
+  test("hourGlass2", hourGlass2, wr=wrNonZero)
+  test("hourGlass2", hourGlass2, wr=wrEvenOdd)
   test("hole", hole, 100)
   test("holeEvenOdd", holeEvenOdd, 100, wr=wrNonZero)
   test("holeEvenOdd", holeEvenOdd, 100, wr=wrEvenOdd)
@@ -99,7 +105,8 @@ else:
   # test("cricle", cricle)
   # test("halfAarc", halfAarc)
   # test("hourGlass", hourGlass)
-  #test("hole", hole, wr=wrEvenOdd)
-  test("holeEvenOdd", holeEvenOdd, wr=wrNonZero)
-  test("holeEvenOdd", holeEvenOdd, wr=wrEvenOdd)
+  test("hourGlass2", hourGlass2, wr=wrEvenOdd)
+  # test("hole", hole, wr=wrEvenOdd)
+  # test("holeEvenOdd", holeEvenOdd, wr=wrNonZero)
+  # test("holeEvenOdd", holeEvenOdd, wr=wrEvenOdd)
   # test("letterG", letterG)
diff --git a/experiments/trapezoids/output_sweep.png b/experiments/trapezoids/output_sweep.png
index 4835f2dcf6cfd844916f87c1d10c3d864dc9b9c9..516a83a91976f11ee96e8bd849a581fd2dfb4020 100644
GIT binary patch
literal 4542
zcmb_g`#+Qa|CVV}JA_!<8fI1w4Vhs%m$4~_$T6kG94ie8@s=CQ$Z2yZC2CZTSyWVH
zL$k%(p@URt4oM|>tE5tW)}QcwJib5NhsWc3U61>E-q-cIU$6U_z1N)vUyoU@pr8PE
zp;Nu&SIOT)87x0H`roKfP*7#NP<MJKuK73)86r5L(<WQrQdAKecJk)drSr2mmzC*z
zU5iV(j_TDadqoWl!<$bhe2GrOhJF6LVvu^KqmlP5SVEeTOU`+Oil@h3K668K?~mW_
z3`#>2EZpYGzE{*Wj=vyxOpa4ptT$YJx);OoLX%alk|J=sLx&uSA6*9YOLl@h4Ku)e
zZ!nx%3;RC}kk}R)k0OYl9B7uOG>en81q>{4u&vXB_{{;^AV>o`wrb^h?aL844V5j;
zIKI*14AH&Ia&jEi)&Ab0b8;QkksRe6Jk)ZwOabC<DUD}L;z1DUF+Ye?ug-cnRS7Gt
zK<38@_KRPfJjh8igCF(H`oPbnP$vP7ims_ZB{4UnQi6Il&?N#-$e}9@6so~rXwAvy
z#eI-^CciP*A3}L$AEDIPPoYKvoFTkvT%~hM3wv5~$*}4YF-0P@yK?A9^R&uUFkUg2
zxld*X*(6zcc@4T56pr$@p6Ls6!t%d3P$Res_XAgMWV{OHyAiP=jKM;aIG-5KZbelc
zr(lMiU{vIV4h%doSu4yw^L_zR<&Dm&A*!hQ69NO<21GujI~Iinci~4jy$@})LU=~v
z@YQt2!hP;W%`v@=ZX@h*7<TjfP?!$FGYN+;ro)H|7BPz;v|mvGWn9QtF$vL+;ouZi
z*Elt2us>@aFqw|x8@CS#e>%1w)p@9szK)uywoY)d-7aDAvMbr8JO!t7Xni#5<(u_J
z2vu(!K9df!arcdkS=@u(SLB~~4gfjcchwQ=q(iBhD(e<)pncde;zl=>?jOPc@Cf|f
zQYI!#nWW+wPxyTw(6nOliq@E?vGair$9wuZy*lY~YgD9sRCFw>Ecg1rJ*l4Wb&UVE
z;yzCXb|y3^DBN2evW>`KH1TImyDBtS?quAjVND{C501)qT!E3mn|A6I{|DQcg5y7u
z3$r?7giY}fd(jS#u34!oOD?YsIyj|rTbb&OmEJ+#U<tg$UY5vG%&1jn%yR>T=S2r<
z30EQ6pE4kdDyunb+}<zL+l4wlF6XSLdTV3@UxBrVfs&Y~J2&BFM9@WF+X*YNPShq&
zjiDMN9BO}Z(WFfI65A1m4f;y?fXS)}#qo3Ks}~Ps&nRWtIAqmBKPZN8_V<6I{{fp-
za}3Al(=9*?v8*e(I^IaTqq5sR`ArKkoc$1d9jB-Bu>HRxO_J&b<D-h@hZ!I1#3Pv$
z>PL`jC`}%V#S@V0k5(N+CgZ@%HBkrLvK`5I70;ankDG$WqGzN(drutRETa~sr2E|4
z`cMb6k)v;|c0Lg1G$D9xvQbCCY6p(hqxL+RQpsCSEk<VpYfX>N$g)VE>f#S?09Dop
zW8HEc$;K+4VFY15GWCrNTvo$#n>cTObKaC}ju@6WPy@ItpPWyAK6|Bso8+f+<`)bb
zu-twTn-y^s$M2zAD2`D4jXxU&Zqj<wsXiv?PqMT{4A1?g3CCI_0f=aBHYp&n6|gMb
zF=)}FgVE;b>#B8+#ozr0^56~g+Lr7hwtgr;4Y*aUek|MZmb^GGLST>Jkw}9yNb+B)
z2F{h5nhal~P>(38hEnmb^G0U^X0*!my*5=Sl?O8#@o$Tw0<nA_fWz12`kVlq5Cg^E
zHKbjBFq`|5r0SQbtcZg+ekT1+3#&Hc2s71bt}CAaoW~Dz`UOs_G{UIrn%Re@{CtQ1
zaoD;PR&>rc@XbFDe!Y~}C-+Sv4;Rw^m1vL|l=Qx<51wK(_!(RMF^1y{!RO>EjXvz!
zfru{7w&{`fN|$clX!z`j%F`YG;Xw7|t~d=Oyx-p1bDa43LJ8Y)bK-}Fw?$6Vi5&2h
z21+_>IyNZ_wy&@K+7SNxeC;4pDQ|j`T&U&bH1%3gIVI~PnHoX0O&8xsdf4ZP|D$8*
zm3X|Vv@7!!h0=KZWXOlDoyX$u**A?vVlyIfAa!-Ah2~0ChCSl^8#*%IT<}Vw>%Mau
z<qksgIrQMdhkLgMIkiGP^a4tJQw>c0Ff<D|!Eu6%^4~Bj6zxE_{FBKaF?&vNe&XOP
zu~w7qK&CFpv`MDBH&q;$wN&L>8svr8U?ixe+@2=>{d${ilxDx-yrMs!3$@ddyHMTO
zi(*qdIMa0pt=V)jE#q@@*zrj?c;Z}qxl1IrXxL$EVK^aGW84foX1MX!sS&f+m;VSN
z<;W9<t;K$X)GgP;tyY#V>-Z-&0ly%c7Vx|fD~v=vHkY{vdOBh8)x_ZwMO%PSpeO#+
zx5`qnsV$tjJIQIvZ`f8U>LBS5QyvM=hJI@x=f8-+nMwY}tEFcaQ7YYgPq0>689mTm
zaaU|=4QD#<aBA*gpT!;sFX}u}`YbZsYmlNm&@OZKc0~C43xz>uu+s@pKgC1jxN!3h
z)B&YS?*?~XB^Q?WW3mBw+IMh;d0%1h996>d)*=^T|5bB=*()Lxf<hQAk!Rji?ieFq
z_mSJN<Kk8xYD8fVex;SYEv?n{2dS_3ib;L!H9(z_LwD!MsOX#wAEX6IaMrcJaaung
z>{S?}n?0!o+Jhatgm~DsR=5+4y!I1b6{EffWH5A|o3b@M?o`$!<2Jh!GuoN(Cly2c
zk6f4@>ZI1~wj@4~KBs*qqtkzMLOAuiJ5%h5fLAM_xhdPz&z^ycI-gqg3tx8h4pSag
z0maq!Jk)QdY<t!`wqJA*xj<gb`GUgG?ve}DzB(<HD*v{LT1FZ}mMsMIY5hvD7fD-s
zOqHk^KC%Q0nN*X#{sB+=PA=p<l*alVy1A$X>FX`)U?(VSXq%Zn<b#J-Gm(hxi&_DK
z;dHcy%ccewq)jm!?UBF=lsZP6!>g&|Gf!$-;5NQt)`q+a%1qmlHG?cxbGdJcBglZu
z)`hh{NGR>bzsu7NWo&~!w_Z7TuhMX&J$Nwa>J&3(*$m!Lv~ccy0dp_bcKH^Imyw*j
zyl?HW!|ve82#^WJ;yzgoYO-CLoDaYnphstAKS2eTW3K|mm!W}*dYfk_Xv_c|$Zle@
zZEl12me<YJZK<O%-gffZ{Z}pkn$2M)sq5xC^|;C;`TF0&D$js~?$VG8^WSt*@j>xz
zMQ;qvsyGI3D$v<JC^C8cq;@qDx3-0K!6hgd{#2V5RZdSkXjJ}DW>31ZbRAHyfi{s?
zPXz(6v%2Pn@=$(kt@`7=&E4brQWc<1a9?QegB`VrKvqrB^HimHnLWbT&7<ls*3&f!
zMrfW`o)&X48teN1v5ajdYME>_w8zlb+!JW^+a^nvyInCf!)<DvyPg$kmUFcZy^-ro
zV;5i&L;nPLY^Fs~31^K~eSM#~6*Pri2WE(8dO@$v7i%V3D$Mh}eF;J>WWM&T{QDR3
z!925zt9KS|bcA2@!`2?=u2inuKPd8eJY6TBO*`Iq-4R;CsqbFQYSN<o3Bov|@@@7G
zdK;rGF!cPHpUNPQJ%i0P6t4{Yf3HVB%^!-2e==S7PELH+1%;<r+1}?*)8X0F)YTta
zkWTl4>({D)8DUfSZ(GpCz857Lw5Yv=-|(La*fHacQC1i_f{2ZfjmP?i_Hy4B^axWJ
zH#7D<p01Hb;>_M39Bi+nc!BUQUUuC^q*iLt+?+vW^31^J{o=8;zv-*N`g)W$kF8Ic
z<U;g`qIlAPQvSMk_G^;m`#gow9?^!dwwlJPK)-Nn<^D^Xys)(o=uGa42I6<A)(vqL
z;93g}T;q{1n==^XvpTq68u;5zf4e5G23)0G)4G)8M@8qZ>GA#nMnz4#FD8K^aQo)u
zE5d;T=Q@krbl2oJ3;IR>lDL~M90`gu*>8G}0hFkY?d`|rOfuM^3(IzVklx+kuqPCZ
zL@5Pp?ab;|(u1BUV5%;XA?F}wg0x6n$WlxSZ1lOvD5Qc&vE$hi$7Hev85o6vGhu33
z0Alf9<p;K6m-Jbg8q_0}6*mNer-4bkFtl=;m&P%yK~B-r^qyh%CG2WF5_E$D=IP{h
zYrmOOPMuG%OlRLFVrOMt&Ic|lM&KO3h*k9pnjw@#hGh7NRCL;CK6o+|QTlvom%1wm
zec2N6Nur!OonW~eV!YPw_~E#`87{fd?pI6?>o(A8%?$r6dDF~73!d((=Gv5lA6MBU
zJ{2na{us}jkvT)5aBQe3g0NxOp?zme&*E8SyUBvb5y(`y+*)&t)RC-$LegOE10uKB
z@@qvKaKr|(3n4j@kUat+&6Raqo2NH@A8(Y&FwnE`qv1nzYCQ-oCwv3_l=NPX-Eupd
z{TXP*B;Io75yxNb?w(qFfD#3yCe%xKipXfQMZ>$YV+GYEgSY^>+<M>_cGY76ckC&!
zEhLc(7|krT?%<8A<!NMn8&>vR8E+(f$nkGOQThwVXfH7?^@?Z>8tnO+EGz#fk4UE^
z_+QNprJ39Xqx-Lx-}xSqqgjQ=`*l}3=6&Pp-Gh|o!x>dyenbQk8kL#ll;Ac(`nT%|
zN^G064L4aDEY8lC^jiizF@)rftspl3Oy~?uLPQG$5@E})ptzT6E>$43Wj^YGw&?BK
z=%la8niTspj&S0ftpLs?TNJLFN*p?Eka*-%UX#|8EEQT0oBuiVAp08avBW`~*ZtF3
zY0s}{^URETqxmSA!7o~5EFlld<jH09{n_oJJ7Q*X;n37K7U=WOx6hu^F&Yv=Ok!n@
z>_BH=o=k>-*2Cv*=W5(?t4#s<w**$t`~?Z<Paeu^1h+`*dYdc+FD{3Wjd;#Vq)6<9
zs%qSakot9$xtBA3=+Nv#W^>hUIn~R6>qc66O5krqfOhf_yrEfoJThQ(NO+?=|3xu9
zN>f6PNo=n8Zl2nDA)O6P%YZf5&(FAVs_y`<n`tonf?1@QR|`uZpU_~0#H#Wh&8yEL
zj8paM+SmTGvy7{5zJucyM}p$>t53=aS*_&s<16Ea5Y0B+a{XM`rGp1`YkhDnJ;N;(
z-!BDNR$s_nWv8>PVePR`4L+b;jwzOHL3|ojF8w}kNYiYyIdcv(`@39k-#EV33D+W4
z?KT1jy`GgnX~u83qdGxjoEV=&SaArGzgfD{+wbFb3QMPTks}t1t1$x)jJZmhbgh^k
zDUI7)aW^IX>Uw6;A9PX%(3@v=(Tb{e6qnR9*<qAk|0~)D2idTHB?HLlz2r8>RYKE)
z<U#aQ(nfs~d$q)|I@m_=`RxmL*;p4AFr$&x+L>{BW&H0y{$(7}SOH-!V2lNzM*GrZ
z1Sw-riVp{&&Cq_E8i0Ye-a)nQX5|Nk@mL=i<Xb@7u#o36s}f8QDe>a48x-W52MZ~@
zdTCl_2)(~~^b{`+Zp6bWO3e_TKB$&YCDhA<u0rV-uDYC2@gkH!cnMh3v32twWD_pY
z>LvD&)<FLd*_NV;WPPqThCUIKXq;a8W4taHX$%fJ!g%76rM8Puvet`=HC=ro1Q1%~
zU&MPKvW9N6wk(EajJ?&{7f&crlEV`}@ooK|d;yl=QI{BevLcM`<Lq?`=k!pu`%_wi
z74!P~yg$)1ZeXOl*_}GPfq5Z+Y7vny+us?uRxFBwo;DZ!x#d`o=RH<5pdjupA>PZo
z1Cv3JmL9I5HP1`YzzXrqIMmrI5r@e#+!er8$8f|~a=e`h?6v%u8j`xEiw+Qht#fs9
z<|WIA)a~-*&S-HmG!W&{U#x0mc7;D5`QC-_y^H>TS{Q$uAd9CDr4AFWG<$~2T~u&!
La;M(d#Yq1j2M7Zx

literal 5147
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
I>$#!+8+yj4IsgCw

diff --git a/src/pixie/fileformats/svg.nim b/src/pixie/fileformats/svg.nim
index f786db8..293d3a2 100644
--- a/src/pixie/fileformats/svg.nim
+++ b/src/pixie/fileformats/svg.nim
@@ -2,6 +2,7 @@
 
 import chroma, pixie/common, pixie/images, pixie/internal, pixie/paints,
     pixie/paths, strutils, tables, vmath, xmlparser, xmltree
+
 when defined(pixieDebugSvg):
   import strtabs
 
diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
index e219689..fe51b71 100644
--- a/src/pixie/paths.nim
+++ b/src/pixie/paths.nim
@@ -2267,78 +2267,46 @@ when defined(pixieSweeps):
     i = 0
     while i < sweeps.len:
       # TODO: Maybe finds all cuts first, add them to array, cut all lines at once.
-      for t in 0 ..< 10: # TODO: maybe while true:
-        # keep cutting sweep
-        var needsCut = false
-        var cutterLine: float32 = 0
-        block doubleFor:
-          for a in sweeps[i]:
-            let aSeg = segment(
-              vec2(a.atx, cutLines[i]),
-              vec2(a.tox, cutLines[i+1])
-            )
-            for b in sweeps[i]:
-              let bSeg = segment(
-                vec2(b.atx, cutLines[i]),
-                vec2(b.tox, cutLines[i+1])
-              )
-              var at: Vec2
-              if intersectsInner(aSeg, bSeg, at):
-                needsCut = true
-                cutterLine = at.y
-                break doubleFor
-        # TODO enable?
-        if false and needsCut:
-          # Doing a cut.
-          var
-            thisSweep = sweeps[i]
-          sweeps[i].setLen(0)
-          sweeps.insert(newSeq[SweepLine](), i + 1)
-          for a in thisSweep:
-            let seg = segment(vec2(a.atx, cutLines[i]), vec2(a.tox, cutLines[i+1]))
-            var at: Vec2
-            if intersects(line(vec2(0, cutterLine), vec2(1, cutterLine)), seg, at):
-              sweeps[i+0].add(toLine((segment(seg.at, at), a.winding)))
-              sweeps[i+1].add(toLine((segment(at, seg.to), a.winding)))
-          cutLines.binaryInsert(cutterLine)
-        else:
-          break
-      inc i
+      var crossCuts: seq[float32]
 
-    # i = 0
-    # while i < sweeps.len:
-    #   # TODO: Maybe finds all cuts first, add them to array, cut all lines at once.
-    #   for t in 0 ..< 10: # TODO: maybe while true:
-    #     # keep cutting sweep
-    #     var needsCut = false
-    #     var cutterLine: float32 = 0
-    #     block doubleFor:
-    #       for a in sweeps[i]:
-    #         let aSeg = segment(vec2(a.atx, cutLines[i]), vec2(a.tox, cutLines[i+1]))
-    #         for b in sweeps[i]:
-    #           let bSeg = segment(vec2(b.atx, cutLines[i]), vec2(b.tox, cutLines[i+1]))
-    #           var at: Vec2
-    #           if intersectsInner(aSeg, bSeg, at):
-    #             needsCut = true
-    #             cutterLine = at.y
-    #             break doubleFor
-    #     # TODO enable?
-    #     if false and needsCut:
-    #       # Doing a cut.
-    #       var
-    #         thisSweep = sweeps[i]
-    #       sweeps[i].setLen(0)
-    #       sweeps.insert(newSeq[SweepLine](), i + 1)
-    #       for a in thisSweep:
-    #         let seg = segment(vec2(a.atx, cutLines[i]), vec2(a.tox, cutLines[i+1]))
-    #         var at: Vec2
-    #         if intersects(line(vec2(0, cutterLine), vec2(1, cutterLine)), seg, at):
-    #           sweeps[i+0].add(toLine((segment(seg.at, at), a.winding)))
-    #           sweeps[i+1].add(toLine((segment(at, seg.to), a.winding)))
-    #       cutLines.binaryInsert(cutterLine)
-    #     else:
-    #       break
-    #   inc i
+      # echo i, " cut?"
+
+      for aIndex in 0 ..< sweeps[i].len:
+        let a = sweeps[i][aIndex]
+        # echo i, ":", sweeps.len, ":", cutLines.len
+        let aSeg = segment(vec2(a.atx, cutLines[i]), vec2(a.tox, cutLines[i+1]))
+        for bIndex in aIndex + 1 ..< sweeps[i].len:
+          let b = sweeps[i][bIndex]
+          let bSeg = segment(vec2(b.atx, cutLines[i]), vec2(b.tox, cutLines[i+1]))
+          var at: Vec2
+          if intersectsInner(aSeg, bSeg, at):
+            crossCuts.binaryInsert(at.y)
+
+      if crossCuts.len > 0:
+        var
+          thisSweep = sweeps[i]
+          yTop = cutLines[i]
+          yBottom = cutLines[i + 1]
+        sweeps[i].setLen(0)
+
+        for k in crossCuts:
+          let prevLen = cutLines.len
+          cutLines.binaryInsert(k)
+          if prevLen != cutLines.len:
+            sweeps.insert(newSeq[SweepLine](), i + 1)
+
+        for a in thisSweep:
+          var seg = segment(vec2(a.atx, yTop), vec2(a.tox, yBottom))
+          var at: Vec2
+          for j, cutterLine in crossCuts:
+            if intersects(line(vec2(0, cutterLine), vec2(1, cutterLine)), seg, at):
+              sweeps[i+j].add(toLine((segment(seg.at, at), a.winding)))
+              seg = segment(at, seg.to)
+          sweeps[i+crossCuts.len].add(toLine((seg, a.winding)))
+
+        i += crossCuts.len
+
+      inc i
 
     i = 0
     while i < sweeps.len:
diff --git a/tests/benchmark_svg.nim b/tests/benchmark_svg.nim
index c158d6d..b44ffc3 100644
--- a/tests/benchmark_svg.nim
+++ b/tests/benchmark_svg.nim
@@ -1,6 +1,9 @@
-import benchy, pixie/fileformats/svg
+import benchy, pixie/fileformats/svg, pixie/fileformats/png
 
 let data = readFile("tests/fileformats/svg/Ghostscript_Tiger.svg")
+#let data = readFile("tests/fileformats/svg/rotatedRect.svg")
+
+writeFile("tiger.png", decodeSvg(data).encodePng())
 
 timeIt "svg decode":
   discard decodeSvg(data)