update config handling

This commit is contained in:
casperlamboo 2016-07-19 14:23:23 +02:00 committed by Simon Voordouw
parent ef09d7216a
commit 37fb7e162a
2 changed files with 7 additions and 8 deletions

View File

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

View File

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