From 54811b27e9abced72cf5f2e09e12b93087023be1 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Sun, 24 Dec 2017 14:46:00 +0100 Subject: [PATCH] rename base to default --- README.md | 4 ++-- src/index.js | 4 ++-- src/interface/index.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2c33da3..24cf8b4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ import * as THREE from 'three'; import { defaultSettings, sliceGeometry } from 'Doodle3D/Doodle3D-Slicer'; const settings = { - ...defaultSettings.base, + ...defaultSettings.default, ...defaultSettings.material.pla, ...defaultSettings.printer.ultimaker2go, ...defaultSettings.quality.high @@ -27,7 +27,7 @@ const gcode = await sliceGeometry(settings, geometry); import { defaultSettings } from 'Doodle3D/Doodle3D-Slicer'; const settings = { - ...defaultSettings.base, + ...defaultSettings.default, ...defaultSettings.material.pla, ...defaultSettings.printer.ultimaker2go, ...defaultSettings.quality.high diff --git a/src/index.js b/src/index.js index 10fc565..4cb81de 100644 --- a/src/index.js +++ b/src/index.js @@ -1,12 +1,12 @@ import { sliceGeometry, sliceMesh } from './slicer.js'; import Interface from './interface/index.js'; -import baseSettings from './settings/default.yml'; +import _defaultSettings from './settings/default.yml'; import printerSettings from './settings/printer.yml'; import materialSettings from './settings/material.yml'; import qualitySettings from './settings/quality.yml'; const defaultSettings = { - base: baseSettings, + default: _defaultSettings, printer: printerSettings, material: materialSettings, quality: qualitySettings diff --git a/src/interface/index.js b/src/interface/index.js index 912a083..2cd256b 100644 --- a/src/interface/index.js +++ b/src/interface/index.js @@ -13,7 +13,7 @@ import LinearProgress from 'material-ui/LinearProgress'; import { grey50, grey300, grey800, red500 } from 'material-ui/styles/colors'; import { Tabs, Tab } from 'material-ui/Tabs'; import Settings from './Settings.js'; -import baseSettings from '../settings/default.yml'; +import defaultSettings from '../settings/default.yml'; import printerSettings from '../settings/printer.yml'; import materialSettings from '../settings/material.yml'; import qualitySettings from '../settings/quality.yml'; @@ -94,7 +94,7 @@ class Interface extends React.Component { }; static defaultProps = { - defaultSettings: baseSettings, + defaultSettings: defaultSettings, printers: printerSettings, quality: qualitySettings, defaultQuality: 'medium',