diff --git a/src/Slicer.js b/src/Slicer.js index a76b8ad..baa6fc5 100644 --- a/src/Slicer.js +++ b/src/Slicer.js @@ -1,6 +1,6 @@ import THREE from 'three.js'; import slice from './sliceActions/slice.js'; -import SliceWorker from './sliceActions/sliceWorker.js!worker'; +import SlicerWorker from './slicerWorker.js!worker'; export default class { setMesh(mesh) { @@ -34,26 +34,26 @@ export default class { return slice(this.geometry, settings); } slice(settings) { - const sliceWorker = new SliceWorker(); + const slicerWorker = new SlicerWorker(); const geometry = this.geometry.toJSON(); const { config } = settings; return new Promise((resolve, reject) => { - sliceWorker.onerror = reject; + slicerWorker.onerror = reject; - sliceWorker.addEventListener('message', (event) => { + slicerWorker.addEventListener('message', (event) => { const { message, data } = event.data; switch (message) { case 'SLICE': { - sliceWorker.terminate(); + slicerWorker.terminate(); resolve(data.gcode); break; } } }); - sliceWorker.postMessage({ + slicerWorker.postMessage({ message: 'SLICE', data: { geometry, config } }); diff --git a/src/sliceActions/sliceWorker.js b/src/slicerWorker.js similarity index 86% rename from src/sliceActions/sliceWorker.js rename to src/slicerWorker.js index 1880ad3..ff0cd13 100644 --- a/src/sliceActions/sliceWorker.js +++ b/src/slicerWorker.js @@ -1,5 +1,5 @@ -import Settings from '../Settings.js'; -import slice from './slice.js'; +import Settings from './Settings.js'; +import slice from './sliceActions/slice.js'; import THREE from 'three.js'; const loader = new THREE.JSONLoader();