diff --git a/example/app.js b/example/app.js index 829f75d..4dfebd0 100644 --- a/example/app.js +++ b/example/app.js @@ -1,9 +1,10 @@ import THREE from 'three.js'; import * as SLICER from 'src/index'; -const settings = new SLICER.Settings(); -settings.updateConfig(SLICER.printerSettings['ultimaker2go']); -settings.updateConfig(SLICER.userSettings); +const settings = new SLICER.Settings({ + ...SLICER.printerSettings['ultimaker2go'], + ...SLICER.userSettings +}); const geometry = new THREE.TorusGeometry(20, 10, 30, 30); diff --git a/src/settings.js b/src/settings.js index 1eb72fc..33fc821 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,11 +1,9 @@ export default class { - constructor() { - this.config = {}; + constructor(config = {}) { + this.config = config; } updateConfig(config) { - for (const i in config) { - this.config[i] = config[i]; - } + this.config = { ...this.config, ...config }; return this; }