move consts from core to app

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';

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';

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 };

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';

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';
 
 /**

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';
 

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';

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;

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';

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';

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';

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';

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();

src/kiri/core/print.js

@@ -1,16 +1,14 @@
 /** Copyright Stewart Allen <sa@grid.space> -- 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.y -= point.z * BELTFACT;
-                point.z *= beltfact;
+                point.z *= BELTFACT;
             }
 
             const retract = (fdm && pos.E < 0) || undefined;

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';
 

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();