include settings in lib

This commit is contained in:
casperlamboo 2016-05-08 11:09:34 +02:00 committed by Simon Voordouw
parent 4da6f9700b
commit c44e3ecb40
4 changed files with 5 additions and 5 deletions

View File

@ -1,11 +1,9 @@
import THREE from 'three.js'; import THREE from 'three.js';
import PRINTER_SETTINGS from 'settings/printer_settings.json!';
import USER_SETTINGS from 'settings/user_settings.json!';
import * as SLICER from 'src/index'; import * as SLICER from 'src/index';
var settings = new SLICER.Settings(); var settings = new SLICER.Settings();
settings.updateConfig(PRINTER_SETTINGS["ultimaker2go"]); settings.updateConfig(SLICER.printerSettings['ultimaker2go']);
settings.updateConfig(USER_SETTINGS); settings.updateConfig(SLICER.userSettings);
var geometry = new THREE.TorusGeometry(20, 10, 30, 30); var geometry = new THREE.TorusGeometry(20, 10, 30, 30);

View File

@ -1,4 +1,6 @@
import Slicer from './slicer.js'; import Slicer from './slicer.js';
import Settings from './settings.js'; import Settings from './settings.js';
import printerSettings from './settings/printer_settings.json!';
import userSettings from './settings/user_settings.json!';
export { Slicer, Settings }; export { Slicer, Settings, printerSettings, userSettings };