From 2be2fd18438dbade0b3e76a065d4c64f809a2598 Mon Sep 17 00:00:00 2001 From: tiye Date: Sat, 14 Jan 2023 00:46:01 +0800 Subject: [PATCH] pass curve-idx in segments-curves; tag 0.0.35 --- .github/workflows/upload.yaml | 2 +- calcit.cirru | 785 ++++++++++++++++++++-------------- compact.cirru | 90 ++-- package.json | 4 +- shaders/segments-curves.frag | 3 +- shaders/segments-curves.vert | 4 + yarn.lock | 282 ++++++------ 7 files changed, 656 insertions(+), 514 deletions(-) diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 08d44d3..47bc893 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -24,7 +24,7 @@ jobs: - name: add cr run: | mkdir -p $GITHUB_WORKSPACE/bin - wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.19/cr + wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.20/cr chmod +x $GITHUB_WORKSPACE/bin/cr echo "::add-path::$GITHUB_WORKSPACE/bin" diff --git a/calcit.cirru b/calcit.cirru index 4008a6d..ccd2e44 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1,6 +1,6 @@ {} - :configs $ {} (:init-fn |triadica.app.main/main!) (:port 6001) (:reload-fn |triadica.app.main/reload!) (:version |0.0.34) + :configs $ {} (:init-fn |triadica.app.main/main!) (:port 6001) (:reload-fn |triadica.app.main/reload!) (:version |0.0.35) :modules $ [] |touch-control/ |respo.calcit/ |memof/ |quaternion/ :entries $ {} :ir $ {} (:package |triadica) @@ -5683,6 +5683,12 @@ |b $ {} (:at 1671870421830) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1671870424744) (:by |u0) (:text |comp-segments-demo) (:type :leaf) + |zu $ {} (:at 1671870419597) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628232627) (:by |u0) (:text |:segments-curves) (:type :leaf) + |b $ {} (:at 1671870421830) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628235990) (:by |u0) (:text |comp-segments-curves-demo) (:type :leaf) |l $ {} (:at 1656781509863) (:by |u0) (:type :expr) :data $ {} |D $ {} (:at 1656781513405) (:by |u0) (:text |if-not) (:type :leaf) @@ -5724,6 +5730,113 @@ |b $ {} (:at 1662538021512) (:by |u0) (:text |:tab-focus) (:type :leaf) |e $ {} (:at 1662538037054) (:by |u0) (:text |key) (:type :leaf) |h $ {} (:at 1662538023674) (:by |u0) (:text |) (:type :leaf) + |comp-segments-curves-demo $ {} (:at 1673628246395) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628246395) (:by |u0) (:text |defn) (:type :leaf) + |b $ {} (:at 1673628246395) (:by |u0) (:text |comp-segments-curves-demo) (:type :leaf) + |h $ {} (:at 1673628246395) (:by |u0) (:type :expr) + :data $ {} + |l $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |comp-segments-curves) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |:curves) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673631856029) (:by |u0) (:text |->) (:type :leaf) + |X $ {} (:at 1673631856656) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673631857238) (:by |u0) (:text |range) (:type :leaf) + |b $ {} (:at 1673631860032) (:by |u0) (:text |4) (:type :leaf) + |b $ {} (:at 1673631861352) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1673631863092) (:by |u0) (:text |map) (:type :leaf) + |T $ {} (:at 1673631863569) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1673631864067) (:by |u0) (:text |fn) (:type :leaf) + |L $ {} (:at 1673631864407) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673631865374) (:by |u0) (:text |j) (:type :leaf) + |T $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |->) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |range) (:type :leaf) + |b $ {} (:at 1673628259639) (:by |u0) (:text |400) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |map) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |fn) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |idx) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |let) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |angle) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |*) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |idx) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:text |0.08) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |h) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |*) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |0.1) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:text |idx) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |r) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |40) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |[]) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |+) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |100) (:type :leaf) + |e $ {} (:at 1673631906175) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673631906175) (:by |u0) (:text |*) (:type :leaf) + |b $ {} (:at 1673631906175) (:by |u0) (:text |j) (:type :leaf) + |h $ {} (:at 1673631908962) (:by |u0) (:text |40) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |*) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |r) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |cos) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |angle) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:text |h) (:type :leaf) + |l $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |*) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |r) (:type :leaf) + |h $ {} (:at 1673628247975) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673628247975) (:by |u0) (:text |sin) (:type :leaf) + |b $ {} (:at 1673628247975) (:by |u0) (:text |angle) (:type :leaf) |comp-segments-demo $ {} (:at 1671870432433) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1671870432433) (:by |u0) (:text |defn) (:type :leaf) @@ -6033,89 +6146,6 @@ :data $ {} |T $ {} (:at 1671870477219) (:by |u0) (:text |:width) (:type :leaf) |b $ {} (:at 1672422451269) (:by |u0) (:text |1) (:type :leaf) - |b $ {} (:at 1672639219844) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672639237483) (:by |u0) (:text |comp-segments-curves) (:type :leaf) - |b $ {} (:at 1672639238264) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672639238610) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672639241396) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672639243457) (:by |u0) (:text |:curves) (:type :leaf) - |b $ {} (:at 1672639243946) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672639244307) (:by |u0) (:text |[]) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |->) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |range) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |400) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |map) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |fn) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |idx) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |let) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |angle) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |*) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |idx) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:text |0.08) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |h) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |*) (:type :leaf) - |b $ {} (:at 1672640402194) (:by |u0) (:text |0.1) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:text |idx) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |r) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |40) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |[]) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |+) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |100) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |*) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |r) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |cos) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |angle) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:text |h) (:type :leaf) - |l $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |*) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |r) (:type :leaf) - |h $ {} (:at 1672640032682) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640032682) (:by |u0) (:text |sin) (:type :leaf) - |b $ {} (:at 1672640032682) (:by |u0) (:text |angle) (:type :leaf) |comp-strip-light-demo $ {} (:at 1664619789914) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1664619789914) (:by |u0) (:text |defn) (:type :leaf) @@ -6930,6 +6960,22 @@ |b $ {} (:at 1659585145571) (:by |u0) (:text |-200) (:type :leaf) |h $ {} (:at 1671870368427) (:by |u0) (:text |-160) (:type :leaf) |l $ {} (:at 1657128485211) (:by |u0) (:text |0) (:type :leaf) + |zv $ {} (:at 1657128485211) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1657128485211) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1657128485211) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1657128485211) (:by |u0) (:text |:key) (:type :leaf) + |b $ {} (:at 1673628192736) (:by |u0) (:text |:segments-curves) (:type :leaf) + |h $ {} (:at 1657128485211) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1657128485211) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1657128485211) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1657128485211) (:by |u0) (:text |[]) (:type :leaf) + |b $ {} (:at 1659585145571) (:by |u0) (:text |-200) (:type :leaf) + |h $ {} (:at 1673628186878) (:by |u0) (:text |-200) (:type :leaf) + |l $ {} (:at 1657128485211) (:by |u0) (:text |0) (:type :leaf) :ns $ {} (:at 1656164015303) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1656164015303) (:by |u0) (:text |ns) (:type :leaf) @@ -7109,7 +7155,7 @@ :data $ {} |T $ {} (:at 1656697207831) (:by |u0) (:text |get-env) (:type :leaf) |b $ {} (:at 1656697210236) (:by |u0) (:text "|\"tab") (:type :leaf) - |h $ {} (:at 1671870399433) (:by |u0) (:text "|\"segments") (:type :leaf) + |h $ {} (:at 1673628198789) (:by |u0) (:text "|\"segments-curves") (:type :leaf) |l $ {} (:at 1656850188629) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1656850190500) (:by |u0) (:text |:p1) (:type :leaf) @@ -13690,288 +13736,338 @@ |b $ {} (:at 1672638020113) (:by |u0) (:text |build-curve-points) (:type :leaf) |h $ {} (:at 1672638020113) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638025956) (:by |u0) (:text |points) (:type :leaf) - |l $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |5 $ {} (:at 1673630526377) (:by |u0) (:text |points) (:type :leaf) + |D $ {} (:at 1673632144282) (:by |u0) (:text |curve-ratio) (:type :leaf) + |l $ {} (:at 1673630547045) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |->) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |D $ {} (:at 1673630547767) (:by |u0) (:text |let) (:type :leaf) + |L $ {} (:at 1673630548017) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |range) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |T $ {} (:at 1673630548219) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |dec) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |T $ {} (:at 1673630548747) (:by |u0) (:text |size) (:type :leaf) + |b $ {} (:at 1673630549484) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |count) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |T $ {} (:at 1673630550806) (:by |u0) (:text |count) (:type :leaf) + |b $ {} (:at 1673630550806) (:by |u0) (:text |points) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |map) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:text |->) (:type :leaf) |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |fn) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:text |range) (:type :leaf) |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |idx) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |dec) (:type :leaf) + |b $ {} (:at 1673630552929) (:by |u0) (:text |size) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638035334) (:by |u0) (:text |map) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |let) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:text |fn) (:type :leaf) |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |D $ {} (:at 1672639172753) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672639172753) (:by |u0) (:text |idx+1) (:type :leaf) - |b $ {} (:at 1672639172753) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672639172753) (:by |u0) (:text |inc) (:type :leaf) - |b $ {} (:at 1672639172753) (:by |u0) (:text |idx) (:type :leaf) - |T $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |p-raw) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |nth) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:text |idx) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:text |idx) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638035334) (:by |u0) (:text |let) (:type :leaf) |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |q-raw) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |nth) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) - |h $ {} (:at 1672640211859) (:by |u0) (:text |idx+1) (:type :leaf) - |e $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640206080) (:by |u0) (:text |q2-raw) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |D $ {} (:at 1672639172753) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |nth) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |T $ {} (:at 1672639172753) (:by |u0) (:text |idx+1) (:type :leaf) + |b $ {} (:at 1672639172753) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |inc) (:type :leaf) - |b $ {} (:at 1672640214847) (:by |u0) (:text |idx+1) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |p) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) + |T $ {} (:at 1672639172753) (:by |u0) (:text |inc) (:type :leaf) + |b $ {} (:at 1672639172753) (:by |u0) (:text |idx) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |&map:get) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:text |p-raw) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:text |:position) (:type :leaf) - |l $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |q) (:type :leaf) + |T $ {} (:at 1672638035334) (:by |u0) (:text |p-raw) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638035334) (:by |u0) (:text |nth) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:text |idx) (:type :leaf) |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |&map:get) (:type :leaf) - |b $ {} (:at 1672638035334) (:by |u0) (:text |q-raw) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:text |:position) (:type :leaf) - |m $ {} (:at 1672640192061) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640193687) (:by |u0) (:text |q2) (:type :leaf) - |b $ {} (:at 1672640260538) (:by |u0) (:type :expr) - :data $ {} - |D $ {} (:at 1672640261077) (:by |u0) (:text |if) (:type :leaf) - |L $ {} (:at 1672640261599) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640262235) (:by |u0) (:text |some?) (:type :leaf) - |b $ {} (:at 1672640264024) (:by |u0) (:text |q2-raw) (:type :leaf) - |T $ {} (:at 1672640203174) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |q-raw) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672640203174) (:by |u0) (:text |&map:get) (:type :leaf) - |b $ {} (:at 1672640217312) (:by |u0) (:text |q2-raw) (:type :leaf) - |h $ {} (:at 1672640203174) (:by |u0) (:text |:position) (:type :leaf) - |o $ {} (:at 1672638311603) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638311603) (:by |u0) (:text |direction) (:type :leaf) - |b $ {} (:at 1672638311603) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |nth) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) + |h $ {} (:at 1672640211859) (:by |u0) (:text |idx+1) (:type :leaf) + |e $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638311603) (:by |u0) (:text |&v-) (:type :leaf) - |b $ {} (:at 1672638314347) (:by |u0) (:text |q) (:type :leaf) - |h $ {} (:at 1672638315836) (:by |u0) (:text |p) (:type :leaf) - |p $ {} (:at 1672640220067) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640222061) (:by |u0) (:text |direction2) (:type :leaf) - |b $ {} (:at 1672640222633) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672640224519) (:by |u0) (:text |if) (:type :leaf) - |b $ {} (:at 1672640231232) (:by |u0) (:type :expr) - :data $ {} - |D $ {} (:at 1672640232821) (:by |u0) (:text |some?) (:type :leaf) - |T $ {} (:at 1672640229459) (:by |u0) (:text |q2) (:type :leaf) - |h $ {} (:at 1672640235107) (:by |u0) (:type :expr) + |T $ {} (:at 1672640206080) (:by |u0) (:text |q2-raw) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672640235107) (:by |u0) (:text |&v-) (:type :leaf) - |b $ {} (:at 1672640242169) (:by |u0) (:text |q2) (:type :leaf) - |h $ {} (:at 1672640244610) (:by |u0) (:text |q) (:type :leaf) - |l $ {} (:at 1672640239068) (:by |u0) (:text |direction) (:type :leaf) - |q $ {} (:at 1672638807281) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638810551) (:by |u0) (:text |p-width) (:type :leaf) - |b $ {} (:at 1672638816554) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |nth) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:text |points) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638035334) (:by |u0) (:text |inc) (:type :leaf) + |b $ {} (:at 1672640214847) (:by |u0) (:text |idx+1) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |D $ {} (:at 1672638817786) (:by |u0) (:text |either) (:type :leaf) - |T $ {} (:at 1672638813133) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |p) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638813133) (:by |u0) (:text |&map:get) (:type :leaf) - |b $ {} (:at 1672638813133) (:by |u0) (:text |p-raw) (:type :leaf) - |h $ {} (:at 1672638815984) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672640351554) (:by |u0) (:text |1) (:type :leaf) - |s $ {} (:at 1672638807281) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638825052) (:by |u0) (:text |q-width) (:type :leaf) - |b $ {} (:at 1672638816554) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |&map:get) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:text |p-raw) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:text |:position) (:type :leaf) + |l $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |D $ {} (:at 1672638817786) (:by |u0) (:text |either) (:type :leaf) - |T $ {} (:at 1672638813133) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |q) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638813133) (:by |u0) (:text |&map:get) (:type :leaf) - |b $ {} (:at 1672638826949) (:by |u0) (:text |q-raw) (:type :leaf) - |h $ {} (:at 1672638815984) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672640352815) (:by |u0) (:text |1) (:type :leaf) - |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638035334) (:by |u0) (:text |[]) (:type :leaf) - |X $ {} (:at 1672638566520) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638567737) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672638568468) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638569630) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672638575714) (:by |u0) (:text |p) (:type :leaf) - |e $ {} (:at 1672638614017) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638615180) (:by |u0) (:text |:brush) (:type :leaf) - |b $ {} (:at 1672638616347) (:by |u0) (:text |0) (:type :leaf) - |f $ {} (:at 1672638766476) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638767783) (:by |u0) (:text |:direction) (:type :leaf) - |b $ {} (:at 1672638769677) (:by |u0) (:text |direction) (:type :leaf) - |h $ {} (:at 1672638576759) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638580363) (:by |u0) (:text |:color_index) (:type :leaf) - |b $ {} (:at 1672638681237) (:by |u0) (:text |idx) (:type :leaf) - |l $ {} (:at 1672638853340) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638855443) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672638856049) (:by |u0) (:text |p-width) (:type :leaf) - |Z $ {} (:at 1672638664648) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638665178) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672638687131) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638689105) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672638708222) (:by |u0) (:text |q) (:type :leaf) - |h $ {} (:at 1672638691957) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638693297) (:by |u0) (:text |:brush) (:type :leaf) - |b $ {} (:at 1672638710725) (:by |u0) (:text |0) (:type :leaf) - |j $ {} (:at 1672638772042) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638772042) (:by |u0) (:text |:direction) (:type :leaf) - |b $ {} (:at 1672640273489) (:by |u0) (:text |direction2) (:type :leaf) - |l $ {} (:at 1672638696215) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638696215) (:by |u0) (:text |:color_index) (:type :leaf) - |b $ {} (:at 1672638840064) (:by |u0) (:text |idx+1) (:type :leaf) - |o $ {} (:at 1672638859741) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638859741) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672638862228) (:by |u0) (:text |q-width) (:type :leaf) - |a $ {} (:at 1672638664648) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638665178) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672638687131) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638689105) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672638689495) (:by |u0) (:text |p) (:type :leaf) - |h $ {} (:at 1672638691957) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638693297) (:by |u0) (:text |:brush) (:type :leaf) - |b $ {} (:at 1672638693836) (:by |u0) (:text |1) (:type :leaf) - |j $ {} (:at 1672638772932) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |&map:get) (:type :leaf) + |b $ {} (:at 1672638035334) (:by |u0) (:text |q-raw) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:text |:position) (:type :leaf) + |m $ {} (:at 1672640192061) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638772932) (:by |u0) (:text |:direction) (:type :leaf) - |b $ {} (:at 1672638772932) (:by |u0) (:text |direction) (:type :leaf) - |l $ {} (:at 1672638696215) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638696215) (:by |u0) (:text |:color_index) (:type :leaf) - |b $ {} (:at 1672638696215) (:by |u0) (:text |idx) (:type :leaf) - |o $ {} (:at 1672638863753) (:by |u0) (:type :expr) + |T $ {} (:at 1672640193687) (:by |u0) (:text |q2) (:type :leaf) + |b $ {} (:at 1672640260538) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1672640261077) (:by |u0) (:text |if) (:type :leaf) + |L $ {} (:at 1672640261599) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672640262235) (:by |u0) (:text |some?) (:type :leaf) + |b $ {} (:at 1672640264024) (:by |u0) (:text |q2-raw) (:type :leaf) + |T $ {} (:at 1672640203174) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672640203174) (:by |u0) (:text |&map:get) (:type :leaf) + |b $ {} (:at 1672640217312) (:by |u0) (:text |q2-raw) (:type :leaf) + |h $ {} (:at 1672640203174) (:by |u0) (:text |:position) (:type :leaf) + |o $ {} (:at 1672638311603) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638863753) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672638863753) (:by |u0) (:text |p-width) (:type :leaf) - |aT $ {} (:at 1672638726584) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638726584) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672638726584) (:by |u0) (:type :expr) + |T $ {} (:at 1672638311603) (:by |u0) (:text |direction) (:type :leaf) + |b $ {} (:at 1672638311603) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638311603) (:by |u0) (:text |&v-) (:type :leaf) + |b $ {} (:at 1672638314347) (:by |u0) (:text |q) (:type :leaf) + |h $ {} (:at 1672638315836) (:by |u0) (:text |p) (:type :leaf) + |p $ {} (:at 1672640220067) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638726584) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672638726584) (:by |u0) (:text |q) (:type :leaf) - |h $ {} (:at 1672638726584) (:by |u0) (:type :expr) + |T $ {} (:at 1672640222061) (:by |u0) (:text |direction2) (:type :leaf) + |b $ {} (:at 1672640222633) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672640224519) (:by |u0) (:text |if) (:type :leaf) + |b $ {} (:at 1672640231232) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1672640232821) (:by |u0) (:text |some?) (:type :leaf) + |T $ {} (:at 1672640229459) (:by |u0) (:text |q2) (:type :leaf) + |h $ {} (:at 1672640235107) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672640235107) (:by |u0) (:text |&v-) (:type :leaf) + |b $ {} (:at 1672640242169) (:by |u0) (:text |q2) (:type :leaf) + |h $ {} (:at 1672640244610) (:by |u0) (:text |q) (:type :leaf) + |l $ {} (:at 1672640239068) (:by |u0) (:text |direction) (:type :leaf) + |q $ {} (:at 1672638807281) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638726584) (:by |u0) (:text |:brush) (:type :leaf) - |b $ {} (:at 1672638726584) (:by |u0) (:text |0) (:type :leaf) - |j $ {} (:at 1672638774529) (:by |u0) (:type :expr) + |T $ {} (:at 1672638810551) (:by |u0) (:text |p-width) (:type :leaf) + |b $ {} (:at 1672638816554) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1672638817786) (:by |u0) (:text |either) (:type :leaf) + |T $ {} (:at 1672638813133) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638813133) (:by |u0) (:text |&map:get) (:type :leaf) + |b $ {} (:at 1672638813133) (:by |u0) (:text |p-raw) (:type :leaf) + |h $ {} (:at 1672638815984) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672640351554) (:by |u0) (:text |1) (:type :leaf) + |s $ {} (:at 1672638807281) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638774529) (:by |u0) (:text |:direction) (:type :leaf) - |b $ {} (:at 1672640275885) (:by |u0) (:text |direction2) (:type :leaf) - |l $ {} (:at 1672638726584) (:by |u0) (:type :expr) + |T $ {} (:at 1672638825052) (:by |u0) (:text |q-width) (:type :leaf) + |b $ {} (:at 1672638816554) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1672638817786) (:by |u0) (:text |either) (:type :leaf) + |T $ {} (:at 1672638813133) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638813133) (:by |u0) (:text |&map:get) (:type :leaf) + |b $ {} (:at 1672638826949) (:by |u0) (:text |q-raw) (:type :leaf) + |h $ {} (:at 1672638815984) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672640352815) (:by |u0) (:text |1) (:type :leaf) + |t $ {} (:at 1673630560681) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638726584) (:by |u0) (:text |:color_index) (:type :leaf) - |b $ {} (:at 1672638842858) (:by |u0) (:text |idx+1) (:type :leaf) - |o $ {} (:at 1672638871257) (:by |u0) (:type :expr) + |T $ {} (:at 1673630563020) (:by |u0) (:text |ratio) (:type :leaf) + |b $ {} (:at 1673630565444) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673630567484) (:by |u0) (:text |&/) (:type :leaf) + |b $ {} (:at 1673630568567) (:by |u0) (:text |idx) (:type :leaf) + |h $ {} (:at 1673630573786) (:by |u0) (:text |size) (:type :leaf) + |u $ {} (:at 1673630577734) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638871257) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672638871257) (:by |u0) (:text |q-width) (:type :leaf) - |ab $ {} (:at 1672638729170) (:by |u0) (:type :expr) + |T $ {} (:at 1673630583856) (:by |u0) (:text |ratio+1) (:type :leaf) + |b $ {} (:at 1673630586273) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673630586273) (:by |u0) (:text |&/) (:type :leaf) + |a $ {} (:at 1673630592564) (:by |u0) (:text |idx+1) (:type :leaf) + |h $ {} (:at 1673630586273) (:by |u0) (:text |size) (:type :leaf) + |h $ {} (:at 1672638035334) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638729170) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672638729170) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638729170) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672638731566) (:by |u0) (:text |q) (:type :leaf) - |h $ {} (:at 1672638729170) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638729170) (:by |u0) (:text |:brush) (:type :leaf) - |b $ {} (:at 1672638729170) (:by |u0) (:text |1) (:type :leaf) - |j $ {} (:at 1672638775380) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638775380) (:by |u0) (:text |:direction) (:type :leaf) - |b $ {} (:at 1672640277140) (:by |u0) (:text |direction2) (:type :leaf) - |l $ {} (:at 1672638729170) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638729170) (:by |u0) (:text |:color_index) (:type :leaf) - |b $ {} (:at 1672638844759) (:by |u0) (:text |idx+1) (:type :leaf) - |o $ {} (:at 1672638872344) (:by |u0) (:type :expr) + |T $ {} (:at 1672638035334) (:by |u0) (:text |[]) (:type :leaf) + |X $ {} (:at 1672638566520) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638872344) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672638872344) (:by |u0) (:text |q-width) (:type :leaf) - |aj $ {} (:at 1672638727919) (:by |u0) (:type :expr) - :data $ {} - |T $ {} (:at 1672638727919) (:by |u0) (:text |{}) (:type :leaf) - |b $ {} (:at 1672638727919) (:by |u0) (:type :expr) + |T $ {} (:at 1672638567737) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1672638568468) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638569630) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1672638575714) (:by |u0) (:text |p) (:type :leaf) + |e $ {} (:at 1672638614017) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638615180) (:by |u0) (:text |:brush) (:type :leaf) + |b $ {} (:at 1672638616347) (:by |u0) (:text |0) (:type :leaf) + |f $ {} (:at 1672638766476) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638767783) (:by |u0) (:text |:direction) (:type :leaf) + |b $ {} (:at 1672638769677) (:by |u0) (:text |direction) (:type :leaf) + |g $ {} (:at 1673627327453) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673632207675) (:by |u0) (:text |:curve_ratio) (:type :leaf) + |b $ {} (:at 1673632204909) (:by |u0) (:text |curve-ratio) (:type :leaf) + |h $ {} (:at 1672638576759) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638580363) (:by |u0) (:text |:color_index) (:type :leaf) + |b $ {} (:at 1673631934871) (:by |u0) (:text |idx) (:type :leaf) + |l $ {} (:at 1672638853340) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638855443) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672638856049) (:by |u0) (:text |p-width) (:type :leaf) + |Z $ {} (:at 1672638664648) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638727919) (:by |u0) (:text |:position) (:type :leaf) - |b $ {} (:at 1672638727919) (:by |u0) (:text |p) (:type :leaf) - |h $ {} (:at 1672638727919) (:by |u0) (:type :expr) + |T $ {} (:at 1672638665178) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1672638687131) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638689105) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1672638708222) (:by |u0) (:text |q) (:type :leaf) + |h $ {} (:at 1672638691957) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638693297) (:by |u0) (:text |:brush) (:type :leaf) + |b $ {} (:at 1672638710725) (:by |u0) (:text |0) (:type :leaf) + |j $ {} (:at 1672638772042) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638772042) (:by |u0) (:text |:direction) (:type :leaf) + |b $ {} (:at 1672640273489) (:by |u0) (:text |direction2) (:type :leaf) + |k $ {} (:at 1673627337614) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673632156723) (:by |u0) (:text |:curve_ratio) (:type :leaf) + |b $ {} (:at 1673632147963) (:by |u0) (:text |curve-ratio) (:type :leaf) + |l $ {} (:at 1672638696215) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638696215) (:by |u0) (:text |:color_index) (:type :leaf) + |b $ {} (:at 1673631938640) (:by |u0) (:text |idx+1) (:type :leaf) + |o $ {} (:at 1672638859741) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638859741) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672638862228) (:by |u0) (:text |q-width) (:type :leaf) + |a $ {} (:at 1672638664648) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638727919) (:by |u0) (:text |:brush) (:type :leaf) - |b $ {} (:at 1672638727919) (:by |u0) (:text |1) (:type :leaf) - |j $ {} (:at 1672638776409) (:by |u0) (:type :expr) + |T $ {} (:at 1672638665178) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1672638687131) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638689105) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1672638689495) (:by |u0) (:text |p) (:type :leaf) + |h $ {} (:at 1672638691957) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638693297) (:by |u0) (:text |:brush) (:type :leaf) + |b $ {} (:at 1672638693836) (:by |u0) (:text |1) (:type :leaf) + |j $ {} (:at 1672638772932) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638772932) (:by |u0) (:text |:direction) (:type :leaf) + |b $ {} (:at 1672638772932) (:by |u0) (:text |direction) (:type :leaf) + |k $ {} (:at 1673627339189) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673632158526) (:by |u0) (:text |:curve_ratio) (:type :leaf) + |b $ {} (:at 1673632148873) (:by |u0) (:text |curve-ratio) (:type :leaf) + |l $ {} (:at 1672638696215) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638696215) (:by |u0) (:text |:color_index) (:type :leaf) + |b $ {} (:at 1673631936658) (:by |u0) (:text |idx) (:type :leaf) + |o $ {} (:at 1672638863753) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638863753) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672638863753) (:by |u0) (:text |p-width) (:type :leaf) + |aT $ {} (:at 1672638726584) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638776409) (:by |u0) (:text |:direction) (:type :leaf) - |b $ {} (:at 1672638776409) (:by |u0) (:text |direction) (:type :leaf) - |l $ {} (:at 1672638727919) (:by |u0) (:type :expr) + |T $ {} (:at 1672638726584) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1672638726584) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638726584) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1672638726584) (:by |u0) (:text |q) (:type :leaf) + |h $ {} (:at 1672638726584) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638726584) (:by |u0) (:text |:brush) (:type :leaf) + |b $ {} (:at 1672638726584) (:by |u0) (:text |0) (:type :leaf) + |j $ {} (:at 1672638774529) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638774529) (:by |u0) (:text |:direction) (:type :leaf) + |b $ {} (:at 1672640275885) (:by |u0) (:text |direction2) (:type :leaf) + |k $ {} (:at 1673627340926) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673632159595) (:by |u0) (:text |:curve_ratio) (:type :leaf) + |b $ {} (:at 1673632150333) (:by |u0) (:text |curve-ratio) (:type :leaf) + |l $ {} (:at 1672638726584) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638726584) (:by |u0) (:text |:color_index) (:type :leaf) + |b $ {} (:at 1673631937629) (:by |u0) (:text |idx+1) (:type :leaf) + |o $ {} (:at 1672638871257) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638871257) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672638871257) (:by |u0) (:text |q-width) (:type :leaf) + |ab $ {} (:at 1672638729170) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638727919) (:by |u0) (:text |:color_index) (:type :leaf) - |b $ {} (:at 1672638727919) (:by |u0) (:text |idx) (:type :leaf) - |o $ {} (:at 1672638867691) (:by |u0) (:type :expr) + |T $ {} (:at 1672638729170) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1672638729170) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638729170) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1672638731566) (:by |u0) (:text |q) (:type :leaf) + |h $ {} (:at 1672638729170) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638729170) (:by |u0) (:text |:brush) (:type :leaf) + |b $ {} (:at 1672638729170) (:by |u0) (:text |1) (:type :leaf) + |j $ {} (:at 1672638775380) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638775380) (:by |u0) (:text |:direction) (:type :leaf) + |b $ {} (:at 1672640277140) (:by |u0) (:text |direction2) (:type :leaf) + |k $ {} (:at 1673627342604) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673632160611) (:by |u0) (:text |:curve_ratio) (:type :leaf) + |b $ {} (:at 1673632151126) (:by |u0) (:text |curve-ratio) (:type :leaf) + |l $ {} (:at 1672638729170) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638729170) (:by |u0) (:text |:color_index) (:type :leaf) + |b $ {} (:at 1673631939575) (:by |u0) (:text |idx+1) (:type :leaf) + |o $ {} (:at 1672638872344) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638872344) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672638872344) (:by |u0) (:text |q-width) (:type :leaf) + |aj $ {} (:at 1672638727919) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672638867691) (:by |u0) (:text |:width) (:type :leaf) - |b $ {} (:at 1672638867691) (:by |u0) (:text |p-width) (:type :leaf) + |T $ {} (:at 1672638727919) (:by |u0) (:text |{}) (:type :leaf) + |b $ {} (:at 1672638727919) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638727919) (:by |u0) (:text |:position) (:type :leaf) + |b $ {} (:at 1672638727919) (:by |u0) (:text |p) (:type :leaf) + |h $ {} (:at 1672638727919) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638727919) (:by |u0) (:text |:brush) (:type :leaf) + |b $ {} (:at 1672638727919) (:by |u0) (:text |1) (:type :leaf) + |j $ {} (:at 1672638776409) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638776409) (:by |u0) (:text |:direction) (:type :leaf) + |b $ {} (:at 1672638776409) (:by |u0) (:text |direction) (:type :leaf) + |k $ {} (:at 1673627344191) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673632161270) (:by |u0) (:text |:curve_ratio) (:type :leaf) + |b $ {} (:at 1673632152101) (:by |u0) (:text |curve-ratio) (:type :leaf) + |l $ {} (:at 1672638727919) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638727919) (:by |u0) (:text |:color_index) (:type :leaf) + |b $ {} (:at 1673631940505) (:by |u0) (:text |idx) (:type :leaf) + |o $ {} (:at 1672638867691) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638867691) (:by |u0) (:text |:width) (:type :leaf) + |b $ {} (:at 1672638867691) (:by |u0) (:text |p-width) (:type :leaf) |comp-segments $ {} (:at 1671866456303) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1671866456303) (:by |u0) (:text |defn) (:type :leaf) @@ -14356,11 +14452,38 @@ |o $ {} (:at 1672637523059) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1672637523059) (:by |u0) (:text |:packed-attrs) (:type :leaf) - |X $ {} (:at 1672637927600) (:by |u0) (:type :expr) + |X $ {} (:at 1673630492626) (:by |u0) (:type :expr) :data $ {} - |T $ {} (:at 1672637926822) (:by |u0) (:text |map) (:type :leaf) - |b $ {} (:at 1672637929441) (:by |u0) (:text |curves) (:type :leaf) - |h $ {} (:at 1672638002986) (:by |u0) (:text |build-curve-points) (:type :leaf) + |D $ {} (:at 1673630493280) (:by |u0) (:text |let) (:type :leaf) + |L $ {} (:at 1673630493491) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673630494691) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673630494462) (:by |u0) (:text |size) (:type :leaf) + |b $ {} (:at 1673630495518) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673630496237) (:by |u0) (:text |count) (:type :leaf) + |b $ {} (:at 1673630497590) (:by |u0) (:text |curves) (:type :leaf) + |T $ {} (:at 1672637927600) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673627315727) (:by |u0) (:text |map-indexed) (:type :leaf) + |b $ {} (:at 1672637929441) (:by |u0) (:text |curves) (:type :leaf) + |h $ {} (:at 1673630481621) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1673630483245) (:by |u0) (:text |fn) (:type :leaf) + |L $ {} (:at 1673630483580) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1673630484002) (:by |u0) (:text |idx) (:type :leaf) + |b $ {} (:at 1673630486002) (:by |u0) (:text |c) (:type :leaf) + |T $ {} (:at 1673630487311) (:by |u0) (:type :expr) + :data $ {} + |T $ {} (:at 1672638002986) (:by |u0) (:text |build-curve-points) (:type :leaf) + |b $ {} (:at 1673630487990) (:by |u0) (:text |c) (:type :leaf) + |h $ {} (:at 1673630510717) (:by |u0) (:type :expr) + :data $ {} + |D $ {} (:at 1673630516370) (:by |u0) (:text |&/) (:type :leaf) + |T $ {} (:at 1673630488716) (:by |u0) (:text |idx) (:type :leaf) + |b $ {} (:at 1673630512780) (:by |u0) (:text |size) (:type :leaf) |q $ {} (:at 1672637523059) (:by |u0) (:type :expr) :data $ {} |T $ {} (:at 1672637523059) (:by |u0) (:text |:get-uniforms) (:type :leaf) diff --git a/compact.cirru b/compact.cirru index 050b337..0829d72 100644 --- a/compact.cirru +++ b/compact.cirru @@ -1,6 +1,6 @@ {} (:package |triadica) - :configs $ {} (:init-fn |triadica.app.main/main!) (:reload-fn |triadica.app.main/reload!) (:version |0.0.34) + :configs $ {} (:init-fn |triadica.app.main/main!) (:reload-fn |triadica.app.main/reload!) (:version |0.0.35) :modules $ [] |touch-control/ |respo.calcit/ |memof/ |quaternion/ :entries $ {} :files $ {} @@ -764,11 +764,28 @@ :tube $ comp-tube-demo :strip-light $ comp-strip-light-demo :segments $ comp-segments-demo + :segments-curves $ comp-segments-curves-demo if-not hide-tabs? $ memof1-call comp-tabs tab-entries {} :position $ [] -40 0 0 :selected $ :tab store fn (key d!) (d! :tab-focus key ) + |comp-segments-curves-demo $ quote + defn comp-segments-curves-demo () $ comp-segments-curves + {} $ :curves + -> (range 4) + map $ fn (j) + -> (range 400) + map $ fn (idx) + let + angle $ * idx 0.08 + h $ * 0.1 idx + r 40 + {} $ :position + [] + + 100 (* j 40) + * r $ cos angle + , h $ * r (sin angle) |comp-segments-demo $ quote defn comp-segments-demo () $ group ({}) (; comp-axis) comp-segments $ {} (; :draw-mode :line-strip) @@ -810,18 +827,6 @@ rotation c dec n :width 1 - comp-segments-curves $ {} - :curves $ [] - -> (range 400) - map $ fn (idx) - let - angle $ * idx 0.08 - h $ * 0.1 idx - r 40 - {} $ :position - [] - + 100 $ * r (cos angle) - , h $ * r (sin angle) |comp-strip-light-demo $ quote defn comp-strip-light-demo () $ comp-strip-light {} (; :draw-mode :line-strip) @@ -933,6 +938,8 @@ :position $ [] -200 -120 0 {} (:key :segments) :position $ [] -200 -160 0 + {} (:key :segments-curves) + :position $ [] -200 -200 0 :ns $ quote ns triadica.app.container $ :require triadica.alias :refer $ group @@ -957,7 +964,7 @@ :defs $ {} |*store $ quote defatom *store $ {} (:v 0) - :tab $ turn-keyword (get-env "\"tab" "\"segments") + :tab $ turn-keyword (get-env "\"tab" "\"segments-curves") :p1 $ [] 0 0 0 :states $ {} |canvas $ quote @@ -1736,29 +1743,33 @@ |triadica.comp.segments $ {} :defs $ {} |build-curve-points $ quote - defn build-curve-points (points) - -> - range $ dec (count points) - map $ fn (idx) - let - idx+1 $ inc idx - p-raw $ nth points idx - q-raw $ nth points idx+1 - q2-raw $ nth points (inc idx+1) - p $ &map:get p-raw :position - q $ &map:get q-raw :position - q2 $ if (some? q2-raw) (&map:get q2-raw :position) - direction $ &v- q p - direction2 $ if (some? q2) (&v- q2 q) direction - p-width $ either (&map:get p-raw :width) 1 - q-width $ either (&map:get q-raw :width) 1 - [] - {} (:position p) (:brush 0) (:direction direction) (:color_index idx) (:width p-width) - {} (:position q) (:brush 0) (:direction direction2) (:color_index idx+1) (:width q-width) - {} (:position p) (:brush 1) (:direction direction) (:color_index idx) (:width p-width) - {} (:position q) (:brush 0) (:direction direction2) (:color_index idx+1) (:width q-width) - {} (:position q) (:brush 1) (:direction direction2) (:color_index idx+1) (:width q-width) - {} (:position p) (:brush 1) (:direction direction) (:color_index idx) (:width p-width) + defn build-curve-points (points curve-ratio) + let + size $ count points + -> + range $ dec size + map $ fn (idx) + let + idx+1 $ inc idx + p-raw $ nth points idx + q-raw $ nth points idx+1 + q2-raw $ nth points (inc idx+1) + p $ &map:get p-raw :position + q $ &map:get q-raw :position + q2 $ if (some? q2-raw) (&map:get q2-raw :position) + direction $ &v- q p + direction2 $ if (some? q2) (&v- q2 q) direction + p-width $ either (&map:get p-raw :width) 1 + q-width $ either (&map:get q-raw :width) 1 + ratio $ &/ idx size + ratio+1 $ &/ idx+1 size + [] + {} (:position p) (:brush 0) (:direction direction) (:curve_ratio curve-ratio) (:color_index idx) (:width p-width) + {} (:position q) (:brush 0) (:direction direction2) (:curve_ratio curve-ratio) (:color_index idx+1) (:width q-width) + {} (:position p) (:brush 1) (:direction direction) (:curve_ratio curve-ratio) (:color_index idx) (:width p-width) + {} (:position q) (:brush 0) (:direction direction2) (:curve_ratio curve-ratio) (:color_index idx+1) (:width q-width) + {} (:position q) (:brush 1) (:direction direction2) (:curve_ratio curve-ratio) (:color_index idx+1) (:width q-width) + {} (:position p) (:brush 1) (:direction direction) (:curve_ratio curve-ratio) (:color_index idx) (:width p-width) |comp-segments $ quote defn comp-segments (options) let @@ -1791,7 +1802,10 @@ :draw-mode $ either (&map:get options :draw-mode) :triangles :vertex-shader $ either (&map:get options :vertex-shader) (inline-shader "\"segments-curves.vert") :fragment-shader $ either (&map:get options :fragment-shader) (inline-shader "\"segments-curves.frag") - :packed-attrs $ map curves build-curve-points + :packed-attrs $ let + size $ count curves + map-indexed curves $ fn (idx c) + build-curve-points c $ &/ idx size :get-uniforms $ &map:get options :get-uniforms |traverse-lines $ quote defn traverse-lines (segments f) diff --git a/package.json b/package.json index d3d0e0d..56c0641 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "triadica-space", - "version": "0.0.34", + "version": "0.0.35", "repository": "git@github.com:Quatrefoil-GL/triadica-space.git", "author": "tiye ", "license": "MIT", @@ -9,7 +9,7 @@ "vite": "^4.0.4" }, "dependencies": { - "@calcit/procs": "^0.6.19", + "@calcit/procs": "^0.6.20", "@calcit/std": "^0.0.2", "@quamolit/touch-control": "^0.0.11", "mobile-detect": "^1.4.5", diff --git a/shaders/segments-curves.frag b/shaders/segments-curves.frag index 8f90a40..9c0193d 100644 --- a/shaders/segments-curves.frag +++ b/shaders/segments-curves.frag @@ -5,8 +5,9 @@ precision mediump float; varying float v_s; varying float v_r; +varying float v_curve_ratio; varying float v_color_index; void main() { - gl_FragColor = vec4(hsl2rgb(0.14, 1.0, 0.8), 1.0); + gl_FragColor = vec4(hsl2rgb(fract(0.14 + v_curve_ratio), 1.0, fract(0.8 + v_color_index * 0.1)), 1.0); } diff --git a/shaders/segments-curves.vert b/shaders/segments-curves.vert index f6a9c24..109db7c 100644 --- a/shaders/segments-curves.vert +++ b/shaders/segments-curves.vert @@ -6,11 +6,13 @@ attribute vec3 a_position; attribute float a_brush; attribute vec3 a_direction; attribute float a_width; +attribute float a_curve_ratio; attribute float a_color_index; varying float v_r; varying float v_s; // optional value for fill different colors +varying float v_curve_ratio; varying float v_color_index; void main() { @@ -33,6 +35,8 @@ void main() { v_s = result.s; v_r = result.r; + v_curve_ratio = a_curve_ratio; + v_color_index = a_color_index; gl_Position = vec4(pos_next * 0.002, 1.0); } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index fc6b727..728c81d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@calcit/procs@^0.6.19": - version "0.6.19" - resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.6.19.tgz#03f87b4eb9e1cbe689248c5d8efff3a4d5d33a5a" - integrity sha512-QOzD2LeR8QUKuXjwXknKAiiZX6LTUCWAAYWubc1m0xmbxcshvkOVvCd5xKc9K+9Qd/fwP0iavA7t7WlYkx4XBw== +"@calcit/procs@^0.6.20": + version "0.6.20" + resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.6.20.tgz#c0b29cbe1d99901be04c3c564fd55ae1ed76169d" + integrity sha512-9k5GoWy1bilKmlMvdwiGf6twC0tU0YWBVdvsnG5LzQkP6tRTFk5iq+7CqW3IpX7Tb8iAR7qoTmmQzP4F2vNl/g== dependencies: "@calcit/ternary-tree" "0.0.19" "@cirru/parser.ts" "^0.0.6" @@ -31,115 +31,115 @@ resolved "https://registry.yarnpkg.com/@cirru/writer.ts/-/writer.ts-0.1.3.tgz#5f54bdecaa20ba3dab16cbe6da711854138a9c0a" integrity sha512-vJnhmhm7we5UfQIwmZfQpF3bAFbVybzT6LbmkbQHxgijaQg3gPfNVsnSIa3g3KpmWVtvkzEx+nUy5aMwsJiV1A== -"@esbuild/android-arm64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.15.tgz#d58b9efe279b553b377395318d21e360058b3622" - integrity sha512-OdbkUv7468dSsgoFtHIwTaYAuI5lDEv/v+dlfGBUbVa2xSDIIuSOHXawynw5N9+5lygo/JdXa5/sgGjiEU18gQ== - -"@esbuild/android-arm@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.15.tgz#6a8ad3016fd9c89bb419bd21605fba242c051809" - integrity sha512-JsJtmadyWcR+DEtHLixM7bAQsfi1s0Xotv9kVOoXbCLyhKPOHvMEyh3kJBuTbCPSE4c2jQkQVmarwc9Mg9k3bA== - -"@esbuild/android-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.15.tgz#94b0589b6bec5eaf7e8ea2fe6368427899676f21" - integrity sha512-dPUOBiNNWAm+/bxoA75o7R7qqqfcEzXaYlb5uJk2xGHmUMNKSAnDCtRYLgx9/wfE4sXyn8H948OrDyUAHhPOuA== - -"@esbuild/darwin-arm64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.15.tgz#525e5603a82837a1e7c8265d3b14433aa869e9b6" - integrity sha512-AksarYV85Hxgwh5/zb6qGl4sYWxIXPQGBAZ+jUro1ZpINy3EWumK+/4DPOKUBPnsrOIvnNXy7Rq4mTeCsMQDNA== - -"@esbuild/darwin-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.15.tgz#38ec324a3653ade5acc5c190a7a27185caa6223e" - integrity sha512-qqrKJxoohceZGGP+sZ5yXkzW9ZiyFZJ1gWSEfuYdOWzBSL18Uy3w7s/IvnDYHo++/cxwqM0ch3HQVReSZy7/4Q== - -"@esbuild/freebsd-arm64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.15.tgz#05c19bf6e4e56387f6a56bd6933839e889146726" - integrity sha512-LBWaep6RvJm5KnsKkocdVEzuwnGMjz54fcRVZ9d3R7FSEWOtPBxMhuxeA1n98JVbCLMkTPFmKN6xSnfhnM9WXQ== - -"@esbuild/freebsd-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.15.tgz#68855666ecf1616e2a927154148d4409cd8bc55b" - integrity sha512-LE8mKC6JPR04kPLRP9A6k7ZmG0k2aWF4ru79Sde6UeWCo7yDby5f48uJNFQ2pZqzUUkLrHL8xNdIHerJeZjHXg== - -"@esbuild/linux-arm64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.15.tgz#93e8630d19f3a25d31c6467e2b136438391a3ca9" - integrity sha512-mRYpuQGbzY+XLczy3Sk7fMJ3DRKLGDIuvLKkkUkyecDGQMmil6K/xVKP9IpKO7JtNH477qAiMjjX7jfKae8t4g== - -"@esbuild/linux-arm@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.15.tgz#9343c9d0e18d15ca5b4e293154e4beae2598b5db" - integrity sha512-+1sGlqtMJTOnJUXwLUGnDhPaGRKqxT0UONtYacS+EjdDOrSgpQ/1gUXlnze45Z/BogwYaswQM19Gu1YD1T19/w== - -"@esbuild/linux-ia32@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.15.tgz#2c63615bb87cb2d080f3dc7dd0e3174b9b977233" - integrity sha512-puXVFvY4m8EB6/fzu3LdgjiNnEZ3gZMSR7NmKoQe51l3hyQalvTjab3Dt7aX4qGf+8Pj7dsCOBNzNzkSlr/4Aw== - -"@esbuild/linux-loong64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.15.tgz#85a245672709ce60895baf93b1ad3fb4b3cdab4f" - integrity sha512-ATMGb3eg8T6ZTGZFldlGeFEcevBiVq6SBHvRAO04HMfUjZWneZ/U+JJb3YzlNZxuscJ4Tmzq+JrYxlk7ro4dRg== - -"@esbuild/linux-mips64el@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.15.tgz#41e325ccd6432f952c674d763d9e5acc25a00267" - integrity sha512-3SEA4L82OnoSATW+Ve8rPgLaKjC8WMt8fnx7De9kvi/NcVbkj8W+J7qnu/tK2P9pUPQP7Au/0sjPEqZtFeyKQQ== - -"@esbuild/linux-ppc64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.15.tgz#51c7ed8fec6f9860716cdb1bb86835bdb9206108" - integrity sha512-8PgbeX+N6vmqeySzyxO0NyDOltCEW13OS5jUHTvCHmCgf4kNXZtAWJ+zEfJxjRGYhVezQ1FdIm7WfN1R27uOyg== - -"@esbuild/linux-riscv64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.15.tgz#44cb5ad5318d72f52378fa666b2010551c67f333" - integrity sha512-U+coqH+89vbPVoU30no1Fllrn6gvEeO5tfEArBhjYZ+dQ3Gv7ciQXYf5nrT1QdlIFwEjH4Is1U1iiaGWW+tGpQ== - -"@esbuild/linux-s390x@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.15.tgz#69572a26c2120ddd446d8207d30ae8f94a801a72" - integrity sha512-M0nKLFMdyFGBoitxG42kq6Xap0CPeDC6gfF9lg7ZejzGF6kqYUGT+pQGl2QCQoxJBeat/LzTma1hG8C3dq2ocg== - -"@esbuild/linux-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.15.tgz#0a4cb4f62379f839ef2c79d94f13ca0b76469d8a" - integrity sha512-t7/fOXBUKfigvhJLGKZ9TPHHgqNgpIpYaAbcXQk1X+fPeUG7x0tpAbXJ2wST9F/gJ02+CLETPMnhG7Tra2wqsQ== - -"@esbuild/netbsd-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.15.tgz#cba5674608c197bee9d25451ae458ab76a770a45" - integrity sha512-0k0Nxi6DOJmTnLtKD/0rlyqOPpcqONXY53vpkoAsue8CfyhNPWtwzba1ICFNCfCY1dqL3Ho/xEzujJhmdXq1rg== - -"@esbuild/openbsd-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.15.tgz#4ea4394d5b9c67bac6dcd1e527b47c64990d7d92" - integrity sha512-3SkckazfIbdSjsGpuIYT3d6n2Hx0tck3MS1yVsbahhWiLvdy4QozTpvlbjqO3GmvtvhxY4qdyhFOO2wiZKeTAQ== - -"@esbuild/sunos-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.15.tgz#91174f7058dfc6cfafdf2251330f6767506db7a7" - integrity sha512-8PNvBC+O8X5EnyIGqE8St2bOjjrXMR17NOLenIrzolvwWnJXvwPo0tE/ahOeiAJmTOS/eAcN8b4LAZcn17Uj7w== - -"@esbuild/win32-arm64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.15.tgz#3fa7189ec92d1de87563ab9e73b3e0a4adbfd203" - integrity sha512-YPaSgm/mm7kNcATB53OxVGVfn6rDNbImTn330ZlF3hKej1e9ktCaljGjn2vH08z2dlHEf3kdt57tNjE6zs8SzA== - -"@esbuild/win32-ia32@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.15.tgz#a114e4878e74fa6b5453cb407be4f2a28b72809d" - integrity sha512-0movUXbSNrTeNf5ZXT0avklEvlJD0hNGZsrrXHfsp9z4tK5xC+apCqmUEZeE9mqrb84Z8XbgGr/MS9LqafTP2A== - -"@esbuild/win32-x64@0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.15.tgz#e28277cdbc1c9cde2b982c814d05f44d4b1f0580" - integrity sha512-27h5GCcbfomVAqAnMJWvR1LqEY0dFqIq4vTe5nY3becnZNu0SX8F0+gTk3JPvgWQHzaGc6VkPzlOiMkdSUunUA== +"@esbuild/android-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23" + integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg== + +"@esbuild/android-arm@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2" + integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw== + +"@esbuild/android-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e" + integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ== + +"@esbuild/darwin-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220" + integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w== + +"@esbuild/darwin-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4" + integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg== + +"@esbuild/freebsd-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27" + integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw== + +"@esbuild/freebsd-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72" + integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug== + +"@esbuild/linux-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca" + integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g== + +"@esbuild/linux-arm@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196" + integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ== + +"@esbuild/linux-ia32@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54" + integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg== + +"@esbuild/linux-loong64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8" + integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ== + +"@esbuild/linux-mips64el@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726" + integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw== + +"@esbuild/linux-ppc64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8" + integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g== + +"@esbuild/linux-riscv64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9" + integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw== + +"@esbuild/linux-s390x@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87" + integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w== + +"@esbuild/linux-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f" + integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw== + +"@esbuild/netbsd-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775" + integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA== + +"@esbuild/openbsd-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35" + integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg== + +"@esbuild/sunos-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c" + integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw== + +"@esbuild/win32-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a" + integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw== + +"@esbuild/win32-ia32@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09" + integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig== + +"@esbuild/win32-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091" + integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q== "@quamolit/touch-control@^0.0.11": version "0.0.11" @@ -178,32 +178,32 @@ error@^4.3.0: xtend "~4.0.0" esbuild@^0.16.3: - version "0.16.15" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.15.tgz#02663f41eac47433879f09894dbe97c2dc837ecf" - integrity sha512-v+3ozjy9wyj8cOElzx3//Lsb4TCxPfZxRmdsfm0YaEkvZu7y6rKH7Zi1UpDx4JI7dSQui+U1Qxhfij9KBbHfrA== + version "0.16.17" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.17.tgz#fc2c3914c57ee750635fee71b89f615f25065259" + integrity sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg== optionalDependencies: - "@esbuild/android-arm" "0.16.15" - "@esbuild/android-arm64" "0.16.15" - "@esbuild/android-x64" "0.16.15" - "@esbuild/darwin-arm64" "0.16.15" - "@esbuild/darwin-x64" "0.16.15" - "@esbuild/freebsd-arm64" "0.16.15" - "@esbuild/freebsd-x64" "0.16.15" - "@esbuild/linux-arm" "0.16.15" - "@esbuild/linux-arm64" "0.16.15" - "@esbuild/linux-ia32" "0.16.15" - "@esbuild/linux-loong64" "0.16.15" - "@esbuild/linux-mips64el" "0.16.15" - "@esbuild/linux-ppc64" "0.16.15" - "@esbuild/linux-riscv64" "0.16.15" - "@esbuild/linux-s390x" "0.16.15" - "@esbuild/linux-x64" "0.16.15" - "@esbuild/netbsd-x64" "0.16.15" - "@esbuild/openbsd-x64" "0.16.15" - "@esbuild/sunos-x64" "0.16.15" - "@esbuild/win32-arm64" "0.16.15" - "@esbuild/win32-ia32" "0.16.15" - "@esbuild/win32-x64" "0.16.15" + "@esbuild/android-arm" "0.16.17" + "@esbuild/android-arm64" "0.16.17" + "@esbuild/android-x64" "0.16.17" + "@esbuild/darwin-arm64" "0.16.17" + "@esbuild/darwin-x64" "0.16.17" + "@esbuild/freebsd-arm64" "0.16.17" + "@esbuild/freebsd-x64" "0.16.17" + "@esbuild/linux-arm" "0.16.17" + "@esbuild/linux-arm64" "0.16.17" + "@esbuild/linux-ia32" "0.16.17" + "@esbuild/linux-loong64" "0.16.17" + "@esbuild/linux-mips64el" "0.16.17" + "@esbuild/linux-ppc64" "0.16.17" + "@esbuild/linux-riscv64" "0.16.17" + "@esbuild/linux-s390x" "0.16.17" + "@esbuild/linux-x64" "0.16.17" + "@esbuild/netbsd-x64" "0.16.17" + "@esbuild/openbsd-x64" "0.16.17" + "@esbuild/sunos-x64" "0.16.17" + "@esbuild/win32-arm64" "0.16.17" + "@esbuild/win32-ia32" "0.16.17" + "@esbuild/win32-x64" "0.16.17" ev-store@^7.0.0: version "7.0.0" @@ -310,9 +310,9 @@ resolve@^1.22.1: supports-preserve-symlinks-flag "^1.0.0" rollup@^3.7.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.9.1.tgz#27501d3d026418765fe379d5620d25954ff2a011" - integrity sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w== + version "3.10.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.10.0.tgz#6eb19196d8b3b375ca651cb78261faac48e24cd6" + integrity sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA== optionalDependencies: fsevents "~2.3.2"