From d47dc4e4e291137dc1bf973e0f0883e6eedab7bb Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 9 Jul 2025 11:56:46 -0400 Subject: [PATCH] fix threading detection in cam slicer, rename slicer2 to slicer_topo for clarity --- src/kiri-mode/cam/slicer.js | 2 +- src/kiri-mode/cam/{slicer2.js => slicer_topo.js} | 1 + src/kiri-mode/cam/topo3.js | 2 +- src/kiri-mode/cam/topo4.js | 2 +- src/kiri-run/minion.js | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) rename src/kiri-mode/cam/{slicer2.js => slicer_topo.js} (99%) diff --git a/src/kiri-mode/cam/slicer.js b/src/kiri-mode/cam/slicer.js index eca790ec..28ce2f8e 100644 --- a/src/kiri-mode/cam/slicer.js +++ b/src/kiri-mode/cam/slicer.js @@ -28,7 +28,7 @@ export class Slicer { this.setOptions(options); if (widget) { - this.threaded = widget.settings.controller.threaded; + this.threaded = this.minions && this.minions.running; this.setPoints(widget.getGeoVertices({ unroll: true, translate: true })); this.computeFeatures(); } diff --git a/src/kiri-mode/cam/slicer2.js b/src/kiri-mode/cam/slicer_topo.js similarity index 99% rename from src/kiri-mode/cam/slicer2.js rename to src/kiri-mode/cam/slicer_topo.js index 5fb5c4a4..71ac46d6 100644 --- a/src/kiri-mode/cam/slicer2.js +++ b/src/kiri-mode/cam/slicer_topo.js @@ -6,6 +6,7 @@ import { newOrderedLine } from '../../geo/line.js'; const { config } = base; +/** Slicer used in Topo3 and Topo4 to find contour lines */ export class Slicer { static intersectPoints = intersectPoints; diff --git a/src/kiri-mode/cam/topo3.js b/src/kiri-mode/cam/topo3.js index 0db88414..be11b92a 100644 --- a/src/kiri-mode/cam/topo3.js +++ b/src/kiri-mode/cam/topo3.js @@ -4,7 +4,7 @@ import { codec } from '../../kiri/codec.js'; import { newPoint } from '../../geo/point.js'; import { newPolygon } from '../../geo/polygon.js'; import { newSlice } from '../../kiri/slice.js'; -import { Slicer as topo_slicer } from './slicer2.js'; +import { Slicer as topo_slicer } from './slicer_topo.js'; import { polygons as POLY } from '../../geo/polygons.js'; import { Tool } from './tool.js'; diff --git a/src/kiri-mode/cam/topo4.js b/src/kiri-mode/cam/topo4.js index 8a345afe..bd4d1202 100644 --- a/src/kiri-mode/cam/topo4.js +++ b/src/kiri-mode/cam/topo4.js @@ -5,7 +5,7 @@ import { newPoint } from '../../geo/point.js'; import { newPolygon } from '../../geo/polygon.js'; import { sliceConnect } from '../../geo/slicer.js'; import { Tool } from './tool.js'; -import { Slicer as topo_slicer } from './slicer2.js'; +import { Slicer as topo_slicer } from './slicer_topo.js'; const RAD2DEG = 180 / Math.PI; const DEG2RAD = Math.PI / 180; diff --git a/src/kiri-run/minion.js b/src/kiri-run/minion.js index e6ac8ade..33645f0c 100644 --- a/src/kiri-run/minion.js +++ b/src/kiri-run/minion.js @@ -7,13 +7,13 @@ import '../add/class.js'; import '../add/three.js'; import { base } from '../geo/base.js'; -import { codec, encode } from '../kiri/codec.js'; +import { codec, encode, encodePointArray } from '../kiri/codec.js'; import { doTopShells } from '../kiri-mode/fdm/post.js'; import { newPoint } from '../geo/point.js'; import { polygons as POLY } from '../geo/polygons.js'; import { sliceZ } from '../geo/slicer.js'; import { Slicer as cam_slicer } from '../kiri-mode/cam/slicer.js'; -import { Slicer as topo_slicer } from '../kiri-mode/cam/slicer2.js'; +import { Slicer as topo_slicer } from '../kiri-mode/cam/slicer_topo.js'; import { Probe, Trace, raster_slice } from '../kiri-mode/cam/topo3.js'; import { wasm_ctrl } from '../geo/wasm.js';