Inkvec 0.2: the presentation page, and Inkvec Studio Lite under studio/

studio/assets/{engine.worker-DxLbviFI.js → engine.worker-wbMABDxy.js}

@@ -1 +1 @@
-const i=self;let a=null,y=null,h=null,p=null,u=null;function w(e,t){if(!e.ok||!e.body||typeof TransformStream>"u")return e;const s=t||Number(e.headers.get("content-length"))||0;let n=0,r=0;const o=e.body.pipeThrough(new TransformStream({transform(l,d){n+=l.byteLength;const c=performance.now();c-r>40&&(r=c,i.postMessage({type:"loading",got:n,total:s})),d.enqueue(l)},flush(){i.postMessage({type:"loading",got:n,total:Math.max(s,n),done:!0})}}));return new Response(o,{status:e.status,headers:{"content-type":"application/wasm"}})}async function S(e){const t=typeof crossOriginIsolated<"u"&&crossOriginIsolated,s=t?"pkg-threads":"pkg",n=e.token?`?v=${e.token}`:"",r=new URL(`${s}/inkvec_studio_wasm.js${n}`,e.base).href,o=fetch(new URL(`${s}/inkvec_studio_wasm_bg.wasm${n}`,e.base));o.catch(()=>{}),a=await import(r),y=(await a.default({module_or_path:w(await o,e.wasmBytes?.[s])})).memory??null,i.postMessage({type:"instantiated",denoiserUrl:a.denoiser_model_url(),denoiserSha256:a.denoiser_model_sha256()});let d=1,c=null;if(t&&a.initThreadPool){const f=Math.max(1,Math.min(navigator.hardwareConcurrency||4,16)-1);try{await a.initThreadPool(f),d=f+1}catch(m){c=String(m?.message??m)}}p=e.generations?new Int32Array(e.generations):null,u=e.denoiserPort,u&&t&&(_(u),a.enable_denoiser()),h=new a.Studio,i.postMessage({type:"ready",threads:d,poolError:c,isolated:t,version:a.version(),denoiserUrl:a.denoiser_model_url(),denoiserSha256:a.denoiser_model_sha256(),denoiserRepo:a.denoiser_model_repo()})}function _(e){i.inkvecDenoiseSync=(t,s,n)=>{const r=t.length,o=new SharedArrayBuffer(8+Math.max(r*4,4096)),l=new Int32Array(o,0,2);if(e.postMessage({type:"run",input:t.slice(),width:s,height:n,shared:o}),Atomics.wait(l,0,0,6e5)==="timed-out")throw new Error("the denoiser did not answer in ten minutes");if(Atomics.load(l,0)!==1){const c=new TextDecoder().decode(new Uint8Array(o,8,Atomics.load(l,1)).slice());throw new Error(c||"the denoiser failed")}return new Float32Array(o,8,r).slice()}}function v(e){return p?Atomics.load(p,0)===e:!0}function M(e){const t=h;if(!t)throw new Error("the engine is not loaded");switch(e.op){case"capabilities":return JSON.parse(t.capabilities(!!e.supported,!!e.installed,e.bytes??void 0));case"open_bytes":return JSON.parse(t.open_bytes(e.bytes,e.name??void 0));case"trace":{const s=e.generation,n=t.trace(JSON.stringify(e.request),e.draftPx,e.draftSeconds,s,(r,o)=>i.postMessage({type:"stage",generation:s,name:r,ms:o}),v);return n===void 0?null:JSON.parse(n)}case"preview":return JSON.parse(t.preview(JSON.stringify(e.request),e.draftPx,e.draftSeconds));case"export":return t.export_files(JSON.stringify({request:e.request}),!!e.zip).map(n=>({name:n.name,data:n.data}));case"close":return t.close(),null;default:return JSON.parse(t.call(e.op,JSON.stringify(e.args??{})))}}function k(e){return e instanceof WebAssembly.RuntimeError||e instanceof RangeError&&/memory|allocation/i.test(e.message)||/unreachable|out of memory|memory access out of bounds/i.test(String(e?.message??e))}let g=Promise.resolve();i.onmessage=e=>{const t=e.data;g=g.then(async()=>{if(t.type==="init"){try{await S(t)}catch(n){i.postMessage({type:"loadfail",error:String(n?.stack??n)})}return}const s=performance.now();try{const n=M(t),r=[];if(t.op==="export")for(const o of n)r.push(o.data.buffer);i.postMessage({type:"reply",id:t.id,ok:!0,value:n,ms:performance.now()-s,mem:y?.buffer.byteLength??null},r)}catch(n){const r=String(n?.message??n);i.postMessage({type:"reply",id:t.id,ok:!1,error:r,crashed:k(n)})}})};
+const i=self;let o=null,y=null,h=null,p=null,u=null;function w(e,t){if(!e.ok||!e.body||typeof TransformStream>"u")return e;const s=t||Number(e.headers.get("content-length"))||0;let n=0,r=0;const a=e.body.pipeThrough(new TransformStream({transform(l,d){n+=l.byteLength;const c=performance.now();c-r>40&&(r=c,i.postMessage({type:"loading",got:n,total:s})),d.enqueue(l)},flush(){i.postMessage({type:"loading",got:n,total:Math.max(s,n),done:!0})}}));return new Response(a,{status:e.status,headers:{"content-type":"application/wasm"}})}async function S(e){const t=typeof crossOriginIsolated<"u"&&crossOriginIsolated,s=t?"pkg-threads":"pkg",n=e.token?`?v=${e.token}`:"",r=new URL(`${s}/inkvec_studio_wasm.js${n}`,e.base).href,a=fetch(new URL(`${s}/inkvec_studio_wasm_bg.wasm${n}`,e.base));a.catch(()=>{}),o=await import(r),y=(await o.default({module_or_path:w(await a,e.wasmBytes?.[s])})).memory??null,i.postMessage({type:"instantiated",denoiserUrl:o.denoiser_model_url(),denoiserSha256:o.denoiser_model_sha256()});let d=1,c=null;if(t&&o.initThreadPool){const f=Math.max(1,Math.min(navigator.hardwareConcurrency||4,16)-1);try{await o.initThreadPool(f),d=f+1}catch(m){c=String(m?.message??m)}}p=e.generations?new Int32Array(e.generations):null,u=e.denoiserPort,u&&t&&(_(u),o.enable_denoiser()),h=new o.Studio,i.postMessage({type:"ready",threads:d,poolError:c,isolated:t,version:o.version(),denoiserUrl:o.denoiser_model_url(),denoiserSha256:o.denoiser_model_sha256(),denoiserRepo:o.denoiser_model_repo()})}function _(e){i.inkvecDenoiseSync=(t,s,n)=>{const r=t.length,a=new SharedArrayBuffer(8+Math.max(r*4,4096)),l=new Int32Array(a,0,2);if(e.postMessage({type:"run",input:t.slice(),width:s,height:n,shared:a}),Atomics.wait(l,0,0,6e5)==="timed-out")throw new Error("the denoiser did not answer in ten minutes");if(Atomics.load(l,0)!==1){const c=new TextDecoder().decode(new Uint8Array(a,8,Atomics.load(l,1)).slice());throw new Error(c||"the denoiser failed")}return new Float32Array(a,8,r).slice()}}function v(e){return p?Atomics.load(p,0)===e:!0}function M(e){const t=h;if(!t)throw new Error("the engine is not loaded");switch(e.op){case"capabilities":return JSON.parse(t.capabilities(!!e.supported,!!e.installed,e.bytes??void 0));case"open_bytes":return JSON.parse(t.open_bytes(e.bytes,e.name??void 0));case"trace":{const s=e.generation,n=t.trace(JSON.stringify(e.request),e.draftPx,e.draftSeconds,s,r=>i.postMessage({type:"progress",generation:s,json:r}),v);return n===void 0?null:JSON.parse(n)}case"preview":return JSON.parse(t.preview(JSON.stringify(e.request),e.draftPx,e.draftSeconds));case"export":return t.export_files(JSON.stringify({request:e.request}),!!e.zip).map(n=>({name:n.name,data:n.data}));case"close":return t.close(),null;default:return JSON.parse(t.call(e.op,JSON.stringify(e.args??{})))}}function k(e){return e instanceof WebAssembly.RuntimeError||e instanceof RangeError&&/memory|allocation/i.test(e.message)||/unreachable|out of memory|memory access out of bounds/i.test(String(e?.message??e))}let g=Promise.resolve();i.onmessage=e=>{const t=e.data;g=g.then(async()=>{if(t.type==="init"){try{await S(t)}catch(n){i.postMessage({type:"loadfail",error:String(n?.stack??n)})}return}const s=performance.now();try{const n=M(t),r=[];if(t.op==="export")for(const a of n)r.push(a.data.buffer);i.postMessage({type:"reply",id:t.id,ok:!0,value:n,ms:performance.now()-s,mem:y?.buffer.byteLength??null},r)}catch(n){const r=String(n?.message??n);i.postMessage({type:"reply",id:t.id,ok:!1,error:r,crashed:k(n)})}})};

studio/guide/getting-started.html

@@ -152,7 +152,8 @@ right pane is yours.</p>
 <p>From step 4 on, a small table compares Auto's figures with yours: colour difference, nodes, paths
 and file size, with the change in each.</p>
 <p>What each control does is on the <a href="tune.html">Tune</a> page; the wizard shows the same controls, only
-fewer at a time.</p>
+fewer at a time. With the <strong>Fast</strong> engine it leaves out, as Tune does, the controls only Quality
+reads (see <a href="tune.html#which-controls-each-engine-reads">which controls each engine reads</a>).</p>
 <p>Along the bottom: <strong>Back</strong>, <strong>Skip to finish</strong> (jump to the last step, keeping everything chosen),
 and <strong>Next</strong>. On the last step, <strong>Finish</strong> closes the wizard and <strong>Export now</strong> closes it and opens
 the export sheet. At the top, <strong>Undo my changes</strong> puts every control and colour group back to where

studio/guide/result.html

@@ -18,7 +18,7 @@ that comparison found.</p>
 <p>From the top, the Result tab shows:</p>
 <ol>
 <li>The <strong>Denoiser</strong> and <strong>Editable</strong> settings (shared with Tune; see
-   <a href="tune.html#the-denoiser-and-editable">Tune</a>).</li>
+   <a href="tune.html#the-engine-the-denoiser-and-editable">Tune</a>).</li>
 <li><strong>Auto chose</strong>, while it has something to offer (see
    <a href="getting-started.html#the-choice-card-keep-auto-or-customise">Getting started</a>).</li>
 <li>The <strong>quality report</strong>.</li>
@@ -156,7 +156,7 @@ an artist drew by hand. This card counts three of those habits on your drawing:<
 </table>
 <p>Each bar shows your drawing's share, with the count, and a tick where hand-drawn files sit: the
 median of 1,544 SVGs drawn by artists, measured the same way. A plain trace starts near zero on
-the first two. <strong>Make it editable</strong> turns on <a href="tune.html#the-denoiser-and-editable">Editable structure</a>,
+the first two. <strong>Make it editable</strong> turns on <a href="tune.html#the-engine-the-denoiser-and-editable">Editable structure</a>,
 which moves the bars towards the ticks. It costs a little colour accuracy (about 0.04 dE00 on
 icons); the quality report shows the price on your image.</p>
 <p>A drawing made only of lines and arcs has no curve handles and no curve joins, so only the last row

studio/guide/shortcuts.html

@@ -38,8 +38,8 @@
 <td>This guide, at the page about what is on screen</td>
 </tr>
 <tr>
-<td><kbd>Ctrl</kbd>+<kbd>1</kbd> … <kbd>Ctrl</kbd>+<kbd>8</kbd></td>
-<td>Choose a preset: Logo, Icon, Fine detail, Fewer paths, Photo or scan, Black &amp; white, Line art, Editable</td>
+<td><kbd>Ctrl</kbd>+<kbd>1</kbd> … <kbd>Ctrl</kbd>+<kbd>9</kbd>, <kbd>Ctrl</kbd>+<kbd>0</kbd></td>
+<td>Choose a preset: Logo, Icon, Fine detail, Fewer paths, Photo or scan, One-colour logo, Black no background, Two-tone scan, Line art, Editable</td>
 </tr>
 <tr>
 <td><kbd>Esc</kbd></td>

studio/guide/tune.html

@@ -12,7 +12,7 @@
   <aside class="side"><a class="guidebrand" href="index.html"><img src="logo-mono.svg" alt=""> <span>Inkvec Studio</span></a><div class="grp"><h4>User guide</h4><a href="index.html">Overview</a><a href="install.html">Install and first launch</a><a href="getting-started.html">Getting started</a><a href="viewer.html">The viewer</a><a href="result.html">Result</a><a href="tune.html" aria-current="page">Tune</a><a href="palette.html">Palette and colour groups</a><a href="export.html">Export</a><a href="minify.html">Minify SVG</a><a href="fabricate.html">Fabricate</a><a href="batch.html">Batch</a><a href="settings.html">Settings</a><a href="shortcuts.html">Keyboard and mouse</a><a href="troubleshooting.html">Troubleshooting</a></div><div class="grp"><h4>Tutorials</h4><a href="tutorials/jpeg-logo.html">Clean up a JPEG logo</a><a href="tutorials/favicon-asset-pack.html">A favicon and an asset pack</a><a href="tutorials/vinyl-htv.html">Layered vinyl and iron-on</a><a href="tutorials/laser.html">Laser: DXF and G-code</a></div><div class="grp"><h4>Online</h4><a href="https://logolabs.github.io/inkvec/">Inkvec documentation</a><a href="https://logolabs.github.io/inkvec/studio/tune.html">This page on the web</a></div><p class="guidenote">This copy of the guide is part of the app and works without a network.</p></aside>
   <main><article><h1 id="tune-presets-and-every-control">Tune: presets and every control</h1>
 <p>The <strong>Tune</strong> half of the rail holds the settings for the next trace: eight presets, any presets you
-saved, and twenty-two controls. Moving any of them starts a draft at once and a full trace a moment
+saved, and twenty-three controls. Moving any of them starts a draft at once and a full trace a moment
 later (see <a href="viewer.html#draft-and-full-traces">draft and full traces</a>); the readout at the foot of
 the rail shows what the change bought or cost.</p>
 <p><img alt="The Tune half of the rail: presets, then the Detail group with one control changed" src="img/tune.webp"></p>
@@ -35,9 +35,12 @@ are not sure where to start, <strong>Walk me through it</strong> at the top open
 has its own <strong>Reset</strong>. <strong>Output</strong> starts folded.</p>
 <p>The controls are the same ones the <code>inkvec</code> command line has; the Studio only gives them
 plain-language names. The table at the end of this page maps them.</p>
-<h2 id="the-denoiser-and-editable">The denoiser and Editable</h2>
-<p>Two settings sit above both halves of the rail, big, because they are the two people most often
+<h2 id="the-engine-the-denoiser-and-editable">The engine, the denoiser and Editable</h2>
+<p>Three settings sit above both halves of the rail, big, because they are the ones people most often
 come for. Each is one control, shown once.</p>
+<p><strong>Engine</strong>: <strong>Quality</strong> or <strong>Fast</strong>. Quality places every edge to a fraction of a pixel and fits
+the fewest curves that match the image; it is the default and the closest trace. Fast traces each
+shape in a single pass, many times quicker, for previews, batches and very large images.</p>
 <p><strong>Denoiser</strong>: <strong>Off</strong>, <strong>Auto</strong> or <strong>On</strong>. The denoiser is a trained model that repairs JPEG, WebP
 and screenshot damage at the image's own size before tracing, so the colours are the ones the
 artwork was drawn with rather than the ones the compression left.</p>
@@ -57,8 +60,26 @@ an artist can edit: joins that are smooth, handles that lie on an axis and have
 lined up with each other, and shapes that are symmetric locked into exact mirrors. The outline stays
 within the same tolerance; the <a href="result.html#editability">Editability card</a> shows what it changed, and
 the quality report shows its price (about 0.04 dE00 on icons).</p>
+<h3 id="which-controls-each-engine-reads">Which controls each engine reads</h3>
+<p>Fast skips the stages several controls steer, so with Fast selected the Tune tab lists only the
+controls that change a Fast trace, and a line at the top says how many more are for Quality. The
+hidden ones keep their values: switch back to Quality and they are where you left them. The
+<em>changed</em> counts and each group's <strong>Reset</strong> count and reset only the controls on show; choosing a
+preset still sets every control. The <a href="getting-started.html#the-custom-wizard">Custom wizard</a> leaves
+the same controls out.</p>
+<p>Only Quality reads <strong>Precision</strong>, <strong>Time limit</strong>, <strong>Match repeated shapes</strong>, <strong>Match threshold</strong>,
+<strong>Fewer paths</strong>, <strong>Repair crossing rings</strong>, <strong>Curve cost</strong> and <strong>Smooth-join angle</strong>. Every other
+control changes the trace in both engines, though some only in company: <strong>Holes as cutouts</strong>
+only with Trace transparency off, and <strong>Flat fills</strong> in Fast only where the image has a smooth
+colour ramp. This was measured, not assumed: each control was moved on a range of images in both
+engines, and a control counts as read by an engine if any of those moves changed the SVG it
+wrote.</p>
+<p><strong>Two tones by lightness</strong> and <strong>Line art</strong> trace the same way in either engine, with the fitter Quality
+uses, so while either is on, Fast shows the same controls as Quality. (Line art that declines, on
+a drawing that is not line art, leaves the trace to Fast, and those extra controls then do
+nothing.)</p>
 <h2 id="presets">Presets</h2>
-<p>A preset is a handful of settings chosen together. The tray shows the eight built-ins; the line
+<p>A preset is a handful of settings chosen together. The tray shows the ten built-ins; the line
 under it describes the one selected.</p>
 <table>
 <thead>
@@ -101,22 +122,34 @@ under it describes the one selected.</p>
 <td><kbd>Ctrl</kbd>+<kbd>5</kbd></td>
 </tr>
 <tr>
-<td><strong>Black &amp; white</strong></td>
-<td>Stamps, signatures</td>
-<td>Black &amp; white on</td>
+<td><strong>One-colour logo</strong></td>
+<td>Black artwork on white</td>
+<td>One colour on</td>
 <td><kbd>Ctrl</kbd>+<kbd>6</kbd></td>
 </tr>
 <tr>
+<td><strong>Black, no background</strong></td>
+<td>Black artwork, transparent</td>
+<td>One colour and Transparent background on</td>
+<td><kbd>Ctrl</kbd>+<kbd>7</kbd></td>
+</tr>
+<tr>
+<td><strong>Two-tone scan</strong></td>
+<td>Stamps, signatures, by lightness</td>
+<td>Two tones by lightness on</td>
+<td><kbd>Ctrl</kbd>+<kbd>8</kbd></td>
+</tr>
+<tr>
 <td><strong>Line art</strong></td>
 <td>Uniform-stroke drawings</td>
 <td>Line art on</td>
-<td><kbd>Ctrl</kbd>+<kbd>7</kbd></td>
+<td><kbd>Ctrl</kbd>+<kbd>9</kbd></td>
 </tr>
 <tr>
 <td><strong>Editable</strong></td>
 <td>Tidy nodes for an artist to edit</td>
 <td>Editable structure on</td>
-<td><kbd>Ctrl</kbd>+<kbd>8</kbd></td>
+<td><kbd>Ctrl</kbd>+<kbd>0</kbd></td>
 </tr>
 </tbody>
 </table>
@@ -126,7 +159,7 @@ preset selected and counts the control as changed; <strong>Reset <em>N</em> chan
 <p><strong>Photo or scan</strong> needs the denoiser to do what it says. Without it the trace still runs, and the
 stage says the denoiser is missing and offers the download.</p>
 <h3 id="saving-your-own">Saving your own</h3>
-<p><strong>Save as preset</strong> stores all twenty-two controls exactly as they stand, under a name you give
+<p><strong>Save as preset</strong> stores all twenty-three controls exactly as they stand, under a name you give
 (up to 40 characters). It appears in the tray after the built-ins; the <strong>×</strong> on its chip forgets
 it. You can keep up to twelve. A saved preset is a complete snapshot rather than a list of
 differences, so it does not change if a future version changes the defaults.</p>
@@ -162,8 +195,13 @@ OKLab colour space) to be treated as one ink.
 genuinely different colours were merged.</p>
 <p><strong>Flat fills instead of gradients</strong> (off). Skips gradient fitting and fills every region with one
 colour. For flat artwork, or when the SVG must not contain gradients.</p>
-<p><strong>Black &amp; white</strong> (off). Two inks only: the Potrace-style mode, for stamps, signatures and scans
-of print.</p>
+<p><strong>One colour (black)</strong> (off). Every shape that is not the background is drawn black, light
+colours included, on a white background; with <strong>Transparent background</strong> on, on nothing, so the
+artwork can be placed on any design. Lettering on a coloured panel is cut out of a black panel.
+For logos and lettering. The presets <em>One-colour logo</em> and <em>Black, no background</em> turn it on.</p>
+<p><strong>Two tones by lightness</strong> (off). Dark becomes black and light becomes white, like a photocopy,
+so light colours drop out: the Potrace-style mode, for stamps, signatures and scans of print (the
+<em>Two-tone scan</em> preset). It wins over One colour when both are on.</p>
 <p><strong>Trace transparency</strong> (on). Transparency is traced as it is: holes stay holes, every ink carries
 its own opacity, and soft shadows, glows and feathered edges come back as translucent fills. Turned
 off, the image is laid on a solid background first and traced as solid colours, which fills holes
@@ -246,7 +284,11 @@ matters mainly when that is off.</p>
 <td><code>--no-gradients</code></td>
 </tr>
 <tr>
-<td>Black &amp; white</td>
+<td>One colour (black)</td>
+<td><code>--monochrome</code></td>
+</tr>
+<tr>
+<td>Two tones by lightness</td>
 <td><code>--bilevel</code></td>
 </tr>
 <tr>
@@ -312,7 +354,7 @@ matters mainly when that is off.</p>
 </tbody>
 </table>
 <p><code>inkvec --help</code> lists them all with their exact spelling.</p><nav class="pagenav"><a class="prev" href="result.html"><span class="dir">Previous</span><span class="lbl">Result</span></a><a class="next" href="palette.html"><span class="dir">Next</span><span class="lbl">Palette and colour groups</span></a></nav></article></main>
-  <aside class="rail"><h5>On this page</h5><ul><ul><li class="l2"><a href="#how-the-controls-work">How the controls work</a></li><li class="l2"><a href="#the-denoiser-and-editable">The denoiser and Editable</a></li><li class="l2"><a href="#presets">Presets</a><ul><li class="l3"><a href="#saving-your-own">Saving your own</a></li></ul></li><li class="l2"><a href="#detail">Detail</a></li><li class="l2"><a href="#colour">Colour</a></li><li class="l2"><a href="#shape">Shape</a></li><li class="l2"><a href="#output">Output</a></li><li class="l2"><a href="#the-same-controls-on-the-command-line">The same controls on the command line</a></li></ul></ul></aside>
+  <aside class="rail"><h5>On this page</h5><ul><ul><li class="l2"><a href="#how-the-controls-work">How the controls work</a></li><li class="l2"><a href="#the-engine-the-denoiser-and-editable">The engine, the denoiser and Editable</a><ul><li class="l3"><a href="#which-controls-each-engine-reads">Which controls each engine reads</a></li></ul></li><li class="l2"><a href="#presets">Presets</a><ul><li class="l3"><a href="#saving-your-own">Saving your own</a></li></ul></li><li class="l2"><a href="#detail">Detail</a></li><li class="l2"><a href="#colour">Colour</a></li><li class="l2"><a href="#shape">Shape</a></li><li class="l2"><a href="#output">Output</a></li><li class="l2"><a href="#the-same-controls-on-the-command-line">The same controls on the command line</a></li></ul></ul></aside>
 </div>
 </body>
 </html>

studio/guide/viewer.html

@@ -73,7 +73,7 @@ measured against.</p>
 <p><img alt="Wireframe, anchors and handles over the SVG at 4×" src="img/overlays.webp"></p>
 <p>A key to the marks appears at the right of the toolbar while any overlay is on. Anchors and
 handles are how you judge what the file will be like to edit: fewer nodes, and handles that line
-up, are easier to work with. <a href="tune.html#the-denoiser-and-editable">Editable structure</a> is the setting
+up, are easier to work with. <a href="tune.html#the-engine-the-denoiser-and-editable">Editable structure</a> is the setting
 that moves them towards what an artist would draw.</p>
 <h2 id="detail-the-pixel-grid-under-the-edge">Detail: the pixel grid under the edge</h2>
 <p><strong>Detail</strong> draws the source's pixel grid under the SVG, one cell per source pixel, and zooms to

studio/index.html

@@ -11,8 +11,8 @@
     <meta name="description" content="Turn a raster logo into an exact SVG, in your browser. Nothing is uploaded." />
     <link rel="icon" href="./favicon.svg" type="image/svg+xml" />
     <title>Inkvec Studio Lite</title>
-    <script type="module" crossorigin src="./assets/main--3-Ll9JM.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/main-C8vHcyec.css">
+    <script type="module" crossorigin src="./assets/main-ai0rIBhL.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/main-BwYpaGSz.css">
     <link rel="preload" href="./fonts/playfair-latin.woff2" as="font" type="font/woff2" crossorigin />
     <link rel="preload" href="./fonts/inter-latin.woff2" as="font" type="font/woff2" crossorigin />
     <style>
@@ -356,7 +356,7 @@ html.boot-go .boot-progress {
       </div>
       <footer class="boot-foot">
         <span>Runs in your browser. Your image never leaves this computer.</span>
-        <span>Version 0.2.1 · Apache-2.0 · logolabs.org</span>
+        <span>Version 0.2.3 · Apache-2.0 · logolabs.org</span>
       </footer>
     </div>
     <div id="app"></div>

studio/pkg-threads/inkvec_studio_wasm.d.ts

@@ -44,12 +44,19 @@ export class Studio {
     /**
      * Trace the open image (`start_trace`'s work), synchronously.
      *
-     * `on_stage(name, ms)` is called as the pipeline passes each stage; `is_current()` is
-     * asked, once the drawing is done, whether the page still wants this generation --
+     * `on_progress(json)` is called with what the engine reported (`trace:progress`'s
+     * payload, without the generation) whenever a stage starts, ends or says something,
+     * and at most every [`PROGRESS_MS`] for a loop's count. This worker is busy for the
+     * whole trace, so the pipeline's own thread is the only place progress can leave from;
+     * a count kept on rayon's workers shows at the next report made here. `is_current()`
+     * is asked, once the drawing is done, whether the page still wants this generation --
      * a drawing it has moved past is kept in the cache but not measured. Returns the
      * outcome as JSON (`trace:done`'s `outcome`), or `undefined` when it was retired.
+     *
+     * A trace here is never cancelled from inside: WebAssembly cannot unwind, so the page
+     * stops a trace nobody wants by terminating this worker (`engine.ts`).
      */
-    trace(request: string, draft_px: number, draft_seconds: number, generation: number, on_stage: Function, is_current: Function): string | undefined;
+    trace(request: string, draft_px: number, draft_seconds: number, generation: number, on_progress: Function, is_current: Function): string | undefined;
 }
 
 /**

studio/pkg-threads/inkvec_studio_wasm.js

@@ -195,24 +195,31 @@ export class Studio {
     /**
      * Trace the open image (`start_trace`'s work), synchronously.
      *
-     * `on_stage(name, ms)` is called as the pipeline passes each stage; `is_current()` is
-     * asked, once the drawing is done, whether the page still wants this generation --
+     * `on_progress(json)` is called with what the engine reported (`trace:progress`'s
+     * payload, without the generation) whenever a stage starts, ends or says something,
+     * and at most every [`PROGRESS_MS`] for a loop's count. This worker is busy for the
+     * whole trace, so the pipeline's own thread is the only place progress can leave from;
+     * a count kept on rayon's workers shows at the next report made here. `is_current()`
+     * is asked, once the drawing is done, whether the page still wants this generation --
      * a drawing it has moved past is kept in the cache but not measured. Returns the
      * outcome as JSON (`trace:done`'s `outcome`), or `undefined` when it was retired.
+     *
+     * A trace here is never cancelled from inside: WebAssembly cannot unwind, so the page
+     * stops a trace nobody wants by terminating this worker (`engine.ts`).
      * @param {string} request
      * @param {number} draft_px
      * @param {number} draft_seconds
      * @param {number} generation
-     * @param {Function} on_stage
+     * @param {Function} on_progress
      * @param {Function} is_current
      * @returns {string | undefined}
      */
-    trace(request, draft_px, draft_seconds, generation, on_stage, is_current) {
+    trace(request, draft_px, draft_seconds, generation, on_progress, is_current) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(request, wasm.__wbindgen_export, wasm.__wbindgen_export2);
             const len0 = WASM_VECTOR_LEN;
-            wasm.studio_trace(retptr, this.__wbg_ptr, ptr0, len0, draft_px, draft_seconds, generation, addBorrowedObject(on_stage), addBorrowedObject(is_current));
+            wasm.studio_trace(retptr, this.__wbg_ptr, ptr0, len0, draft_px, draft_seconds, generation, addBorrowedObject(on_progress), addBorrowedObject(is_current));
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -423,10 +430,6 @@ function __wbg_get_imports(memory) {
             const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
             return addHeapObject(ret);
         }, arguments); },
-        __wbg_call_7bbd9cceba9949ad: function() { return handleError(function (arg0, arg1, arg2, arg3) {
-            const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
-            return addHeapObject(ret);
-        }, arguments); },
         __wbg_error_757e9472f8410341: function(arg0, arg1) {
             let deferred0_0;
             let deferred0_1;
@@ -442,7 +445,7 @@ function __wbg_get_imports(memory) {
             const ret = Reflect.get(getObject(arg0), getObject(arg1));
             return addHeapObject(ret);
         }, arguments); },
-        __wbg_inkvecDenoiseSync_9b982eb59f0480ef: function() { return handleError(function (arg0, arg1, arg2, arg3) {
+        __wbg_inkvecDenoiseSync_4eb7a20f8b117e76: function() { return handleError(function (arg0, arg1, arg2, arg3) {
             const ret = globalThis.inkvecDenoiseSync(getArrayF32FromWasm0(arg0, arg1), arg2 >>> 0, arg3 >>> 0);
             return addHeapObject(ret);
         }, arguments); },

studio/pkg-threads/inkvec_studio_wasm_bg.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5de05eb83836d1dd2ba57ecc43cc743b10d0f69d2cdb4ccd7440dc5aefedccf
-size 5733382
+oid sha256:7f5572bed15d6a7884fb4af79ba6b34949ebd9cc0ffdbe4328565d87d24178ce
+size 5845653

studio/pkg-threads/snippets/wasm-bindgen-rayon-38edf6e439f6d70d/src/workerHelpers.js

@@ -51,7 +51,7 @@ waitForMsgType(self, 'wasm_bindgen_worker_init').then(async ({ init, receiver })
   // OTOH, even though it can't be inlined, it should be still reasonably
   // cheap since the requested file is already in cache (it was loaded by
   // the main thread).
-  const pkg = await import('../../../inkvec_studio_wasm.js?v=b192891e1025');
+  const pkg = await import('../../../inkvec_studio_wasm.js?v=05758cc93999');
   await pkg.default(init);
   postMessage({ type: 'wasm_bindgen_worker_ready' });
   pkg.wbg_rayon_start_worker(receiver);

studio/pkg/inkvec_studio_wasm.d.ts

@@ -44,12 +44,19 @@ export class Studio {
     /**
      * Trace the open image (`start_trace`'s work), synchronously.
      *
-     * `on_stage(name, ms)` is called as the pipeline passes each stage; `is_current()` is
-     * asked, once the drawing is done, whether the page still wants this generation --
+     * `on_progress(json)` is called with what the engine reported (`trace:progress`'s
+     * payload, without the generation) whenever a stage starts, ends or says something,
+     * and at most every [`PROGRESS_MS`] for a loop's count. This worker is busy for the
+     * whole trace, so the pipeline's own thread is the only place progress can leave from;
+     * a count kept on rayon's workers shows at the next report made here. `is_current()`
+     * is asked, once the drawing is done, whether the page still wants this generation --
      * a drawing it has moved past is kept in the cache but not measured. Returns the
      * outcome as JSON (`trace:done`'s `outcome`), or `undefined` when it was retired.
+     *
+     * A trace here is never cancelled from inside: WebAssembly cannot unwind, so the page
+     * stops a trace nobody wants by terminating this worker (`engine.ts`).
      */
-    trace(request: string, draft_px: number, draft_seconds: number, generation: number, on_stage: Function, is_current: Function): string | undefined;
+    trace(request: string, draft_px: number, draft_seconds: number, generation: number, on_progress: Function, is_current: Function): string | undefined;
 }
 
 /**

studio/pkg/inkvec_studio_wasm.js

@@ -193,24 +193,31 @@ export class Studio {
     /**
      * Trace the open image (`start_trace`'s work), synchronously.
      *
-     * `on_stage(name, ms)` is called as the pipeline passes each stage; `is_current()` is
-     * asked, once the drawing is done, whether the page still wants this generation --
+     * `on_progress(json)` is called with what the engine reported (`trace:progress`'s
+     * payload, without the generation) whenever a stage starts, ends or says something,
+     * and at most every [`PROGRESS_MS`] for a loop's count. This worker is busy for the
+     * whole trace, so the pipeline's own thread is the only place progress can leave from;
+     * a count kept on rayon's workers shows at the next report made here. `is_current()`
+     * is asked, once the drawing is done, whether the page still wants this generation --
      * a drawing it has moved past is kept in the cache but not measured. Returns the
      * outcome as JSON (`trace:done`'s `outcome`), or `undefined` when it was retired.
+     *
+     * A trace here is never cancelled from inside: WebAssembly cannot unwind, so the page
+     * stops a trace nobody wants by terminating this worker (`engine.ts`).
      * @param {string} request
      * @param {number} draft_px
      * @param {number} draft_seconds
      * @param {number} generation
-     * @param {Function} on_stage
+     * @param {Function} on_progress
      * @param {Function} is_current
      * @returns {string | undefined}
      */
-    trace(request, draft_px, draft_seconds, generation, on_stage, is_current) {
+    trace(request, draft_px, draft_seconds, generation, on_progress, is_current) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(request, wasm.__wbindgen_export, wasm.__wbindgen_export2);
             const len0 = WASM_VECTOR_LEN;
-            wasm.studio_trace(retptr, this.__wbg_ptr, ptr0, len0, draft_px, draft_seconds, generation, addBorrowedObject(on_stage), addBorrowedObject(is_current));
+            wasm.studio_trace(retptr, this.__wbg_ptr, ptr0, len0, draft_px, draft_seconds, generation, addBorrowedObject(on_progress), addBorrowedObject(is_current));
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -360,10 +367,6 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
             return addHeapObject(ret);
         }, arguments); },
-        __wbg_call_7bbd9cceba9949ad: function() { return handleError(function (arg0, arg1, arg2, arg3) {
-            const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
-            return addHeapObject(ret);
-        }, arguments); },
         __wbg_error_757e9472f8410341: function(arg0, arg1) {
             let deferred0_0;
             let deferred0_1;
@@ -379,7 +382,7 @@ function __wbg_get_imports() {
             const ret = Reflect.get(getObject(arg0), getObject(arg1));
             return addHeapObject(ret);
         }, arguments); },
-        __wbg_inkvecDenoiseSync_9b982eb59f0480ef: function() { return handleError(function (arg0, arg1, arg2, arg3) {
+        __wbg_inkvecDenoiseSync_4eb7a20f8b117e76: function() { return handleError(function (arg0, arg1, arg2, arg3) {
             const ret = globalThis.inkvecDenoiseSync(getArrayF32FromWasm0(arg0, arg1), arg2 >>> 0, arg3 >>> 0);
             return addHeapObject(ret);
         }, arguments); },

studio/pkg/inkvec_studio_wasm_bg.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9ac51390a9a4e76b2d89f7fff0093c66bb2ecd560ca5ad8267b10a5d6141396
-size 5700735
+oid sha256:cfdf37c0cc3d661558b7a9e0338d9715b9a1b41f8305808e9750b71e188063df
+size 5813486