From e1358fe566e4fc1f8fdcd239b0f0448eb699f117 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Tue, 15 Jul 2025 18:39:48 -0400
Subject: [PATCH] formatting

---
 src/kiri/mode/cam/slicer_topo.js | 22 ++++-----
 src/kiri/mode/cam/tool.js        | 10 ++--
 src/kiri/mode/cam/topo3.js       | 82 +++++++++++++++++---------------
 src/kiri/mode/cam/topo4.js       | 40 ++++++++--------
 4 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/src/kiri/mode/cam/slicer_topo.js b/src/kiri/mode/cam/slicer_topo.js
index 27c19b57..3fe74ca6 100644
--- a/src/kiri/mode/cam/slicer_topo.js
+++ b/src/kiri/mode/cam/slicer_topo.js
@@ -26,7 +26,7 @@ export class Slicer {
         const max = options.max || Infinity;
         const len = position.length;
         const pts = this.points = [];
-        for (let i=0; i<len; ) {
+        for (let i = 0; i < len;) {
             const x0 = position[i++];
             const y0 = position[i++];
             const z0 = position[i++];
@@ -57,7 +57,7 @@ export class Slicer {
         const len = points.length;
         const min = options.min || -Infinity;
         const max = options.max || Infinity;
-        for (let i=0; i<len; ) {
+        for (let i = 0; i < len;) {
             const p0 = points[i++];
             const p1 = points[i++];
             const p2 = points[i++];
@@ -95,11 +95,11 @@ export class Slicer {
         if (!under && !both) over = true;
 
         // iterate over matching buckets for this z offset
-        for (let i = 0; i < points.length; ) {
+        for (let i = 0; i < points.length;) {
             p1 = points[i++];
             p2 = points[i++];
             p3 = points[i++];
-            let where = {under: [], over: [], on: []};
+            let where = { under: [], over: [], on: [] };
             checkOverUnderOn(p1, z, where);
             checkOverUnderOn(p2, z, where);
             checkOverUnderOn(p3, z, where);
@@ -130,7 +130,7 @@ export class Slicer {
                 if (line.length === 2) {
                     lines.push(makeZLine(phash, line[0], line[1]));
                 } else {
-                    console.log({msg: "invalid ips", line: line, where: where});
+                    console.log({ msg: "invalid ips", line: line, where: where });
                 }
             }
         }
@@ -210,7 +210,7 @@ function getCachedPoint(phash, p) {
 function makeZLine(phash, p1, p2, coplanar, edge) {
     p1 = getCachedPoint(phash, p1);
     p2 = getCachedPoint(phash, p2);
-    let line = newOrderedLine(p1,p2);
+    let line = newOrderedLine(p1, p2);
     line.coplanar = coplanar || false;
     line.edge = edge || false;
     return line;
@@ -243,7 +243,7 @@ function removeDuplicateLines(lines, debug) {
 
     function addLinesToPoint(point, line) {
         cachePoint(point);
-        if (!point.group) point.group = [ line ];
+        if (!point.group) point.group = [line];
         else point.group.push(line);
     }
 
@@ -261,7 +261,7 @@ function removeDuplicateLines(lines, debug) {
     });
 
     // associate points with their lines, cull deleted
-    lines.forEach(function(line) {
+    lines.forEach(function (line) {
         if (!line.del) {
             tmplines.push(line);
             addLinesToPoint(line.p1, line);
@@ -270,7 +270,7 @@ function removeDuplicateLines(lines, debug) {
     });
 
     // merge collinear lines
-    points.forEach(function(point) {
+    points.forEach(function (point) {
         if (point.group.length != 2) return;
         let l1 = point.group[0],
             l2 = point.group[1];
@@ -280,7 +280,7 @@ function removeDuplicateLines(lines, debug) {
             // find new endpoints that are not shared point
             let p1 = l1.p1 != point ? l1.p1 : l1.p2,
                 p2 = l2.p1 != point ? l2.p1 : l2.p2,
-                newline = newOrderedLine(p1,p2);
+                newline = newOrderedLine(p1, p2);
             // remove deleted lines from associated points
             p1.group.remove(l1);
             p1.group.remove(l2);
@@ -307,7 +307,7 @@ function removeDuplicateLines(lines, debug) {
     });
 
     // create new line array culling deleted
-    tmplines.forEach(function(line) {
+    tmplines.forEach(function (line) {
         if (!line.del) {
             output.push(line);
             line.p1.group = null;
diff --git a/src/kiri/mode/cam/tool.js b/src/kiri/mode/cam/tool.js
index b4aab164..73d7ebd5 100644
--- a/src/kiri/mode/cam/tool.js
+++ b/src/kiri/mode/cam/tool.js
@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-const HPI = Math.PI/2;
-const RAD2DEG = 180/Math.PI;
+const HPI = Math.PI / 2;
+const RAD2DEG = 180 / Math.PI;
 
 class Tool {
     constructor(settings, id, number) {
@@ -102,7 +102,7 @@ class Tool {
         return this.tool.type === "tapermill";
     }
 
-    isDrill(){
+    isDrill() {
         return this.tool.type === "drill";
     }
 
@@ -162,8 +162,8 @@ class Tool {
                         // z_offset = (1 - Math.cos((dist_from_center / flute_radius_pix_float) * HPI)) * -flute_radius;
                     } else if (taper && dist_from_center >= tip_radius_pix_float) {// if tapered and not in the flat tip radius
                         z_offset = ((dist_from_center - tip_radius_pix_float) / tip_max_radius_offset) * -shaft_offset;
-                    }else if(drill){
-                        z_offset = -dist_from_center /45;
+                    } else if (drill) {
+                        z_offset = -dist_from_center / 45;
                     }
                     toolOffset.push(dx, dy, z_offset);
                 } else if (shaft_offset && larger_shaft && dist_from_center <= shaft_radius_pix_float) {
diff --git a/src/kiri/mode/cam/topo3.js b/src/kiri/mode/cam/topo3.js
index d45ae043..84a54fce 100644
--- a/src/kiri/mode/cam/topo3.js
+++ b/src/kiri/mode/cam/topo3.js
@@ -37,7 +37,7 @@ export class Topo {
             boundsY = maxY - minY,
             inside = contour.inside,
             density = 1 + (contour.reduction || 0),
-            resolution = tolerance ? tolerance : 1/Math.sqrt(animesh/(boundsX * boundsY)),
+            resolution = tolerance ? tolerance : 1 / Math.sqrt(animesh / (boundsX * boundsY)),
             tool = new Tool(settings, contour.tool),
             toolOffset = tool.generateProfile(resolution).profile,
             toolDiameter = tool.fluteDiameter(),
@@ -68,11 +68,11 @@ export class Topo {
             },
             data = topo.data,
             newslices = [],
-            tabsMax = tabs ? Math.max(...tabs.map(tab => tab.dim.z/2 + tab.pos.z)) : 0,
+            tabsMax = tabs ? Math.max(...tabs.map(tab => tab.dim.z / 2 + tab.pos.z)) : 0,
             tabsOn = tabs,
             tabHeight = Math.max(process.camTabsHeight + zBottom, tabsMax),
             clipTab = tabsOn ? [] : null,
-            clipTo = inside ? shadow : POLY.expand(shadow, toolDiameter/2 + resolution * 3),
+            clipTo = inside ? shadow : POLY.expand(shadow, toolDiameter / 2 + resolution * 3),
             partOff = inside ? 0 : toolDiameter / 2 + resolution,
             gridDelta = Math.floor(partOff / resolution),
             debug = false,
@@ -92,8 +92,8 @@ export class Topo {
 
         if (tabs) {
             clipTab.appendAll(tabs.map(tab => {
-                let ctab = POLY.expand([tab.poly], toolDiameter/2);
-                ctab.forEach(ct => ct.z = tab.dim.z/2 + tab.pos.z);
+                let ctab = POLY.expand([tab.poly], toolDiameter / 2);
+                ctab.forEach(ct => ct.z = tab.dim.z / 2 + tab.pos.z);
                 return ctab;
             }).flat());
         }
@@ -197,7 +197,7 @@ export class Topo {
         const range = { min: Infinity, max: -Infinity };
 
         // swap XZ in shared array
-        for (let i=0,l=vertices.length; i<l; i += 3) {
+        for (let i = 0, l = vertices.length; i < l; i += 3) {
             const x = vertices[i];
             const z = vertices[i + 2];
             vertices[i] = z;
@@ -226,9 +226,11 @@ export class Topo {
         // define sharded ranges
         if (minions.running > 1) {
 
-            dispatch.putCache({ key: widget.id, data: vertices }, { done: data => {
-                // console.log({ put_cache_done: data });
-            }});
+            dispatch.putCache({ key: widget.id, data: vertices }, {
+                done: data => {
+                    // console.log({ put_cache_done: data });
+                }
+            });
 
             let promises = slices.map(slice => {
                 return new Promise(resolve => {
@@ -256,9 +258,11 @@ export class Topo {
                     return box2;
                 });
 
-            dispatch.clearCache({}, { done: data => {
-                // console.log({ clear_cache_done: data });
-            }});
+            dispatch.clearCache({}, {
+                done: data => {
+                    // console.log({ clear_cache_done: data });
+                }
+            });
 
         } else {
 
@@ -340,8 +344,8 @@ export class Topo {
         let promise = new Promise(resolve => {
             resolver = () => {
                 // sort output slices (required for async)
-                slicesY.sort((a,b) => a.z - b.z);
-                slicesX.sort((a,b) => a.z - b.z);
+                slicesY.sort((a, b) => a.z - b.z);
+                slicesX.sort((a, b) => a.z - b.z);
                 newslices.appendAll(slicesY);
                 newslices.appendAll(slicesX);
                 resolve();
@@ -369,7 +373,7 @@ export class Topo {
                         let slice = newSlice(gridx);
                         slice.camLines = segments;
                         slice.output()
-                            .setLayer("contour y", {face: color, line: color})
+                            .setLayer("contour y", { face: color, line: color })
                             .addPolys(segments);
                         slicesY.push(slice);
                     }
@@ -398,7 +402,7 @@ export class Topo {
                         let slice = newSlice(gridy);
                         slice.camLines = segments;
                         slice.output()
-                            .setLayer("contour x", {face: color, line: color})
+                            .setLayer("contour x", { face: color, line: color })
                             .addPolys(segments);
                         slicesX.push(slice);
                     }
@@ -431,7 +435,7 @@ export class Probe {
         this.params = params;
 
         // return the touching z given topo x,y and a tool profile
-        const toolAtZ = this.toolAtZ = function(x,y) {
+        const toolAtZ = this.toolAtZ = function (x, y) {
             let sx = stepsX,
                 sy = stepsY,
                 xl = sx - 1,
@@ -461,13 +465,13 @@ export class Probe {
         // export z probe function
         const rx = stepsX / boundsX;
         const ry = stepsX / boundsX;
-        const toolAtXY = this.toolAtXY = function(px, py) {
+        const toolAtXY = this.toolAtXY = function (px, py) {
             px = Math.round(rx * (px - minX));
             py = Math.round(ry * (py - minY));
             return toolAtZ(px, py);
         };
 
-        const zAtXY = this.zAtXY = function(px, py) {
+        const zAtXY = this.zAtXY = function (px, py) {
             let ix = Math.round(rx * (px - minX));
             let iy = Math.round(ry * (py - minY));
             return data[ix * stepsY + iy] || zMin;
@@ -496,11 +500,11 @@ export class Trace {
             this.slice = slice = [];
         }
 
-        const newtrace = this.newtrace = function() {
+        const newtrace = this.newtrace = function () {
             trace = newPolygon().setOpen();
         }
 
-        const end_poly = this.end_poly = function(point) {
+        const end_poly = this.end_poly = function (point) {
             if (latent) {
                 trace.push(latent);
             }
@@ -520,7 +524,7 @@ export class Trace {
             }
         }
 
-        const log = function(map) {
+        const log = function (map) {
             for (let key in map) {
                 const val = map[key];
                 if (typeof val === 'number') {
@@ -530,7 +534,7 @@ export class Trace {
             console.log(...arguments);
         }
 
-        const push_point = this.push_point = function(x, y, z) {
+        const push_point = this.push_point = function (x, y, z) {
             const newP = newPoint(x, y, z);
             const lastP = lastPP;//trace.last();
 
@@ -550,7 +554,7 @@ export class Trace {
                     if (curvesOnly) {
                         const dv = contourX ? Math.abs(lastP.x - x) : Math.abs(lastP.y - y);
                         // const dz = lastPP.z - z;
-                        const angle = Math.atan2( Math.abs(dz), dv) * RAD2DEG;
+                        const angle = Math.atan2(Math.abs(dz), dv) * RAD2DEG;
                         if (angle > maxangle) {
                             end_poly();
                         }
@@ -568,7 +572,7 @@ export class Trace {
         const object = this.object = this;
 
         this.inClip = function (clips, checkZ, point) {
-            for (let i=0; i<clips.length; i++) {
+            for (let i = 0; i < clips.length; i++) {
                 let poly = clips[i];
                 let zok = checkZ ? checkZ <= poly.z : true;
                 object.tabZ = poly.z;
@@ -590,9 +594,9 @@ export class Trace {
         // in this case, z is appended to clip tabs in topo constructor
         // we pass it as a side-channel and re-consitute here
         if (clipTab)
-        for (let i=0, l=clipTab.length; i<l; i++) {
-            clipTab[i].z = clipTabZ[i];
-        }
+            for (let i = 0, l = clipTab.length; i < l; i++) {
+                clipTab[i].z = clipTabZ[i];
+            }
 
         if (minions && this.cross.concurrent) {
             minions.broadcast("trace_init", codec.encode({
@@ -649,7 +653,7 @@ export class Trace {
         let { from, to, x, gridx, gridy } = params;
 
         const step = resolution * density;
-        const checkr = newPoint(0,0);
+        const checkr = newPoint(0, 0);
         newslice();
         newtrace();
         for (let y = from; y < to; y += step) {
@@ -687,7 +691,7 @@ export class Trace {
         let { from, to, y, gridx, gridy } = params;
 
         const step = resolution * density;
-        const checkr = newPoint(0,0);
+        const checkr = newPoint(0, 0);
         newslice();
         newtrace();
         for (let x = from; x < to; x += step) {
@@ -734,7 +738,7 @@ export function raster_slice(inputs) {
     // emit an array of valid line-pairs
     const len = lines.length;
 
-    outer: for (let i=0; i<len; i++) {
+    outer: for (let i = 0; i < len; i++) {
         let l1 = lines[i], p1 = l1.p1, p2 = l1.p2;
         // eliminate vertical
         if (Math.abs(p1.y - p2.y) < flatness) continue;
@@ -743,14 +747,14 @@ export function raster_slice(inputs) {
         // sort p1,p2 by y for comparison
         if (p1.y > p2.y) { const tp = p1; p1 = p2; p2 = tp };
         // eliminate if points "under" other lines
-        for (let j=0; j<len; j++) {
+        for (let j = 0; j < len; j++) {
             // skip self and adjacent
-            if (j >= i-1 && j <= i+1) continue;
+            if (j >= i - 1 && j <= i + 1) continue;
             let l2 = lines[j], p3 = l2.p1, p4 = l2.p2;
             // sort p3,p4 by y for comparison
             if (p3.y > p4.y) { const tp = p3; p3 = p4; p4 = tp };
             // it's under the other line
-            if (Math.max(p1.z,p2.z) < Math.min(p3.z,p4.z)) {
+            if (Math.max(p1.z, p2.z) < Math.min(p3.z, p4.z)) {
                 // it's inside the other line, too, so skip
                 if (p1.y >= p3.y && p2.y <= p4.y) continue outer;
             }
@@ -766,8 +770,8 @@ export function raster_slice(inputs) {
         gridi = gridx * stepsY + gridy;
         gridv = data[gridi] || zMin;
         // strategy using raw lines (faster slice, but more lines)
-        for (i=0, il=points.length; i<il; i += 2) {
-            const p1 = points[i], p2 = points[i+1];
+        for (i = 0, il = points.length; i < il; i += 2) {
+            const p1 = points[i], p2 = points[i + 1];
             // one endpoint above grid
             const crossz = (p1.z > gridv || p2.z > gridv);
             // segment crosses grid y
@@ -783,7 +787,7 @@ export function raster_slice(inputs) {
                 if (nz > gridv) {
                     gridv = data[gridi] = Math.max(nz, zMin);
                     if (slice) slice.output()
-                        .setLayer("heights", {face: 0, line: 0})
+                        .setLayer("heights", { face: 0, line: 0 })
                         .addLine(
                             newPoint(p1.x, y, 0),
                             newPoint(p1.x, y, gridv)
@@ -797,9 +801,9 @@ export function raster_slice(inputs) {
     // remove flat lines when curvesOnly
     if (curvesOnly) {
         let nup = [];
-        for (let i=0, p=points, l=p.length; i<l; i += 2) {
+        for (let i = 0, p = points, l = p.length; i < l; i += 2) {
             const p1 = p[i];
-            const p2 = p[i+1];
+            const p2 = p[i + 1];
             if (Math.abs(p1.z - p2.z) >= flatness) {
                 nup.push(p1, p2);
             }
diff --git a/src/kiri/mode/cam/topo4.js b/src/kiri/mode/cam/topo4.js
index 7a4c39c6..5bd4f528 100644
--- a/src/kiri/mode/cam/topo4.js
+++ b/src/kiri/mode/cam/topo4.js
@@ -92,7 +92,7 @@ export class Topo {
         const box = this.box = new THREE.Box2();
 
         // swap XZ in shared array
-        for (let i=0, l=vertices.length; i<l; i += 3) {
+        for (let i = 0, l = vertices.length; i < l; i += 3) {
             const x = vertices[i];
             const z = vertices[i + 2] + zoff;
             vertices[i] = z;
@@ -106,7 +106,7 @@ export class Topo {
         range.max += this.diam / 2;
 
         // merge in tab vertices here so they don't affect slice range / dimensions
-        for (let i=0, l=tabverts.length; i<l; i += 3) {
+        for (let i = 0, l = tabverts.length; i < l; i += 3) {
             const x = tabverts[i];
             const z = tabverts[i + 2] + zoff;
             tabverts[i] = z;
@@ -160,7 +160,7 @@ export class Topo {
                     slice.index = rec.index;
                     slice.addTops(sliceConnect(rec.lines));
 
-                    const points = codec.encodePointArray(rec.lines.map(l => [ l.p1, l.p2 ]).flat());
+                    const points = codec.encodePointArray(rec.lines.map(l => [l.p1, l.p2]).flat());
                     const shared = new Float32Array(new SharedArrayBuffer(points.length * 4));
                     shared.set(points);
                     slice.shared = shared;
@@ -168,7 +168,7 @@ export class Topo {
                     return slice;
                 });
             output.appendAll(recs);
-            onupdate(++complete /slices.length);
+            onupdate(++complete / slices.length);
         }
 
         return output;
@@ -197,7 +197,7 @@ export class Topo {
             .map(rec => newSlice(rec.z)
                 .addTops(rec.polys)
                 .setFields({ shared: rec.shared }))
-            .sort((a,b) => a.z - b.z);
+            .sort((a, b) => a.z - b.z);
 
         clearCache();
         return output;
@@ -226,7 +226,7 @@ export class Topo {
             const lines = slice.lines;
             const plen = lines.length;
             const rec = { z: slice.z, lines: [] };
-            for (let i = 0; i < plen; ) {
+            for (let i = 0; i < plen;) {
                 ++i; // skip x which should match slice.z
                 let py0 = lines[i++];
                 const pz0 = lines[i++];
@@ -248,7 +248,7 @@ export class Topo {
             const rx = oslices[si].z;
             let mz = -Infinity;
             // iterate over tool offsets
-            for (let ti = 0; ti < tlen; ) {
+            for (let ti = 0; ti < tlen;) {
                 // tool offset in grid units from present x (si)
                 const xo = tool[ti++]; // x grid offset (slice)
                 const yo = tool[ti++] * resolution; // y grid offset (mult rez to get real y)
@@ -262,7 +262,7 @@ export class Topo {
                 const slice = oslices[ts];
                 const lines = slice.lines;
                 const plen = lines.length;
-                for (let i = 0; i < plen; ) {
+                for (let i = 0; i < plen;) {
                     ++i; // skip x which should match slice.z
                     let py0 = lines[i++];
                     const pz0 = lines[i++];
@@ -323,15 +323,15 @@ export class Topo {
         // count = recs[0].heights.length / 3;
         while (count-- > 0) {
             let slice = newSlice(count);
-            slice.camLines = [ newPolygon().setOpen() ];
+            slice.camLines = [newPolygon().setOpen()];
             paths.push(slice);
         }
 
         if (linear) {
-            recs.forEach((rec,i) => {
+            recs.forEach((rec, i) => {
                 const { degrees, heights } = rec;
                 [...heights].group(3).forEach((a) => {
-                    paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(degrees) );
+                    paths[i].camLines[0].push(newPoint(a[0], a[1], a[2] + leave).setA(degrees));
                 });
                 if (i % 2 === 1) {
                     paths[i].camLines[0].reverse();
@@ -340,9 +340,9 @@ export class Topo {
         } else {
             for (let rec of recs) {
                 const { degrees, heights } = rec;
-                [...heights].group(3).forEach((a,i) => {
+                [...heights].group(3).forEach((a, i) => {
                     // progress each path 360 degrees to prevent A rolling backwards
-                    paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(degrees + i * -360) );
+                    paths[i].camLines[0].push(newPoint(a[0], a[1], a[2] + leave).setA(degrees + i * -360));
                 });
             }
         }
@@ -358,7 +358,7 @@ export class Topo {
             slice.camLines[0].push(repeat.clone().setA(repeat.a - 360));
             slice.output()
                 .setLayer("lathe", { line: this.lineColor })
-                .addPoly(poly.clone().applyRotations().move({ z: -zoff, x:0, y:0 }));
+                .addPoly(poly.clone().applyRotations().move({ z: -zoff, x: 0, y: 0 }));
         }
 
         // console.log({ tool, slices, paths });
@@ -411,15 +411,15 @@ export class Topo {
         count = linear ? recs.length : recs[0].heights.length / 3;
         while (count-- > 0) {
             let slice = newSlice(count);
-            slice.camLines = [ newPolygon().setOpen() ];
+            slice.camLines = [newPolygon().setOpen()];
             paths.push(slice);
         }
 
         if (linear) {
-            recs.forEach((rec,i) => {
+            recs.forEach((rec, i) => {
                 const { degrees, heights } = rec;
                 [...heights].group(3).forEach((a) => {
-                    paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(degrees) );
+                    paths[i].camLines[0].push(newPoint(a[0], a[1], a[2] + leave).setA(degrees));
                 });
                 if (i % 2 === 1) {
                     paths[i].camLines[0].reverse();
@@ -428,9 +428,9 @@ export class Topo {
         } else {
             for (let rec of recs) {
                 const { degrees, heights } = rec;
-                [...heights].group(3).forEach((a,i) => {
+                [...heights].group(3).forEach((a, i) => {
                     // progress each path 360 degrees to prevent A rolling backwards
-                    paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(degrees + i * -360) );
+                    paths[i].camLines[0].push(newPoint(a[0], a[1], a[2] + leave).setA(degrees + i * -360));
                 });
             }
         }
@@ -448,7 +448,7 @@ export class Topo {
             }
             slice.output()
                 .setLayer("lathe", { line: this.lineColor })
-                .addPoly(poly.clone().applyRotations().move({ z: -zoff, x:0, y:0 }));
+                .addPoly(poly.clone().applyRotations().move({ z: -zoff, x: 0, y: 0 }));
         }
 
         // console.log({ tool, slices, paths });