diff --git a/.gitignore b/.gitignore index 868a1da7..3a25e8c5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ node_modules package-lock.json three.js tmp -pack \ No newline at end of file diff --git a/src/kiri-run/worker.js b/src/kiri-run/worker.js index 7c772d8d..a92b230d 100644 --- a/src/kiri-run/worker.js +++ b/src/kiri-run/worker.js @@ -16,7 +16,6 @@ import { render } from '../kiri/render.js'; import { wasm_ctrl } from '../geo/wasm.js'; import { version } from '../moto/license.js'; import { Widget, newWidget } from '../kiri/widget.js'; -import { load } from "../load/png.js"; import { CAM } from '../kiri-mode/cam/driver-be.js'; import { DRAG } from '../kiri-mode/drag/driver.js'; diff --git a/src/kiri/main.js b/src/kiri/main.js index 433a01d9..aef9f121 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -18,7 +18,7 @@ import { space as SPACE } from '../moto/space.js'; import { stats } from '../kiri/stats.js'; import { noop, utils } from '../kiri/utils.js'; import { version } from '../moto/license.js'; -import { Widget, newWidget } from './widget.js'; +import { Widget } from './widget.js'; import { showTools } from '../kiri-mode/cam/tools.js'; let { parseOpt, o2js, js2o, ls2o } = utils, diff --git a/src/load/file.js b/src/load/file.js index 88962c27..c70ca280 100644 --- a/src/load/file.js +++ b/src/load/file.js @@ -100,6 +100,4 @@ function load_file(file, opt) { }); } -Object.assign(load_file, { SVG, OBJ, STL, TMF, GBR, PNG: pngLoad.PNG }); - export { types, as_buffer, load_data, load_file, load_file as load }; diff --git a/src/load/png.js b/src/load/png.js index 26983b84..bd029144 100644 --- a/src/load/png.js +++ b/src/load/png.js @@ -28,7 +28,7 @@ function parseAsync(bin, opt) { * opt.base = base added thickness in mm */ function parse(bin, opt = {}) { - let img = new PNG(); + let img = new png.PNG(); let progress = opt.progress || noop; let ondone = opt.done || noop; img.parse(bin, (err, output) => { diff --git a/src/load/svg.js b/src/load/svg.js index 8024b6f8..498650d3 100644 --- a/src/load/svg.js +++ b/src/load/svg.js @@ -1,7 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ import { newPolygon } from '../geo/polygon.js'; -import { newPoint } from '../geo/point.js'; import { polygons } from '../geo/polygons.js'; import { THREE } from '../ext/three.js'; @@ -44,7 +43,7 @@ export function parse(text, opt = { }) { if (points.length < 3) { continue; } - let poly = newPolygon().addPoints(points.map(p => newPoint(p.x, -p.y, 0))); + let poly = newPolygon().addPoints(points.map(p => newPolygon.newPoint(p.x, -p.y, 0))); if (poly.appearsClosed()) poly.points.pop(); if (type === 'polyline') poly.setOpen(true); poly._svg = { width, miter };