From 67f405fd7ba7d9fdd0a81843197a065d6abd1e9c Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Thu, 8 Jan 2026 16:52:41 -0500 Subject: [PATCH] reorganize and rename driver files for consistency and clarity --- src/kiri/app/api.js | 4 +- src/kiri/app/export.js | 4 +- src/kiri/app/init/input.js | 12 +++--- .../cam/{anim-2d-fe.js => app/anim-2d.js} | 4 +- .../cam/{anim-3d-fe.js => app/anim-3d.js} | 4 +- src/kiri/mode/cam/{ => app}/cl-flip.js | 4 +- src/kiri/mode/cam/{ => app}/cl-helical.js | 4 +- src/kiri/mode/cam/{ => app}/cl-hole.js | 4 +- src/kiri/mode/cam/{ => app}/cl-ops.js | 8 ++-- src/kiri/mode/cam/{ => app}/cl-origin.js | 6 +-- src/kiri/mode/cam/{ => app}/cl-stock.js | 4 +- src/kiri/mode/cam/{ => app}/cl-surface.js | 4 +- src/kiri/mode/cam/{ => app}/cl-tab.js | 8 ++-- src/kiri/mode/cam/{ => app}/cl-trace.js | 12 +++--- src/kiri/mode/cam/{ => app}/cl-zplane.js | 2 +- .../mode/cam/{driver-fe.js => app/driver.js} | 4 +- src/kiri/mode/cam/{ => app}/init-menu.js | 2 +- src/kiri/mode/cam/{ => app}/init-ui.js | 20 ++++----- src/kiri/mode/cam/{ => app}/tools.js | 10 ++--- src/kiri/mode/cam/{ => core}/op.js | 0 src/kiri/mode/cam/core/ops.js | 43 +++++++++++++++++++ src/kiri/mode/cam/{ => core}/tool.js | 0 src/kiri/mode/cam/ops.js | 43 ------------------- .../cam/{anim-2d-be.js => work/anim-2d.js} | 2 +- .../cam/{anim-3d-be.js => work/anim-3d.js} | 4 +- src/kiri/mode/cam/{ => work}/export.js | 4 +- .../cam/{driver-be.js => work/init-work.js} | 8 ++-- src/kiri/mode/cam/{ => work}/op-area.js | 18 ++++---- src/kiri/mode/cam/{ => work}/op-contour.js | 12 +++--- src/kiri/mode/cam/{ => work}/op-drill.js | 10 ++--- src/kiri/mode/cam/{ => work}/op-gcode.js | 2 +- src/kiri/mode/cam/{ => work}/op-helical.js | 12 +++--- src/kiri/mode/cam/{ => work}/op-index.js | 2 +- src/kiri/mode/cam/{ => work}/op-laser-off.js | 2 +- src/kiri/mode/cam/{ => work}/op-laser-on.js | 2 +- src/kiri/mode/cam/{ => work}/op-lathe.js | 4 +- src/kiri/mode/cam/{ => work}/op-level.js | 12 +++--- src/kiri/mode/cam/{ => work}/op-loop.js | 2 +- src/kiri/mode/cam/{ => work}/op-outline.js | 2 +- src/kiri/mode/cam/{ => work}/op-pocket.js | 2 +- src/kiri/mode/cam/{ => work}/op-register.js | 12 +++--- src/kiri/mode/cam/{ => work}/op-rough.js | 6 +-- src/kiri/mode/cam/{ => work}/op-shadow.js | 6 +-- src/kiri/mode/cam/{ => work}/op-trace.js | 2 +- src/kiri/mode/cam/{ => work}/op-xray.js | 6 +-- src/kiri/mode/cam/{ => work}/prepare.js | 14 +++--- src/kiri/mode/cam/{ => work}/slice.js | 20 ++++----- .../cam/{slicer_cam.js => work/slicer-cam.js} | 14 +++--- .../{slicer_topo.js => work/slicer-topo.js} | 4 +- src/kiri/mode/cam/{ => work}/topo3.js | 14 +++--- src/kiri/mode/cam/{ => work}/topo4.js | 14 +++--- .../mode/drag/{driver.js => init-work.js} | 2 +- src/kiri/mode/fdm/{ => app}/init-menu.js | 2 +- src/kiri/mode/fdm/{ => app}/init-ui.js | 12 +++--- .../mode/fdm/{driver.js => core/params.js} | 0 src/kiri/mode/fdm/{ => work}/belt.js | 8 ++-- src/kiri/mode/fdm/{ => work}/export.js | 8 ++-- src/kiri/mode/fdm/{ => work}/fill.js | 4 +- .../fdm/{driver-be.js => work/init-work.js} | 4 +- src/kiri/mode/fdm/{ => work}/post.js | 16 +++---- src/kiri/mode/fdm/{ => work}/prepare.js | 22 +++++----- src/kiri/mode/fdm/{ => work}/slice.js | 14 +++--- .../mode/laser/{driver.js => init-work.js} | 0 src/kiri/mode/sla/{ => app}/init-menu.js | 2 +- src/kiri/mode/sla/{ => app}/init-ui.js | 4 +- src/kiri/mode/sla/{ => work}/export.js | 2 +- .../mode/sla/{driver.js => work/init-work.js} | 2 +- src/kiri/mode/sla/{ => work}/slice.js | 16 +++---- src/kiri/mode/sla/{ => work}/x_cxdlp.js | 0 src/kiri/mode/sla/{ => work}/x_photon.js | 2 +- .../mode/wedm/{driver.js => init-work.js} | 2 +- .../mode/wjet/{driver.js => init-work.js} | 2 +- src/kiri/run/minion.js | 10 ++--- src/kiri/run/worker.js | 14 +++--- 74 files changed, 283 insertions(+), 283 deletions(-) rename src/kiri/mode/cam/{anim-2d-fe.js => app/anim-2d.js} (98%) rename src/kiri/mode/cam/{anim-3d-fe.js => app/anim-3d.js} (99%) rename src/kiri/mode/cam/{ => app}/cl-flip.js (96%) rename src/kiri/mode/cam/{ => app}/cl-helical.js (96%) rename src/kiri/mode/cam/{ => app}/cl-hole.js (98%) rename src/kiri/mode/cam/{ => app}/cl-ops.js (99%) rename src/kiri/mode/cam/{ => app}/cl-origin.js (96%) rename src/kiri/mode/cam/{ => app}/cl-stock.js (97%) rename src/kiri/mode/cam/{ => app}/cl-surface.js (96%) rename src/kiri/mode/cam/{ => app}/cl-tab.js (96%) rename src/kiri/mode/cam/{ => app}/cl-trace.js (96%) rename src/kiri/mode/cam/{ => app}/cl-zplane.js (95%) rename src/kiri/mode/cam/{driver-fe.js => app/driver.js} (97%) rename src/kiri/mode/cam/{ => app}/init-menu.js (99%) rename src/kiri/mode/cam/{ => app}/init-ui.js (98%) rename src/kiri/mode/cam/{ => app}/tools.js (97%) rename src/kiri/mode/cam/{ => core}/op.js (100%) create mode 100644 src/kiri/mode/cam/core/ops.js rename src/kiri/mode/cam/{ => core}/tool.js (100%) delete mode 100644 src/kiri/mode/cam/ops.js rename src/kiri/mode/cam/{anim-2d-be.js => work/anim-2d.js} (99%) rename src/kiri/mode/cam/{anim-3d-be.js => work/anim-3d.js} (99%) rename src/kiri/mode/cam/{ => work}/export.js (99%) rename src/kiri/mode/cam/{driver-be.js => work/init-work.js} (94%) rename src/kiri/mode/cam/{ => work}/op-area.js (98%) rename src/kiri/mode/cam/{ => work}/op-contour.js (95%) rename src/kiri/mode/cam/{ => work}/op-drill.js (89%) rename src/kiri/mode/cam/{ => work}/op-gcode.js (86%) rename src/kiri/mode/cam/{ => work}/op-helical.js (97%) rename src/kiri/mode/cam/{ => work}/op-index.js (97%) rename src/kiri/mode/cam/{ => work}/op-laser-off.js (91%) rename src/kiri/mode/cam/{ => work}/op-laser-on.js (91%) rename src/kiri/mode/cam/{ => work}/op-lathe.js (96%) rename src/kiri/mode/cam/{ => work}/op-level.js (90%) rename src/kiri/mode/cam/{ => work}/op-loop.js (89%) rename src/kiri/mode/cam/{ => work}/op-outline.js (98%) rename src/kiri/mode/cam/{ => work}/op-pocket.js (96%) rename src/kiri/mode/cam/{ => work}/op-register.js (95%) rename src/kiri/mode/cam/{ => work}/op-rough.js (96%) rename src/kiri/mode/cam/{ => work}/op-shadow.js (95%) rename src/kiri/mode/cam/{ => work}/op-trace.js (97%) rename src/kiri/mode/cam/{ => work}/op-xray.js (87%) rename src/kiri/mode/cam/{ => work}/prepare.js (98%) rename src/kiri/mode/cam/{ => work}/slice.js (98%) rename src/kiri/mode/cam/{slicer_cam.js => work/slicer-cam.js} (97%) rename src/kiri/mode/cam/{slicer_topo.js => work/slicer-topo.js} (98%) rename src/kiri/mode/cam/{ => work}/topo3.js (98%) rename src/kiri/mode/cam/{ => work}/topo4.js (98%) rename src/kiri/mode/drag/{driver.js => init-work.js} (99%) rename src/kiri/mode/fdm/{ => app}/init-menu.js (99%) rename src/kiri/mode/fdm/{ => app}/init-ui.js (97%) rename src/kiri/mode/fdm/{driver.js => core/params.js} (100%) rename src/kiri/mode/fdm/{ => work}/belt.js (98%) rename src/kiri/mode/fdm/{ => work}/export.js (99%) rename src/kiri/mode/fdm/{ => work}/fill.js (98%) rename src/kiri/mode/fdm/{driver-be.js => work/init-work.js} (93%) rename src/kiri/mode/fdm/{ => work}/post.js (98%) rename src/kiri/mode/fdm/{ => work}/prepare.js (99%) rename src/kiri/mode/fdm/{ => work}/slice.js (99%) rename src/kiri/mode/laser/{driver.js => init-work.js} (100%) rename src/kiri/mode/sla/{ => app}/init-menu.js (98%) rename src/kiri/mode/sla/{ => app}/init-ui.js (96%) rename src/kiri/mode/sla/{ => work}/export.js (99%) rename src/kiri/mode/sla/{driver.js => work/init-work.js} (96%) rename src/kiri/mode/sla/{ => work}/slice.js (98%) rename src/kiri/mode/sla/{ => work}/x_cxdlp.js (100%) rename src/kiri/mode/sla/{ => work}/x_photon.js (99%) rename src/kiri/mode/wedm/{driver.js => init-work.js} (89%) rename src/kiri/mode/wjet/{driver.js => init-work.js} (82%) diff --git a/src/kiri/app/api.js b/src/kiri/app/api.js index 41f644e3..9c687c4d 100644 --- a/src/kiri/app/api.js +++ b/src/kiri/app/api.js @@ -29,12 +29,12 @@ import { platform } from './platform.js'; import { selection } from './selected.js'; import { settingsUI } from './conf/dialog.js'; import { showDevices } from './devices.js'; -import { showTools } from '../mode/cam/tools.js'; +import { showTools } from '../mode/cam/app/tools.js'; import { space as SPACE } from '../../moto/space.js'; import { stats } from './stats.js'; import { types as load } from '../../load/file.js'; import { UI } from './inputs.js'; -import { updateTool } from '../mode/cam/tools.js'; +import { updateTool } from '../mode/cam/app/tools.js'; import { view as viewModule } from './view-mode.js'; import { visuals } from './visuals.js'; import { widgets } from './widgets.js'; diff --git a/src/kiri/app/export.js b/src/kiri/app/export.js index 05831716..999795ef 100644 --- a/src/kiri/app/export.js +++ b/src/kiri/app/export.js @@ -6,8 +6,8 @@ import { client } from './workers.js'; import { local } from '../../data/local.js'; import { util } from '../../geo/base.js'; import { MODES } from './consts.js'; -import { LASER as laser_driver } from '../mode/laser/driver.js'; -import { SLA as sla_client } from '../mode/sla/init-ui.js'; +import { LASER as laser_driver } from '../mode/laser/init-work.js'; +import { SLA as sla_client } from '../mode/sla/app/init-ui.js'; import { hash } from '../../ext/md5.js'; /** diff --git a/src/kiri/app/init/input.js b/src/kiri/app/init/input.js index 6909ce40..05eef309 100644 --- a/src/kiri/app/init/input.js +++ b/src/kiri/app/init/input.js @@ -5,20 +5,20 @@ import { api } from '../api.js'; import { bind } from './bind.js'; import { version } from '../../../moto/license.js'; import { fileOps } from '../file-ops.js'; -import { init as initCAM } from '../../mode/cam/init-ui.js'; +import { init as initCAM } from '../../mode/cam/app/init-ui.js'; import { init as initDRAG } from '../../mode/drag/init-ui.js'; -import { init as initFDM } from '../../mode/fdm/init-ui.js'; +import { init as initFDM } from '../../mode/fdm/app/init-ui.js'; import { init as initLaser } from '../../mode/laser/init-ui.js'; -import { init as initSLA } from '../../mode/sla/init-ui.js'; +import { init as initSLA } from '../../mode/sla/app/init-ui.js'; import { init as initWEDM } from '../../mode/wedm/init-ui.js'; import { init as initWJET } from '../../mode/wjet/init-ui.js'; import { interact } from '../mouse.js'; import { keyboard } from '../keyboard.js'; import { local as sdb } from '../../../data/local.js'; -import { menu as menuCAM } from '../../mode/cam/init-menu.js'; -import { menu as menuFDM } from '../../mode/fdm/init-menu.js'; +import { menu as menuCAM } from '../../mode/cam/app/init-menu.js'; +import { menu as menuFDM } from '../../mode/fdm/app/init-menu.js'; import { menu as menuLaser } from '../../mode/laser/init-menu.js'; -import { menu as menuSLA } from '../../mode/sla/init-menu.js'; +import { menu as menuSLA } from '../../mode/sla/app/init-menu.js'; import { modal } from '../modal.js'; import { preferences } from '../preferences.js'; import { settings as set_ctrl } from '../conf/manager.js'; diff --git a/src/kiri/mode/cam/anim-2d-fe.js b/src/kiri/mode/cam/app/anim-2d.js similarity index 98% rename from src/kiri/mode/cam/anim-2d-fe.js rename to src/kiri/mode/cam/app/anim-2d.js index 98286cc0..5d3312e5 100644 --- a/src/kiri/mode/cam/anim-2d-fe.js +++ b/src/kiri/mode/cam/app/anim-2d.js @@ -2,8 +2,8 @@ // UI FRONT END ANIMATION CODE for 2D -import { api } from '../../app/api.js'; -import { space } from '../../../moto/space.js'; +import { api } from '../../../app/api.js'; +import { space } from '../../../../moto/space.js'; const { client } = api; diff --git a/src/kiri/mode/cam/anim-3d-fe.js b/src/kiri/mode/cam/app/anim-3d.js similarity index 99% rename from src/kiri/mode/cam/anim-3d-fe.js rename to src/kiri/mode/cam/app/anim-3d.js index 478ed13e..8e26a1ac 100644 --- a/src/kiri/mode/cam/anim-3d-fe.js +++ b/src/kiri/mode/cam/app/anim-3d.js @@ -2,8 +2,8 @@ // UI FRONT END ANIMATION CODE for 3D (indexed) -import { api } from '../../app/api.js'; -import { space } from '../../../moto/space.js'; +import { api } from '../../../app/api.js'; +import { space } from '../../../../moto/space.js'; const { client } = api; diff --git a/src/kiri/mode/cam/cl-flip.js b/src/kiri/mode/cam/app/cl-flip.js similarity index 96% rename from src/kiri/mode/cam/cl-flip.js rename to src/kiri/mode/cam/app/cl-flip.js index cf3097f1..40dd842e 100644 --- a/src/kiri/mode/cam/cl-flip.js +++ b/src/kiri/mode/cam/app/cl-flip.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { env, opAdd, opRender } from './init-ui.js'; -import { CAM } from './driver-fe.js'; +import { CAM } from './driver.js'; import { clearTabs, restoreTabs } from './cl-tab.js'; import { updateStock } from './cl-stock.js'; diff --git a/src/kiri/mode/cam/cl-helical.js b/src/kiri/mode/cam/app/cl-helical.js similarity index 96% rename from src/kiri/mode/cam/cl-helical.js rename to src/kiri/mode/cam/app/cl-helical.js index 294f38e9..debbab7f 100644 --- a/src/kiri/mode/cam/cl-helical.js +++ b/src/kiri/mode/cam/app/cl-helical.js @@ -1,5 +1,5 @@ -import { api } from '../../app/api.js'; -import { CAM } from "./driver-fe.js"; +import { api } from '../../../app/api.js'; +import { CAM } from "./driver.js"; import { clearPops, env } from "./init-ui.js"; let alert, lastWidget; diff --git a/src/kiri/mode/cam/cl-hole.js b/src/kiri/mode/cam/app/cl-hole.js similarity index 98% rename from src/kiri/mode/cam/cl-hole.js rename to src/kiri/mode/cam/app/cl-hole.js index cf20aece..7c1c9d1a 100644 --- a/src/kiri/mode/cam/cl-hole.js +++ b/src/kiri/mode/cam/app/cl-hole.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { env, clearPops } from './init-ui.js'; -import { CAM } from './driver-fe.js'; +import { CAM } from './driver.js'; export let holeSelOn = false; export let lastSelHoles; diff --git a/src/kiri/mode/cam/cl-ops.js b/src/kiri/mode/cam/app/cl-ops.js similarity index 99% rename from src/kiri/mode/cam/cl-ops.js rename to src/kiri/mode/cam/app/cl-ops.js index 713b5b00..9fe753cf 100644 --- a/src/kiri/mode/cam/cl-ops.js +++ b/src/kiri/mode/cam/app/cl-ops.js @@ -1,15 +1,15 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { $, h } from '../../../moto/webui.js'; -import { api } from '../../app/api.js'; +import { $, h } from '../../../../moto/webui.js'; +import { api } from '../../../app/api.js'; import { env, opRender } from './init-ui.js'; -import { Tool } from './tool.js'; +import { Tool } from '../core/tool.js'; import { opFlip } from './cl-flip.js'; import { selectHoles } from './cl-hole.js'; import { selectHelical } from './cl-helical.js'; import { surfaceAdd } from './cl-surface.js'; import { traceAdd, traceClear, traceLoad } from './cl-trace.js'; -import { startFaceUp } from '../../app/face-tool.js'; +import { startFaceUp } from '../../../app/face-tool.js'; import { showZBottom, showZTop, updateStock } from './cl-stock.js'; const { MODES } = api.const; diff --git a/src/kiri/mode/cam/cl-origin.js b/src/kiri/mode/cam/app/cl-origin.js similarity index 96% rename from src/kiri/mode/cam/cl-origin.js rename to src/kiri/mode/cam/app/cl-origin.js index ee6349f9..625bfef5 100644 --- a/src/kiri/mode/cam/cl-origin.js +++ b/src/kiri/mode/cam/app/cl-origin.js @@ -1,9 +1,9 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { env, clearPops } from './init-ui.js'; -import { CAM } from './driver-fe.js'; -import { addbox, clearboxes } from '../../app/boxes.js'; +import { CAM } from './driver.js'; +import { addbox, clearboxes } from '../../../app/boxes.js'; export let originSelectOn = false; diff --git a/src/kiri/mode/cam/cl-stock.js b/src/kiri/mode/cam/app/cl-stock.js similarity index 97% rename from src/kiri/mode/cam/cl-stock.js rename to src/kiri/mode/cam/app/cl-stock.js index 7f2aae0f..550fdfb4 100644 --- a/src/kiri/mode/cam/cl-stock.js +++ b/src/kiri/mode/cam/app/cl-stock.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { env, isDark } from './init-ui.js'; -import { space as SPACE } from '../../../moto/space.js'; +import { space as SPACE } from '../../../../moto/space.js'; const { ui: UI } = api; diff --git a/src/kiri/mode/cam/cl-surface.js b/src/kiri/mode/cam/app/cl-surface.js similarity index 96% rename from src/kiri/mode/cam/cl-surface.js rename to src/kiri/mode/cam/app/cl-surface.js index 4a56ef63..be831764 100644 --- a/src/kiri/mode/cam/cl-surface.js +++ b/src/kiri/mode/cam/app/cl-surface.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { env, clearPops } from './init-ui.js'; -import { CAM } from './driver-fe.js'; +import { CAM } from './driver.js'; const DEG2RAD = Math.PI / 180; const RAD2DEG = 180 / Math.PI; diff --git a/src/kiri/mode/cam/cl-tab.js b/src/kiri/mode/cam/app/cl-tab.js similarity index 96% rename from src/kiri/mode/cam/cl-tab.js rename to src/kiri/mode/cam/app/cl-tab.js index 6ee3c6df..3306436b 100644 --- a/src/kiri/mode/cam/cl-tab.js +++ b/src/kiri/mode/cam/app/cl-tab.js @@ -1,11 +1,11 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; -import { colorSchemeRegistry } from '../../app/color/schemes.js'; +import { api } from '../../../app/api.js'; +import { colorSchemeRegistry } from '../../../app/color/schemes.js'; import { env, isDark } from './init-ui.js'; -import { addbox, delbox, clearboxes } from '../../app/boxes.js'; +import { addbox, delbox, clearboxes } from '../../../app/boxes.js'; import { traceDone } from './cl-trace.js'; -import { space as SPACE } from '../../../moto/space.js'; +import { space as SPACE } from '../../../../moto/space.js'; let showTab, lastTab, tab, iw, ic; diff --git a/src/kiri/mode/cam/cl-trace.js b/src/kiri/mode/cam/app/cl-trace.js similarity index 96% rename from src/kiri/mode/cam/cl-trace.js rename to src/kiri/mode/cam/app/cl-trace.js index 31203c63..7327bb71 100644 --- a/src/kiri/mode/cam/cl-trace.js +++ b/src/kiri/mode/cam/app/cl-trace.js @@ -1,12 +1,12 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { env, clearPops, isDark } from './init-ui.js'; -import { parse } from '../../../load/svg.js'; -import { CAM } from './driver-fe.js'; -import { Layers } from '../../app/layers.js'; -import { Stack } from '../../app/stack.js'; -import { newPolygon } from '../../../geo/polygon.js'; +import { parse } from '../../../../load/svg.js'; +import { CAM } from './driver.js'; +import { Layers } from '../../../app/layers.js'; +import { Stack } from '../../../app/stack.js'; +import { newPolygon } from '../../../../geo/polygon.js'; export let traceOn = false; export let lastTrace; diff --git a/src/kiri/mode/cam/cl-zplane.js b/src/kiri/mode/cam/app/cl-zplane.js similarity index 95% rename from src/kiri/mode/cam/cl-zplane.js rename to src/kiri/mode/cam/app/cl-zplane.js index 8dda0811..890403f9 100644 --- a/src/kiri/mode/cam/cl-zplane.js +++ b/src/kiri/mode/cam/app/cl-zplane.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { clearPops, hoverStart } from './init-ui.js'; import { showZTop, showZBottom, updateStock } from './cl-stock.js'; diff --git a/src/kiri/mode/cam/driver-fe.js b/src/kiri/mode/cam/app/driver.js similarity index 97% rename from src/kiri/mode/cam/driver-fe.js rename to src/kiri/mode/cam/app/driver.js index c5fdf906..cbfc2177 100644 --- a/src/kiri/mode/cam/driver-fe.js +++ b/src/kiri/mode/cam/app/driver.js @@ -1,7 +1,7 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; -import { codec } from '../../core/codec.js'; +import { api } from '../../../app/api.js'; +import { codec } from '../../../core/codec.js'; function surface_prep(index, ondone) { api.client.sync(); diff --git a/src/kiri/mode/cam/init-menu.js b/src/kiri/mode/cam/app/init-menu.js similarity index 99% rename from src/kiri/mode/cam/init-menu.js rename to src/kiri/mode/cam/app/init-menu.js index 83316ba0..6f59d4bc 100644 --- a/src/kiri/mode/cam/init-menu.js +++ b/src/kiri/mode/cam/app/init-menu.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; import { originReset, originSelect } from './cl-origin.js'; import { updateTool } from './tools.js'; diff --git a/src/kiri/mode/cam/init-ui.js b/src/kiri/mode/cam/app/init-ui.js similarity index 98% rename from src/kiri/mode/cam/init-ui.js rename to src/kiri/mode/cam/app/init-ui.js index 6ee3e694..2f315981 100644 --- a/src/kiri/mode/cam/init-ui.js +++ b/src/kiri/mode/cam/app/init-ui.js @@ -1,24 +1,24 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { $ } from '../../../moto/webui.js'; -import { api } from '../../app/api.js'; -import { animate as anim_2d, animate_clear as anim_2d_clear } from './anim-2d-fe.js'; -import { animate2 as anim_3d, animate_clear2 as anim_3d_clear } from './anim-3d-fe.js'; +import { $ } from '../../../../moto/webui.js'; +import { api } from '../../../app/api.js'; +import { animate as anim_2d, animate_clear as anim_2d_clear } from './anim-2d.js'; +import { animate2 as anim_3d, animate_clear2 as anim_3d_clear } from './anim-3d.js'; import { createPopOps } from './cl-ops.js'; import { helicalOn, helicalDone } from './cl-helical.js'; import { holeSelOn, selectHolesDone, clearHolesRec } from './cl-hole.js'; -import { load } from '../../../load/file.js'; -import { Layers } from '../../app/layers.js'; +import { load } from '../../../../load/file.js'; +import { Layers } from '../../../app/layers.js'; import { originSelectDone } from './cl-origin.js'; import { recreateTabs } from './cl-tab.js'; import { showZTop, showZBottom, updateStock } from './cl-stock.js'; -import { space as SPACE } from '../../../moto/space.js'; -import { space } from '../../../moto/space.js'; -import { Stack } from '../../app/stack.js'; +import { space as SPACE } from '../../../../moto/space.js'; +import { space } from '../../../../moto/space.js'; +import { Stack } from '../../../app/stack.js'; import { surfaceOn, surfaceDone } from './cl-surface.js'; import { tabAdd, tabDone, tabClear, restoreTabs, rotateTabs, updateTabs, clearTabs, mirrorTabs } from './cl-tab.js'; import { traceOn, traceDone, unselectTraces } from './cl-trace.js'; -import { Widget, newWidget } from '../../app/widget.js'; +import { Widget, newWidget } from '../../../app/widget.js'; import { zPlaneStart, zPlaneDone, zPlaneSelecting } from './cl-zplane.js'; const { BufferGeometryUtils } = THREE; diff --git a/src/kiri/mode/cam/tools.js b/src/kiri/mode/cam/app/tools.js similarity index 97% rename from src/kiri/mode/cam/tools.js rename to src/kiri/mode/cam/app/tools.js index 8146973a..eec36c20 100644 --- a/src/kiri/mode/cam/tools.js +++ b/src/kiri/mode/cam/app/tools.js @@ -1,10 +1,10 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { $ } from '../../../moto/webui.js'; -import { api } from '../../app/api.js'; -import { consts } from '../../app/consts.js'; -import { settings as setconf } from '../../app/conf/manager.js'; -import { Tool, calcTaperAngle, calcTaperBallExtent, calcTaperLength } from './tool.js'; +import { $ } from '../../../../moto/webui.js'; +import { api } from '../../../app/api.js'; +import { consts } from '../../../app/consts.js'; +import { settings as setconf } from '../../../app/conf/manager.js'; +import { Tool, calcTaperAngle, calcTaperBallExtent, calcTaperLength } from '../core/tool.js'; const DEG2RAD = Math.PI / 180; diff --git a/src/kiri/mode/cam/op.js b/src/kiri/mode/cam/core/op.js similarity index 100% rename from src/kiri/mode/cam/op.js rename to src/kiri/mode/cam/core/op.js diff --git a/src/kiri/mode/cam/core/ops.js b/src/kiri/mode/cam/core/ops.js new file mode 100644 index 00000000..bfb6e1d4 --- /dev/null +++ b/src/kiri/mode/cam/core/ops.js @@ -0,0 +1,43 @@ +/** Copyright Stewart Allen -- All Rights Reserved */ + +import { CamOp } from './op.js'; +import { OpArea } from '../work/op-area.js'; +import { OpContour } from '../work/op-contour.js'; +import { OpDrill } from '../work/op-drill.js'; +import { OpGCode } from '../work/op-gcode.js'; +import { OpHelical } from '../work/op-helical.js'; +import { OpIndex } from '../work/op-index.js'; +import { OpLaserOff } from '../work/op-laser-off.js'; +import { OpLaserOn } from '../work/op-laser-on.js'; +import { OpLathe } from '../work/op-lathe.js'; +import { OpLevel } from '../work/op-level.js'; +import { OpLoop } from '../work/op-loop.js'; +import { OpOutline } from '../work/op-outline.js'; +import { OpPocket } from '../work/op-pocket.js'; +import { OpRegister } from '../work/op-register.js'; +import { OpRough } from '../work/op-rough.js'; +import { OpShadow } from '../work/op-shadow.js'; +import { OpTrace } from '../work/op-trace.js'; +import { OpXRay } from '../work/op-xray.js'; + +export const ops = { + "area": OpArea, + "contour": OpContour, + "drill": OpDrill, + "flip": CamOp, + "gcode": OpGCode, + "helical": OpHelical, + "index": OpIndex, + "laser off": OpLaserOff, + "laser on": OpLaserOn, + "lathe": OpLathe, + "level": OpLevel, + "loop": OpLoop, + "outline": OpOutline, + "pocket": OpPocket, + "register": OpRegister, + "rough": OpRough, + "shadow": OpShadow, + "trace": OpTrace, + "xray": OpXRay +}; diff --git a/src/kiri/mode/cam/tool.js b/src/kiri/mode/cam/core/tool.js similarity index 100% rename from src/kiri/mode/cam/tool.js rename to src/kiri/mode/cam/core/tool.js diff --git a/src/kiri/mode/cam/ops.js b/src/kiri/mode/cam/ops.js deleted file mode 100644 index 3685fd1e..00000000 --- a/src/kiri/mode/cam/ops.js +++ /dev/null @@ -1,43 +0,0 @@ -/** Copyright Stewart Allen -- All Rights Reserved */ - -import { CamOp } from './op.js'; -import { OpArea } from './op-area.js'; -import { OpContour } from './op-contour.js'; -import { OpDrill } from './op-drill.js'; -import { OpGCode } from './op-gcode.js'; -import { OpHelical } from './op-helical.js'; -import { OpIndex } from './op-index.js'; -import { OpLaserOff } from './op-laser-off.js'; -import { OpLaserOn } from './op-laser-on.js'; -import { OpLathe } from './op-lathe.js'; -import { OpLevel } from './op-level.js'; -import { OpLoop } from './op-loop.js'; -import { OpOutline } from './op-outline.js'; -import { OpPocket } from './op-pocket.js'; -import { OpRegister } from './op-register.js'; -import { OpRough } from './op-rough.js'; -import { OpShadow } from './op-shadow.js'; -import { OpTrace } from './op-trace.js'; -import { OpXRay } from './op-xray.js'; - -export const ops = { - "area": OpArea, - "contour": OpContour, - "drill": OpDrill, - "flip": CamOp, - "gcode": OpGCode, - "helical": OpHelical, - "index": OpIndex, - "laser off": OpLaserOff, - "laser on": OpLaserOn, - "lathe": OpLathe, - "level": OpLevel, - "loop": OpLoop, - "outline": OpOutline, - "pocket": OpPocket, - "register": OpRegister, - "rough": OpRough, - "shadow": OpShadow, - "trace": OpTrace, - "xray": OpXRay -}; diff --git a/src/kiri/mode/cam/anim-2d-be.js b/src/kiri/mode/cam/work/anim-2d.js similarity index 99% rename from src/kiri/mode/cam/anim-2d-be.js rename to src/kiri/mode/cam/work/anim-2d.js index 92c0f6e0..09255c97 100644 --- a/src/kiri/mode/cam/anim-2d-be.js +++ b/src/kiri/mode/cam/work/anim-2d.js @@ -2,7 +2,7 @@ // WORKER BACK END ANIMATION CODE for 2D -import { Tool } from './tool.js'; +import { Tool } from '../core/tool.js'; const asPoints = false; const asLines = false; diff --git a/src/kiri/mode/cam/anim-3d-be.js b/src/kiri/mode/cam/work/anim-3d.js similarity index 99% rename from src/kiri/mode/cam/anim-3d-be.js rename to src/kiri/mode/cam/work/anim-3d.js index b8c23ff7..1c8a6a03 100644 --- a/src/kiri/mode/cam/anim-3d-be.js +++ b/src/kiri/mode/cam/work/anim-3d.js @@ -2,8 +2,8 @@ // WORKER BACK END ANIMATION CODE for 3D (indexed) -import { CSG } from '../../../geo/csg.js'; -import { Tool } from './tool.js'; +import { CSG } from '../../../../geo/csg.js'; +import { Tool } from '../core/tool.js'; let nextMeshID = 1, stock, diff --git a/src/kiri/mode/cam/export.js b/src/kiri/mode/cam/work/export.js similarity index 99% rename from src/kiri/mode/cam/export.js rename to src/kiri/mode/cam/work/export.js index b9206f9b..f8bd0b2a 100644 --- a/src/kiri/mode/cam/export.js +++ b/src/kiri/mode/cam/work/export.js @@ -1,7 +1,7 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { base } from '../../../geo/base.js'; -import { version } from '../../../moto/license.js'; +import { base } from '../../../../geo/base.js'; +import { version } from '../../../../moto/license.js'; const { util } = base; diff --git a/src/kiri/mode/cam/driver-be.js b/src/kiri/mode/cam/work/init-work.js similarity index 94% rename from src/kiri/mode/cam/driver-be.js rename to src/kiri/mode/cam/work/init-work.js index 7f850aef..c57b1971 100644 --- a/src/kiri/mode/cam/driver-be.js +++ b/src/kiri/mode/cam/work/init-work.js @@ -1,14 +1,14 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { codec } from '../../core/codec.js'; +import { codec } from '../../../core/codec.js'; import { cam_slice_pre, cam_slice, holes, traces } from './slice.js'; import { cam_prepare } from './prepare.js'; import { cam_export } from './export.js'; -import { tool as mesh_tool } from '../../../mesh/tool.js'; +import { tool as mesh_tool } from '../../../../mesh/tool.js'; import { cylinder_poly_find } from './slice.js'; -import { init as init_2d } from './anim-2d-be.js'; -import { init as init_3d } from './anim-3d-be.js'; +import { init as init_2d } from './anim-2d.js'; +import { init as init_3d } from './anim-3d.js'; function surface_prep(widget, index) { if (!widget.tool) { diff --git a/src/kiri/mode/cam/op-area.js b/src/kiri/mode/cam/work/op-area.js similarity index 98% rename from src/kiri/mode/cam/op-area.js rename to src/kiri/mode/cam/work/op-area.js index 2e498e83..03a4a9fe 100644 --- a/src/kiri/mode/cam/op-area.js +++ b/src/kiri/mode/cam/work/op-area.js @@ -3,15 +3,15 @@ // todo: surface offset pattern // todo: trace dogbones, merge overlap -import { CamOp } from './op.js'; -import { Tool } from './tool.js'; -import { newSlice } from '../../core/slice.js'; -import { newPoint } from '../../../geo/point.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { util as base_util } from '../../../geo/base.js'; -import { tip2tipJoin } from '../../../geo/paths.js'; -import { CAM } from './driver-be.js'; +import { CamOp } from '../core/op.js'; +import { Tool } from '../core/tool.js'; +import { newSlice } from '../../../core/slice.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { util as base_util } from '../../../../geo/base.js'; +import { tip2tipJoin } from '../../../../geo/paths.js'; +import { CAM } from './init-work.js'; const DEG2RAD = Math.PI / 180; const clib = self.ClipperLib; diff --git a/src/kiri/mode/cam/op-contour.js b/src/kiri/mode/cam/work/op-contour.js similarity index 95% rename from src/kiri/mode/cam/op-contour.js rename to src/kiri/mode/cam/work/op-contour.js index c3d95682..e51ce6bd 100644 --- a/src/kiri/mode/cam/op-contour.js +++ b/src/kiri/mode/cam/work/op-contour.js @@ -1,12 +1,12 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; -import { Tool } from './tool.js'; +import { CamOp } from '../core/op.js'; +import { Tool } from '../core/tool.js'; import { generate as Topo } from './topo3.js'; -import { newPoint } from '../../../geo/point.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { newSlice } from '../../core/slice.js'; -import { tip2tipEmit } from '../../../geo/paths.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { newSlice } from '../../../core/slice.js'; +import { tip2tipEmit } from '../../../../geo/paths.js'; function createFilter(op, origin, axis) { // console.log({ origin, axis }); diff --git a/src/kiri/mode/cam/op-drill.js b/src/kiri/mode/cam/work/op-drill.js similarity index 89% rename from src/kiri/mode/cam/op-drill.js rename to src/kiri/mode/cam/work/op-drill.js index 319d9ebb..3189e6d5 100644 --- a/src/kiri/mode/cam/op-drill.js +++ b/src/kiri/mode/cam/work/op-drill.js @@ -1,10 +1,10 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; -import { Tool } from './tool.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { newSlice } from '../../core/slice.js'; -import { newPoint } from '../../../geo/point.js'; +import { CamOp } from '../core/op.js'; +import { Tool } from '../core/tool.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { newSlice } from '../../../core/slice.js'; +import { newPoint } from '../../../../geo/point.js'; class OpDrill extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-gcode.js b/src/kiri/mode/cam/work/op-gcode.js similarity index 86% rename from src/kiri/mode/cam/op-gcode.js rename to src/kiri/mode/cam/work/op-gcode.js index a3ed9bfb..3881718a 100644 --- a/src/kiri/mode/cam/op-gcode.js +++ b/src/kiri/mode/cam/work/op-gcode.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; export class OpGCode extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-helical.js b/src/kiri/mode/cam/work/op-helical.js similarity index 97% rename from src/kiri/mode/cam/op-helical.js rename to src/kiri/mode/cam/work/op-helical.js index 3458c45b..299ae493 100644 --- a/src/kiri/mode/cam/op-helical.js +++ b/src/kiri/mode/cam/work/op-helical.js @@ -1,10 +1,10 @@ -import { arcToPath } from "../../../geo/paths.js"; -import { newPolygon } from "../../../geo/polygon.js"; -import { CamOp } from "./op.js"; -import { Tool } from "./tool.js"; +import { arcToPath } from "../../../../geo/paths.js"; +import { newPolygon } from "../../../../geo/polygon.js"; +import { CamOp } from "../core/op.js"; +import { Tool } from "../core/tool.js"; import { cylinder_poly_find } from "./slice.js"; -import { newPoint } from "../../../geo/point.js"; -import { newSlice } from "../../core/slice.js"; +import { newPoint } from "../../../../geo/point.js"; +import { newSlice } from "../../../core/slice.js"; export class OpHelical extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-index.js b/src/kiri/mode/cam/work/op-index.js similarity index 97% rename from src/kiri/mode/cam/op-index.js rename to src/kiri/mode/cam/work/op-index.js index a56555b8..e8a285ae 100644 --- a/src/kiri/mode/cam/op-index.js +++ b/src/kiri/mode/cam/work/op-index.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; export class OpIndex extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-laser-off.js b/src/kiri/mode/cam/work/op-laser-off.js similarity index 91% rename from src/kiri/mode/cam/op-laser-off.js rename to src/kiri/mode/cam/work/op-laser-off.js index a474e933..fcdb8118 100644 --- a/src/kiri/mode/cam/op-laser-off.js +++ b/src/kiri/mode/cam/work/op-laser-off.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; export class OpLaserOff extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-laser-on.js b/src/kiri/mode/cam/work/op-laser-on.js similarity index 91% rename from src/kiri/mode/cam/op-laser-on.js rename to src/kiri/mode/cam/work/op-laser-on.js index 076009c9..f67a47ae 100644 --- a/src/kiri/mode/cam/op-laser-on.js +++ b/src/kiri/mode/cam/work/op-laser-on.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; export class OpLaserOn extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-lathe.js b/src/kiri/mode/cam/work/op-lathe.js similarity index 96% rename from src/kiri/mode/cam/op-lathe.js rename to src/kiri/mode/cam/work/op-lathe.js index fcc69e63..15c751d5 100644 --- a/src/kiri/mode/cam/op-lathe.js +++ b/src/kiri/mode/cam/work/op-lathe.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; import { generate as topo4_generate } from './topo4.js'; -import { newPoint } from '../../../geo/point.js'; +import { newPoint } from '../../../../geo/point.js'; function createFilter(op) { let ok = () => true; diff --git a/src/kiri/mode/cam/op-level.js b/src/kiri/mode/cam/work/op-level.js similarity index 90% rename from src/kiri/mode/cam/op-level.js rename to src/kiri/mode/cam/work/op-level.js index 2ef30a70..2f90b81e 100644 --- a/src/kiri/mode/cam/op-level.js +++ b/src/kiri/mode/cam/work/op-level.js @@ -1,11 +1,11 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; -import { Tool } from './tool.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { newSlice } from '../../core/slice.js'; -import { util } from '../../../geo/base.js'; +import { CamOp } from '../core/op.js'; +import { Tool } from '../core/tool.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { newSlice } from '../../../core/slice.js'; +import { util } from '../../../../geo/base.js'; class OpLevel extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-loop.js b/src/kiri/mode/cam/work/op-loop.js similarity index 89% rename from src/kiri/mode/cam/op-loop.js rename to src/kiri/mode/cam/work/op-loop.js index 06e16fe9..def7bc73 100644 --- a/src/kiri/mode/cam/op-loop.js +++ b/src/kiri/mode/cam/work/op-loop.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; export class OpLoop extends CamOp { weight() { diff --git a/src/kiri/mode/cam/op-outline.js b/src/kiri/mode/cam/work/op-outline.js similarity index 98% rename from src/kiri/mode/cam/op-outline.js rename to src/kiri/mode/cam/work/op-outline.js index 19c17fb2..198eab31 100644 --- a/src/kiri/mode/cam/op-outline.js +++ b/src/kiri/mode/cam/work/op-outline.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; import { OpArea } from './op-area.js'; class OpOutline extends CamOp { diff --git a/src/kiri/mode/cam/op-pocket.js b/src/kiri/mode/cam/work/op-pocket.js similarity index 96% rename from src/kiri/mode/cam/op-pocket.js rename to src/kiri/mode/cam/work/op-pocket.js index 6bc35a2e..f225ea72 100644 --- a/src/kiri/mode/cam/op-pocket.js +++ b/src/kiri/mode/cam/work/op-pocket.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; import { OpArea } from './op-area.js'; class OpPocket extends CamOp { diff --git a/src/kiri/mode/cam/op-register.js b/src/kiri/mode/cam/work/op-register.js similarity index 95% rename from src/kiri/mode/cam/op-register.js rename to src/kiri/mode/cam/work/op-register.js index d9c5d85c..69f7199d 100644 --- a/src/kiri/mode/cam/op-register.js +++ b/src/kiri/mode/cam/work/op-register.js @@ -1,11 +1,11 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; -import { Tool } from './tool.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { newSlice } from '../../core/slice.js'; -import { newPoint } from '../../../geo/point.js'; -import { util } from '../../../geo/base.js'; +import { CamOp } from '../core/op.js'; +import { Tool } from '../core/tool.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { newSlice } from '../../../core/slice.js'; +import { newPoint } from '../../../../geo/point.js'; +import { util } from '../../../../geo/base.js'; class OpRegister extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-rough.js b/src/kiri/mode/cam/work/op-rough.js similarity index 96% rename from src/kiri/mode/cam/op-rough.js rename to src/kiri/mode/cam/work/op-rough.js index 153a206c..fbe50235 100644 --- a/src/kiri/mode/cam/op-rough.js +++ b/src/kiri/mode/cam/work/op-rough.js @@ -1,9 +1,9 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; import { OpArea } from './op-area.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; class OpRough extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/op-shadow.js b/src/kiri/mode/cam/work/op-shadow.js similarity index 95% rename from src/kiri/mode/cam/op-shadow.js rename to src/kiri/mode/cam/work/op-shadow.js index a72b72d6..c33cbb8f 100644 --- a/src/kiri/mode/cam/op-shadow.js +++ b/src/kiri/mode/cam/work/op-shadow.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; -import { newSlice } from '../../core/slice.js'; -import { newPolygon } from '../../../geo/polygon.js'; +import { CamOp } from '../core/op.js'; +import { newSlice } from '../../../core/slice.js'; +import { newPolygon } from '../../../../geo/polygon.js'; /** * Computes the Part "shadow" and attaches relevant data to the "state" object diff --git a/src/kiri/mode/cam/op-trace.js b/src/kiri/mode/cam/work/op-trace.js similarity index 97% rename from src/kiri/mode/cam/op-trace.js rename to src/kiri/mode/cam/work/op-trace.js index e315bd44..25ae2065 100644 --- a/src/kiri/mode/cam/op-trace.js +++ b/src/kiri/mode/cam/work/op-trace.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; +import { CamOp } from '../core/op.js'; import { OpArea } from './op-area.js'; class OpTrace extends CamOp { diff --git a/src/kiri/mode/cam/op-xray.js b/src/kiri/mode/cam/work/op-xray.js similarity index 87% rename from src/kiri/mode/cam/op-xray.js rename to src/kiri/mode/cam/work/op-xray.js index 12245c6c..b32ffe0f 100644 --- a/src/kiri/mode/cam/op-xray.js +++ b/src/kiri/mode/cam/work/op-xray.js @@ -1,8 +1,8 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CamOp } from './op.js'; -import { newSlice } from '../../core/slice.js'; -import { Slicer } from './slicer_cam.js'; +import { CamOp } from '../core/op.js'; +import { newSlice } from '../../../core/slice.js'; +import { Slicer } from './slicer-cam.js'; class OpXRay extends CamOp { constructor(state, op) { diff --git a/src/kiri/mode/cam/prepare.js b/src/kiri/mode/cam/work/prepare.js similarity index 98% rename from src/kiri/mode/cam/prepare.js rename to src/kiri/mode/cam/work/prepare.js index a1d645c7..04610e6b 100644 --- a/src/kiri/mode/cam/prepare.js +++ b/src/kiri/mode/cam/work/prepare.js @@ -1,12 +1,12 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { tip2tipEmit, poly2polyEmit } from '../../../geo/paths.js'; -import { newPoint } from '../../../geo/point.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { render } from '../../core/render.js'; -import { newPrint } from '../../core/print.js'; -import { Tool } from './tool.js'; -import { newPolygon } from '../../../geo/polygon.js'; +import { tip2tipEmit, poly2polyEmit } from '../../../../geo/paths.js'; +import { newPoint } from '../../../../geo/point.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { render } from '../../../core/render.js'; +import { newPrint } from '../../../core/print.js'; +import { Tool } from '../core/tool.js'; +import { newPolygon } from '../../../../geo/polygon.js'; const debug = false; const debug_push = false; diff --git a/src/kiri/mode/cam/slice.js b/src/kiri/mode/cam/work/slice.js similarity index 98% rename from src/kiri/mode/cam/slice.js rename to src/kiri/mode/cam/work/slice.js index 5cd48143..c9735b9d 100644 --- a/src/kiri/mode/cam/slice.js +++ b/src/kiri/mode/cam/work/slice.js @@ -1,15 +1,15 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { CAM } from './driver-be.js'; -import { newLine } from '../../../geo/line.js'; -import { newPoint } from '../../../geo/point.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { ops as OPS } from './ops.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { setSliceTracker } from '../../core/slice.js'; -import { Slicer as cam_slicer } from './slicer_cam.js'; -import { Tool } from './tool.js'; -import { util } from '../../../geo/base.js'; +import { CAM } from './init-work.js'; +import { newLine } from '../../../../geo/line.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { ops as OPS } from '../core/ops.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { setSliceTracker } from '../../../core/slice.js'; +import { Slicer as cam_slicer } from './slicer-cam.js'; +import { Tool } from '../core/tool.js'; +import { util } from '../../../../geo/base.js'; // state shared across all widget slicing let shared; diff --git a/src/kiri/mode/cam/slicer_cam.js b/src/kiri/mode/cam/work/slicer-cam.js similarity index 97% rename from src/kiri/mode/cam/slicer_cam.js rename to src/kiri/mode/cam/work/slicer-cam.js index 862914fb..3f68d5c2 100644 --- a/src/kiri/mode/cam/slicer_cam.js +++ b/src/kiri/mode/cam/work/slicer-cam.js @@ -1,18 +1,18 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { util } from '../../../geo/base.js'; -import { decode, decodePointArray } from '../../core/codec.js'; -import { newLine } from '../../../geo/line.js'; -import { newPoint } from '../../../geo/point.js'; -import { newSlice } from '../../core/slice.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; +import { util } from '../../../../geo/base.js'; +import { decode, decodePointArray } from '../../../core/codec.js'; +import { newLine } from '../../../../geo/line.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newSlice } from '../../../core/slice.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; import { checkOverUnderOn, intersectPoints, makeZLine, removeDuplicateLines, sliceConnect, -} from '../../../geo/slicer.js'; +} from '../../../../geo/slicer.js'; const timing = false; const zDecimal = 3; diff --git a/src/kiri/mode/cam/slicer_topo.js b/src/kiri/mode/cam/work/slicer-topo.js similarity index 98% rename from src/kiri/mode/cam/slicer_topo.js rename to src/kiri/mode/cam/work/slicer-topo.js index 7aeeec3b..3c80e4b3 100644 --- a/src/kiri/mode/cam/slicer_topo.js +++ b/src/kiri/mode/cam/work/slicer-topo.js @@ -1,12 +1,12 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { newPoint } from '../../../geo/point.js'; +import { newPoint } from '../../../../geo/point.js'; import { checkOverUnderOn, makeZLine, removeDuplicateLines, intersectPoints -} from '../../../geo/slicer.js'; +} from '../../../../geo/slicer.js'; /** Slicer used in Topo3 and Topo4 to find contour lines */ export class Slicer { diff --git a/src/kiri/mode/cam/topo3.js b/src/kiri/mode/cam/work/topo3.js similarity index 98% rename from src/kiri/mode/cam/topo3.js rename to src/kiri/mode/cam/work/topo3.js index e5a7dbd7..495c827c 100644 --- a/src/kiri/mode/cam/topo3.js +++ b/src/kiri/mode/cam/work/topo3.js @@ -1,12 +1,12 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { codec } from '../../core/codec.js'; -import { newPoint } from '../../../geo/point.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { newSlice } from '../../core/slice.js'; -import { Slicer as topo_slicer } from './slicer_topo.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { Tool } from './tool.js'; +import { codec } from '../../../core/codec.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { newSlice } from '../../../core/slice.js'; +import { Slicer as topo_slicer } from './slicer-topo.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { Tool } from '../core/tool.js'; const RAD2DEG = 180 / Math.PI; const DEG2RAD = Math.PI / 180; diff --git a/src/kiri/mode/cam/topo4.js b/src/kiri/mode/cam/work/topo4.js similarity index 98% rename from src/kiri/mode/cam/topo4.js rename to src/kiri/mode/cam/work/topo4.js index f78ec3ec..c73d027c 100644 --- a/src/kiri/mode/cam/topo4.js +++ b/src/kiri/mode/cam/work/topo4.js @@ -1,12 +1,12 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { codec } from '../../core/codec.js'; -import { newPoint } from '../../../geo/point.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { sliceConnect } from '../../../geo/slicer.js'; -import { newSlice } from '../../core/slice.js'; -import { Tool } from './tool.js'; -import { Slicer as topo_slicer } from './slicer_topo.js'; +import { codec } from '../../../core/codec.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { sliceConnect } from '../../../../geo/slicer.js'; +import { newSlice } from '../../../core/slice.js'; +import { Tool } from '../core/tool.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/mode/drag/driver.js b/src/kiri/mode/drag/init-work.js similarity index 99% rename from src/kiri/mode/drag/driver.js rename to src/kiri/mode/drag/init-work.js index 109fb769..801318d9 100644 --- a/src/kiri/mode/drag/driver.js +++ b/src/kiri/mode/drag/init-work.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { LASER, TYPE, FUNC } from '../laser/driver.js'; +import { LASER, TYPE, FUNC } from '../laser/init-work.js'; import { newPoint } from '../../../geo/point.js'; import { newPolygon } from '../../../geo/polygon.js'; import { newSlopeFromAngle } from '../../../geo/slope.js'; diff --git a/src/kiri/mode/fdm/init-menu.js b/src/kiri/mode/fdm/app/init-menu.js similarity index 99% rename from src/kiri/mode/fdm/init-menu.js rename to src/kiri/mode/fdm/app/init-menu.js index 8131a6da..799ace08 100644 --- a/src/kiri/mode/fdm/init-menu.js +++ b/src/kiri/mode/fdm/app/init-menu.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; let LANG = api.language.current; let { FDM } = api.const.MODES, diff --git a/src/kiri/mode/fdm/init-ui.js b/src/kiri/mode/fdm/app/init-ui.js similarity index 97% rename from src/kiri/mode/fdm/init-ui.js rename to src/kiri/mode/fdm/app/init-ui.js index b7255bd9..ab590713 100644 --- a/src/kiri/mode/fdm/init-ui.js +++ b/src/kiri/mode/fdm/app/init-ui.js @@ -1,11 +1,11 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { newPoint } from '../../../geo/point.js'; -import { $ } from '../../../moto/webui.js'; -import { api } from '../../app/api.js'; -import { colorSchemeRegistry } from '../../app/color/schemes.js'; -import { conf } from '../../app/conf/defaults.js'; -import { addPaintOverlayTexture, updatePaintOverlay } from '../../app/paint.js'; +import { newPoint } from '../../../../geo/point.js'; +import { $ } from '../../../../moto/webui.js'; +import { api } from '../../../app/api.js'; +import { colorSchemeRegistry } from '../../../app/color/schemes.js'; +import { conf } from '../../../app/conf/defaults.js'; +import { addPaintOverlayTexture, updatePaintOverlay } from '../../../app/paint.js'; const { VIEWS } = api.const; diff --git a/src/kiri/mode/fdm/driver.js b/src/kiri/mode/fdm/core/params.js similarity index 100% rename from src/kiri/mode/fdm/driver.js rename to src/kiri/mode/fdm/core/params.js diff --git a/src/kiri/mode/fdm/belt.js b/src/kiri/mode/fdm/work/belt.js similarity index 98% rename from src/kiri/mode/fdm/belt.js rename to src/kiri/mode/fdm/work/belt.js index 922f49d7..0d3bbef6 100644 --- a/src/kiri/mode/fdm/belt.js +++ b/src/kiri/mode/fdm/work/belt.js @@ -5,10 +5,10 @@ * Handles anchor generation, text embossing, and belt-specific bounds */ -import { newPolygon } from '../../../geo/polygon.js'; -import { newBounds } from '../../../geo/bounds.js'; -import { newSlice } from '../../core/slice.js'; -import { getRangeParameters } from './driver.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { newBounds } from '../../../../geo/bounds.js'; +import { newSlice } from '../../../core/slice.js'; +import { getRangeParameters } from '../core/params.js'; // Import constants from slice.js // These would ideally be shared, but for now we'll define locally diff --git a/src/kiri/mode/fdm/export.js b/src/kiri/mode/fdm/work/export.js similarity index 99% rename from src/kiri/mode/fdm/export.js rename to src/kiri/mode/fdm/work/export.js index 0ebd97ff..07ac27b2 100644 --- a/src/kiri/mode/fdm/export.js +++ b/src/kiri/mode/fdm/work/export.js @@ -1,9 +1,9 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { base, util } from '../../../geo/base.js'; -import { getRangeParameters } from './driver.js'; -import { FDM } from './driver-be.js'; -import { version } from '../../../moto/license.js'; +import { base, util } from '../../../../geo/base.js'; +import { getRangeParameters } from '../core/params.js'; +import { FDM } from './init-work.js'; +import { version } from '../../../../moto/license.js'; const { config } = base; const debug = false; diff --git a/src/kiri/mode/fdm/fill.js b/src/kiri/mode/fdm/work/fill.js similarity index 98% rename from src/kiri/mode/fdm/fill.js rename to src/kiri/mode/fdm/work/fill.js index 830dec06..d7545b87 100644 --- a/src/kiri/mode/fdm/fill.js +++ b/src/kiri/mode/fdm/work/fill.js @@ -1,7 +1,7 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { newPolygon } from '../../../geo/polygon.js'; -import { slice as gyroid_slice } from '../../../geo/gyroid.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { slice as gyroid_slice } from '../../../../geo/gyroid.js'; export const fill_fixed = { hex: fillHexFull, diff --git a/src/kiri/mode/fdm/driver-be.js b/src/kiri/mode/fdm/work/init-work.js similarity index 93% rename from src/kiri/mode/fdm/driver-be.js rename to src/kiri/mode/fdm/work/init-work.js index 72df30ac..a3d699f7 100644 --- a/src/kiri/mode/fdm/driver-be.js +++ b/src/kiri/mode/fdm/work/init-work.js @@ -1,10 +1,10 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { util } from '../../../geo/base.js'; +import { util } from '../../../../geo/base.js'; import { sliceOne, slicePost } from './slice.js'; import { fdm_prepare } from './prepare.js'; import { fdm_export } from './export.js'; -import { codec } from '../../core/codec.js'; +import { codec } from '../../../core/codec.js'; // noz = nozzle diameter // fil = filament diameter diff --git a/src/kiri/mode/fdm/post.js b/src/kiri/mode/fdm/work/post.js similarity index 98% rename from src/kiri/mode/fdm/post.js rename to src/kiri/mode/fdm/work/post.js index 07811c40..4cdd6110 100644 --- a/src/kiri/mode/fdm/post.js +++ b/src/kiri/mode/fdm/work/post.js @@ -1,13 +1,13 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import '../../../ext/jspoly.js'; -import { base } from '../../../geo/base.js'; -import { newPolygon, Polygon } from '../../../geo/polygon.js'; -import { polygons as POLY, fillArea } from '../../../geo/polygons.js'; -import { getRangeParameters } from './driver.js'; -import { slicer } from '../../../geo/slicer.js'; -import { Point } from '../../../geo/point.js'; -import { Slope } from '../../../geo/slope.js'; +import '../../../../ext/jspoly.js'; +import { base } from '../../../../geo/base.js'; +import { newPolygon, Polygon } from '../../../../geo/polygon.js'; +import { polygons as POLY, fillArea } from '../../../../geo/polygons.js'; +import { getRangeParameters } from '../core/params.js'; +import { slicer } from '../../../../geo/slicer.js'; +import { Point } from '../../../../geo/point.js'; +import { Slope } from '../../../../geo/slope.js'; // tell the slicer what to do in FDM mode // with slices (post processing). the post diff --git a/src/kiri/mode/fdm/prepare.js b/src/kiri/mode/fdm/work/prepare.js similarity index 99% rename from src/kiri/mode/fdm/prepare.js rename to src/kiri/mode/fdm/work/prepare.js index 5bdb7f66..9058f3ab 100644 --- a/src/kiri/mode/fdm/prepare.js +++ b/src/kiri/mode/fdm/work/prepare.js @@ -1,16 +1,16 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { FDM } from './driver-be.js'; -import { base, util } from '../../../geo/base.js'; -import { poly2polyEmit, tip2tipEmit } from '../../../geo/paths.js'; -import { newBounds } from '../../../geo/bounds.js'; -import { newPoint, Point } from '../../../geo/point.js'; -import { newPolygon, Polygon } from '../../../geo/polygon.js'; -import { polygons as POLY, fillArea } from '../../../geo/polygons.js'; -import { newPrint } from '../../core/print.js'; -import { newSlice } from '../../core/slice.js'; -import { render } from '../../core/render.js'; -import { getRangeParameters } from './driver.js'; +import { FDM } from './init-work.js'; +import { base, util } from '../../../../geo/base.js'; +import { poly2polyEmit, tip2tipEmit } from '../../../../geo/paths.js'; +import { newBounds } from '../../../../geo/bounds.js'; +import { newPoint, Point } from '../../../../geo/point.js'; +import { newPolygon, Polygon } from '../../../../geo/polygon.js'; +import { polygons as POLY, fillArea } from '../../../../geo/polygons.js'; +import { newPrint } from '../../../core/print.js'; +import { newSlice } from '../../../core/slice.js'; +import { render } from '../../../core/render.js'; +import { getRangeParameters } from '../core/params.js'; const { numOrDefault } = util; diff --git a/src/kiri/mode/fdm/slice.js b/src/kiri/mode/fdm/work/slice.js similarity index 99% rename from src/kiri/mode/fdm/slice.js rename to src/kiri/mode/fdm/work/slice.js index 714a5e93..47f6a4f5 100644 --- a/src/kiri/mode/fdm/slice.js +++ b/src/kiri/mode/fdm/work/slice.js @@ -3,13 +3,13 @@ import { layerProcessTop } from './post.js'; import { fill, fill_fixed } from './fill.js'; import { generateBeltAnchor, embossBeltPooch, finalizeBeltBounds } from './belt.js'; -import { getRangeParameters } from './driver.js'; -import { newPoint } from '../../../geo/point.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { newSlice } from '../../core/slice.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { slice, sliceZ } from '../../../geo/slicer.js'; -import { util } from '../../../geo/base.js'; +import { getRangeParameters } from '../core/params.js'; +import { newPoint } from '../../../../geo/point.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { newSlice } from '../../../core/slice.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { slice, sliceZ } from '../../../../geo/slicer.js'; +import { util } from '../../../../geo/base.js'; const CONSTANTS = { // Support fill diff --git a/src/kiri/mode/laser/driver.js b/src/kiri/mode/laser/init-work.js similarity index 100% rename from src/kiri/mode/laser/driver.js rename to src/kiri/mode/laser/init-work.js diff --git a/src/kiri/mode/sla/init-menu.js b/src/kiri/mode/sla/app/init-menu.js similarity index 98% rename from src/kiri/mode/sla/init-menu.js rename to src/kiri/mode/sla/app/init-menu.js index d1a01f45..6e3e1bb3 100644 --- a/src/kiri/mode/sla/init-menu.js +++ b/src/kiri/mode/sla/app/init-menu.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { api } from '../../app/api.js'; +import { api } from '../../../app/api.js'; let LANG = api.language.current; let { SLA } = api.const.MODES, diff --git a/src/kiri/mode/sla/init-ui.js b/src/kiri/mode/sla/app/init-ui.js similarity index 96% rename from src/kiri/mode/sla/init-ui.js rename to src/kiri/mode/sla/app/init-ui.js index 1e5104ad..48a20bbd 100644 --- a/src/kiri/mode/sla/init-ui.js +++ b/src/kiri/mode/sla/app/init-ui.js @@ -1,7 +1,7 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { $ } from '../../../moto/webui.js'; -import { api } from '../../app/api.js'; +import { $ } from '../../../../moto/webui.js'; +import { api } from '../../../app/api.js'; export const SLA = { init, diff --git a/src/kiri/mode/sla/export.js b/src/kiri/mode/sla/work/export.js similarity index 99% rename from src/kiri/mode/sla/export.js rename to src/kiri/mode/sla/work/export.js index 82867ea4..d296aea7 100644 --- a/src/kiri/mode/sla/export.js +++ b/src/kiri/mode/sla/work/export.js @@ -2,7 +2,7 @@ import { CXDLP } from './x_cxdlp.js'; import { photon } from './x_photon.js'; -import { SLA } from './driver.js'; +import { SLA } from './init-work.js'; /** * DRIVER CONTRACT - runs in worker diff --git a/src/kiri/mode/sla/driver.js b/src/kiri/mode/sla/work/init-work.js similarity index 96% rename from src/kiri/mode/sla/driver.js rename to src/kiri/mode/sla/work/init-work.js index 1a160945..6994cc22 100644 --- a/src/kiri/mode/sla/driver.js +++ b/src/kiri/mode/sla/work/init-work.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { newPrint } from '../../core/print.js'; +import { newPrint } from '../../../core/print.js'; import { sla_slice } from './slice.js'; import { sla_export } from './export.js'; diff --git a/src/kiri/mode/sla/slice.js b/src/kiri/mode/sla/work/slice.js similarity index 98% rename from src/kiri/mode/sla/slice.js rename to src/kiri/mode/sla/work/slice.js index f51caad5..2ec33eca 100644 --- a/src/kiri/mode/sla/slice.js +++ b/src/kiri/mode/sla/work/slice.js @@ -1,13 +1,13 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { util } from '../../../geo/base.js'; -import { slicer } from '../../../geo/slicer.js'; -import { newPolygon } from '../../../geo/polygon.js'; -import { polygons as POLY } from '../../../geo/polygons.js'; -import { newSlice, newTop } from '../../core/slice.js'; -import { layerProcessTops, layerDiff, projectFlats, projectBridges } from '../fdm/slice.js'; -import { PNG } from '../../../ext/pngjs.esm.js'; -import { SLA } from './driver.js'; +import { util } from '../../../../geo/base.js'; +import { slicer } from '../../../../geo/slicer.js'; +import { newPolygon } from '../../../../geo/polygon.js'; +import { polygons as POLY } from '../../../../geo/polygons.js'; +import { newSlice, newTop } from '../../../core/slice.js'; +import { layerProcessTops, layerDiff, projectFlats, projectBridges } from '../../fdm/work/slice.js'; +import { PNG } from '../../../../ext/pngjs.esm.js'; +import { SLA } from './init-work.js'; const tracker = util.pwait; diff --git a/src/kiri/mode/sla/x_cxdlp.js b/src/kiri/mode/sla/work/x_cxdlp.js similarity index 100% rename from src/kiri/mode/sla/x_cxdlp.js rename to src/kiri/mode/sla/work/x_cxdlp.js diff --git a/src/kiri/mode/sla/x_photon.js b/src/kiri/mode/sla/work/x_photon.js similarity index 99% rename from src/kiri/mode/sla/x_photon.js rename to src/kiri/mode/sla/work/x_photon.js index 968bfa5c..67af34ea 100644 --- a/src/kiri/mode/sla/x_photon.js +++ b/src/kiri/mode/sla/work/x_photon.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { SLA } from './driver.js'; +import { SLA } from './init-work.js'; function generatePhoton(print, conf, progress) { let printset = print.settings, diff --git a/src/kiri/mode/wedm/driver.js b/src/kiri/mode/wedm/init-work.js similarity index 89% rename from src/kiri/mode/wedm/driver.js rename to src/kiri/mode/wedm/init-work.js index 3342abfd..18905591 100644 --- a/src/kiri/mode/wedm/driver.js +++ b/src/kiri/mode/wedm/init-work.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { LASER, TYPE } from '../laser/driver.js'; +import { LASER, TYPE } from '../laser/init-work.js'; const DEG2RAD = Math.PI / 180; diff --git a/src/kiri/mode/wjet/driver.js b/src/kiri/mode/wjet/init-work.js similarity index 82% rename from src/kiri/mode/wjet/driver.js rename to src/kiri/mode/wjet/init-work.js index b11c54fd..0c8ac31c 100644 --- a/src/kiri/mode/wjet/driver.js +++ b/src/kiri/mode/wjet/init-work.js @@ -1,6 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ -import { LASER, TYPE } from '../laser/driver.js'; +import { LASER, TYPE } from '../laser/init-work.js'; function init(worker) { // console.log({ WATERJET_INIT: worker }); diff --git a/src/kiri/run/minion.js b/src/kiri/run/minion.js index c125f38d..ab6edb7f 100644 --- a/src/kiri/run/minion.js +++ b/src/kiri/run/minion.js @@ -8,15 +8,15 @@ import '../../add/three.js'; import { base } from '../../geo/base.js'; import { codec, encode, encodePointArray } from '../core/codec.js'; -import { layerProcessTop } from '../mode/fdm/post.js'; +import { layerProcessTop } from '../mode/fdm/work/post.js'; import { newPoint } from '../../geo/point.js'; import { newWidget } from '../core/widget.js'; import { polygons as POLY } from '../../geo/polygons.js'; import { sliceZ, sliceConnect } from '../../geo/slicer.js'; -import { Slicer as cam_slicer } from '../mode/cam/slicer_cam.js'; -import { Slicer as topo_slicer } from '../mode/cam/slicer_topo.js'; -import { Probe, Trace, raster_slice } from '../mode/cam/topo3.js'; -import { Topo as Topo4, rotatePoints } from '../mode/cam/topo4.js'; +import { Slicer as cam_slicer } from '../mode/cam/work/slicer-cam.js'; +import { Slicer as topo_slicer } from '../mode/cam/work/slicer-topo.js'; +import { Probe, Trace, raster_slice } from '../mode/cam/work/topo3.js'; +import { Topo as Topo4, rotatePoints } from '../mode/cam/work/topo4.js'; import { wasm_ctrl } from '../../geo/wasm.js'; const clib = self.ClipperLib; diff --git a/src/kiri/run/worker.js b/src/kiri/run/worker.js index cb812002..cff94946 100644 --- a/src/kiri/run/worker.js +++ b/src/kiri/run/worker.js @@ -18,13 +18,13 @@ import { version } from '../../moto/license.js'; import { wasm_ctrl } from '../../geo/wasm.js'; import { Widget, newWidget } from '../core/widget.js'; -import { CAM } from '../mode/cam/driver-be.js'; -import { DRAG } from '../mode/drag/driver.js'; -import { FDM } from '../mode/fdm/driver-be.js'; -import { LASER } from '../mode/laser/driver.js'; -import { SLA } from '../mode/sla/driver.js'; -import { WEDM } from '../mode/wedm/driver.js'; -import { WJET } from '../mode/wjet/driver.js'; +import { CAM } from '../mode/cam/work/init-work.js'; +import { DRAG } from '../mode/drag/init-work.js'; +import { FDM } from '../mode/fdm/work/init-work.js'; +import { LASER } from '../mode/laser/init-work.js'; +import { SLA } from '../mode/sla/work/init-work.js'; +import { WEDM } from '../mode/wedm/init-work.js'; +import { WJET } from '../mode/wjet/init-work.js'; const { time } = util; const POOLPATH = "./minion.js";