diff --git a/src/kiri/app/api.js b/src/kiri/app/api.js index d37a80e0..ccb80965 100644 --- a/src/kiri/app/api.js +++ b/src/kiri/app/api.js @@ -10,7 +10,7 @@ import web from '../../moto/webui.js'; import { beta, version } from '../../moto/license.js'; import { broker } from '../../moto/broker.js'; import { client as workers } from './workers.js'; -import { consts, LISTS as lists } from '../core/consts.js'; +import { consts, LISTS as lists } from './consts.js'; import { device, devices } from './devices.js'; import { functions } from './function.js'; import { group as groupModule } from './groups.js'; diff --git a/src/kiri/app/conf/manager.js b/src/kiri/app/conf/manager.js index f1d9ebac..c15f57ec 100644 --- a/src/kiri/app/conf/manager.js +++ b/src/kiri/app/conf/manager.js @@ -4,7 +4,7 @@ import { $, h } from '../../../moto/webui.js'; import { api } from '../api.js'; import { conf } from './defaults.js'; import { codec } from '../../core/codec.js'; -import { consts } from '../../core/consts.js'; +import { consts } from '../consts.js'; import { space } from '../../../moto/space.js'; import { local } from '../../../data/local.js'; import { newWidget } from '../widget.js'; diff --git a/src/kiri/core/consts.js b/src/kiri/app/consts.js similarity index 96% rename from src/kiri/core/consts.js rename to src/kiri/app/consts.js index ac3caaff..ac59923b 100644 --- a/src/kiri/core/consts.js +++ b/src/kiri/app/consts.js @@ -161,11 +161,6 @@ const PMODES = { TOOLS: 2 }; -const PATHS = { - work: "../lib/kiri/run/worker.js", - pool: "./minion.js" -}; - const LAST = 'kiri-last'; const SEED = 'kiri-seed'; @@ -173,11 +168,10 @@ export let consts = { LAST, LISTS, MODES, - PATHS, PMODES, VIEWS, SEED, beltfact: Math.cos(Math.PI / 4) }; -export { LAST, LISTS, MODES, VIEWS, PATHS, PMODES, SEED }; +export { LAST, LISTS, MODES, VIEWS, PMODES, SEED }; diff --git a/src/kiri/app/export.js b/src/kiri/app/export.js index 8e682a35..05831716 100644 --- a/src/kiri/app/export.js +++ b/src/kiri/app/export.js @@ -5,7 +5,7 @@ import { api } from './api.js'; import { client } from './workers.js'; import { local } from '../../data/local.js'; import { util } from '../../geo/base.js'; -import { MODES } from '../core/consts.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 { hash } from '../../ext/md5.js'; diff --git a/src/kiri/app/frame.js b/src/kiri/app/frame.js index c1232b1a..32fd2431 100644 --- a/src/kiri/app/frame.js +++ b/src/kiri/app/frame.js @@ -26,7 +26,7 @@ import { api } from './api.js'; import { load } from '../../load/file.js'; import { newWidget } from './widget.js'; -import { VIEWS } from '../core/consts.js'; +import { VIEWS } from './consts.js'; import { widgets } from '../core/widgets.js'; /** diff --git a/src/kiri/app/function.js b/src/kiri/app/function.js index e3832c80..ac3c4904 100644 --- a/src/kiri/app/function.js +++ b/src/kiri/app/function.js @@ -4,7 +4,7 @@ import { api } from './api.js'; import { client } from './workers.js'; import { codec } from '../core/codec.js'; import { space } from '../../moto/space.js'; -import { PMODES } from '../core/consts.js'; +import { PMODES } from './consts.js'; import { colorSchemeRegistry } from './color/schemes.js'; import { exportFile } from './export.js'; diff --git a/src/kiri/app/init/input.js b/src/kiri/app/init/input.js index 6b4c881a..6909ce40 100644 --- a/src/kiri/app/init/input.js +++ b/src/kiri/app/init/input.js @@ -25,7 +25,7 @@ import { settings as set_ctrl } from '../conf/manager.js'; import { settingsOps } from '../conf/settings.js'; import { slider } from '../slider.js'; import { space } from '../../../moto/space.js'; -import { LAST, MODES, SEED, VIEWS } from '../../core/consts.js'; +import { LAST, MODES, SEED, VIEWS } from '../consts.js'; import STACKS from '../stacks.js'; import '../frame.js'; diff --git a/src/kiri/app/init/sync.js b/src/kiri/app/init/sync.js index 2d34f670..b507c121 100644 --- a/src/kiri/app/init/sync.js +++ b/src/kiri/app/init/sync.js @@ -9,7 +9,7 @@ import { preferences } from '../preferences.js'; import { settings as set_ctrl } from '../conf/manager.js'; import { settingsOps } from '../conf/settings.js'; import { space } from '../../../moto/space.js'; -import { VIEWS } from '../../core/consts.js'; +import { VIEWS } from '../consts.js'; import * as view_tools from '../face-tool.js'; const { SETUP, LOCAL } = api.const; diff --git a/src/kiri/app/mode.js b/src/kiri/app/mode.js index 22caa361..7f992d9d 100644 --- a/src/kiri/app/mode.js +++ b/src/kiri/app/mode.js @@ -2,7 +2,7 @@ import { $ } from '../../moto/webui.js'; import { api } from './api.js'; -import { consts } from '../core/consts.js'; +import { consts } from './consts.js'; import { modal } from './modal.js'; import { platform } from './platform.js'; import { selection } from './selected.js'; diff --git a/src/kiri/app/platform.js b/src/kiri/app/platform.js index 080f0440..a1529fb6 100644 --- a/src/kiri/app/platform.js +++ b/src/kiri/app/platform.js @@ -3,7 +3,7 @@ import { $, h } from '../../moto/webui.js'; import { ajax, js2o } from '../core/utils.js'; import { api } from './api.js'; -import { MODES } from '../core/consts.js'; +import { MODES } from './consts.js'; import { colorSchemeRegistry } from './color/schemes.js'; import { load as file_load } from '../../load/file.js'; import { newBounds } from '../../geo/bounds.js'; diff --git a/src/kiri/app/view-mode.js b/src/kiri/app/view-mode.js index 3cb3adc6..dac5e95d 100644 --- a/src/kiri/app/view-mode.js +++ b/src/kiri/app/view-mode.js @@ -2,7 +2,7 @@ import { $ } from '../../moto/webui.js'; import { api } from './api.js'; -import { consts } from '../core/consts.js'; +import { consts } from './consts.js'; import { platform } from './platform.js'; import { selection } from './selected.js'; import { settings } from './conf/manager.js'; diff --git a/src/kiri/app/visuals.js b/src/kiri/app/visuals.js index 9334c306..b34e8c41 100644 --- a/src/kiri/app/visuals.js +++ b/src/kiri/app/visuals.js @@ -2,7 +2,7 @@ import { api } from './api.js'; import { base } from '../../geo/base.js'; -import { consts } from '../core/consts.js'; +import { consts } from './consts.js'; import { colorSchemeRegistry } from './color/schemes.js'; import { settings } from './conf/manager.js'; import { space } from '../../moto/space.js'; diff --git a/src/kiri/app/workers.js b/src/kiri/app/workers.js index 808a654b..8f71b39d 100644 --- a/src/kiri/app/workers.js +++ b/src/kiri/app/workers.js @@ -6,6 +6,8 @@ import { codec } from '../core/codec.js'; import { Widget } from './widget.js'; import { newPrint } from '../core/print.js'; +const WORKPATH = "../lib/kiri/run/worker.js"; + // this code runs in kiri's main loop let debug = self.debug === true, time = Date.now, @@ -92,7 +94,7 @@ export const client = { const blob = new Blob([ work ], { type: 'application/javascript' }); return new Worker(URL.createObjectURL(blob)); } else { - let worker = new Worker(workpath || api.const.PATHS.work, { type: 'module' }); + let worker = new Worker(workpath || WORKPATH, { type: 'module' }); worker.onerror = (error) => { console.log({ WORKER_ERROR: error }); error.preventDefault(); diff --git a/src/kiri/core/print.js b/src/kiri/core/print.js index 3b19b106..d0243ead 100644 --- a/src/kiri/core/print.js +++ b/src/kiri/core/print.js @@ -1,16 +1,14 @@ /** Copyright Stewart Allen -- All Rights Reserved */ import { arcToPath } from '../../geo/paths.js'; -import { consts } from './consts.js'; import { createVM } from '../../moto/quickjs.js'; import { newPoint } from '../../geo/point.js'; import { newPolygon } from '../../geo/polygon.js'; import { util } from '../../geo/base.js'; const { numOrDefault } = util; -const { beltfact } = consts; -const XAXIS = new THREE.Vector3(1,0,0); +const BELTFACT = Math.cos(Math.PI / 4); const DEG2RAD = Math.PI / 180; class Print { @@ -590,8 +588,8 @@ class Print { let { point, prevPoint } = processLine(line, axes); if (morph && belt) { - point.y -= point.z * beltfact; - point.z *= beltfact; + point.y -= point.z * BELTFACT; + point.z *= BELTFACT; } const retract = (fdm && pos.E < 0) || undefined; diff --git a/src/kiri/mode/cam/tools.js b/src/kiri/mode/cam/tools.js index e8b533a8..8146973a 100644 --- a/src/kiri/mode/cam/tools.js +++ b/src/kiri/mode/cam/tools.js @@ -2,7 +2,7 @@ import { $ } from '../../../moto/webui.js'; import { api } from '../../app/api.js'; -import { consts } from '../../core/consts.js'; +import { consts } from '../../app/consts.js'; import { settings as setconf } from '../../app/conf/manager.js'; import { Tool, calcTaperAngle, calcTaperBallExtent, calcTaperLength } from './tool.js'; diff --git a/src/kiri/run/worker.js b/src/kiri/run/worker.js index 9f394ddb..cb812002 100644 --- a/src/kiri/run/worker.js +++ b/src/kiri/run/worker.js @@ -6,7 +6,6 @@ import '../../add/three.js'; import { base } from '../../geo/base.js'; import { codec } from '../core/codec.js'; -import { consts } from '../core/consts.js'; import { JSZip } from '../../ext/jszip-esm.js'; import { load } from "../../load/png.js"; import { newPoint } from '../../geo/point.js'; @@ -28,6 +27,7 @@ import { WEDM } from '../mode/wedm/driver.js'; import { WJET } from '../mode/wjet/driver.js'; const { time } = util; +const POOLPATH = "./minion.js"; let drivers = { DRAG, @@ -114,7 +114,7 @@ const minwork = { return; } for (let i=0; i < concurrent; i++) { - let minion = new Worker(poolpath || consts.PATHS.pool, { type: 'module' }); + let minion = new Worker(poolpath || POOLPATH, { type: 'module' }); minion.onerror = (error) => { debug({ MINION_ERROR: error }); error.preventDefault();