Commit Graph

638 Commits

Author SHA1 Message Date
peteruithoven
580b41413f Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 21:40:19 +02:00
casperlamboo
281b037f9e Merge branch 'develop' 2017-07-19 20:55:55 +02:00
casperlamboo
d7a525f75b camel casing 2017-07-19 20:54:39 +02:00
casperlamboo
e4880106f1 remove progress promise
@mith @peteruithoven
2017-07-19 20:54:21 +02:00
peteruithoven
2356136a3d Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 17:54:35 +02:00
casperlamboo
c390cc335a increase total stages because step is added 2017-07-19 17:37:40 +02:00
peteruithoven
2668c16500 Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 17:36:25 +02:00
casperlamboo
8c57e16998 cleanup Slicer 2017-07-19 17:36:20 +02:00
casperlamboo
3f140d7f03 don't catch result of void detectOpenClosed function 2017-07-19 17:36:03 +02:00
casperlamboo
8e45881a45 pre calculate outer lines 2017-07-19 17:33:55 +02:00
casperlamboo
44197dd5e4 remove unnecessary new key word 2017-07-19 11:50:23 +02:00
casperlamboo
fdbb1469ee format settings deconstructing 2017-07-19 11:04:13 +02:00
casperlamboo
3b4dbc0d4a fix settings deconstructing 2017-07-19 11:03:16 +02:00
casperlamboo
1e16c741a0 move helper classes to helper folder 2017-07-19 11:02:42 +02:00
casperlamboo
73f0433e00 wrap progress in object
So data could be extended in the future
2017-07-19 11:02:14 +02:00
casperlamboo
83f543b62b fix isFlat check 2017-07-18 16:55:27 +02:00
casperlamboo
65f1e96ed8 Merge branch 'master' into develop 2017-07-18 14:23:37 +02:00
casperlamboo
6c7c2b1708 remove printer_settings.json file 2017-07-18 14:05:25 +02:00
casperlamboo
9c04511f94 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	settings/printer_settings.json
2017-07-18 14:05:09 +02:00
casperlamboo
a5384b3de1 Merge branch 'develop' 2017-07-18 14:02:45 +02:00
casperlamboo
365680a693 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	jspm.config.js
#	package.json
2017-07-18 12:53:59 +02:00
casperlamboo
e675cf200a update readme 2017-07-18 12:43:27 +02:00
casperlamboo
1d2a9ba965 use npm version of three.js 2017-07-18 12:38:03 +02:00
casperlamboo
e54d077db0 update example 2017-07-18 12:30:56 +02:00
casperlamboo
0a041ddae0 update progress api 2017-07-18 12:26:30 +02:00
casperlamboo
4a238f9089 remove settings class 2017-07-18 11:39:38 +02:00
casperlamboo
622be82706 Merge remote-tracking branch 'origin/feature/split-settings' into develop
# Conflicts:
#	example/save.js
#	example/viewer.js
#	jspm.config.js
#	package.json
#	src/GCode.js
#	src/Slicer.js
#	src/index.js
#	src/sliceActions/addBrim.js
#	src/sliceActions/calculateLayersIntersections.js
#	src/sliceActions/createLines.js
#	src/sliceActions/detectOpenClosed.js
#	src/sliceActions/generateInfills.js
#	src/sliceActions/generateInnerLines.js
#	src/sliceActions/generateSupport.js
#	src/sliceActions/intersectionsToShapes.js
#	src/sliceActions/removePrecision.js
#	src/sliceActions/slice.js
2017-07-18 11:26:11 +02:00
casperlamboo
4e38acd9bd Merge branch 'feature/improved-open-closed-detection' into develop 2017-07-18 10:42:04 +02:00
casperlamboo
94181d6660 update save example 2017-07-18 10:34:20 +02:00
casperlamboo
0f579b8055 update detect open closed shapes logic 2017-07-18 10:23:16 +02:00
casperlamboo
b92a35a0c1 remove stl's and add json files 2017-07-18 10:22:26 +02:00
casperlamboo
8988bc4368 remove stl loader 2017-07-18 10:21:37 +02:00
casperlamboo
8b9b789c56 remove unused three js imports 2017-07-17 16:18:44 +02:00
casperlamboo
87f7f2f906 Fix geometry type check
#21
2017-07-17 15:22:13 +02:00
Rick Companje
f3c0960512 set default top thickness to 1.2 2017-07-13 18:12:45 +02:00
Rick Companje
a216ee0e94 fixed typo 'high' and added fill.gridSize:0.15 2017-07-13 17:56:57 +02:00
Rick Companje
cd3c2d8cb4 fixed typo in title of Renkforce RF100 printer 2017-07-13 15:59:07 +02:00
Rick Companje
f374139238 added custom dimensions for Renkforce printer 2017-07-12 12:54:20 +02:00
Rick Companje
8cf264b437 renamed 'title' of 'Ultimaker' to 'Ultimaker Original' 2017-07-12 10:45:20 +02:00
Simon Voordouw
cff8dfffc0 map old config names to new split settings 2017-07-11 17:19:05 +02:00
Simon Voordouw
f87a9c0a56 don't export settings object 2017-07-11 13:49:21 +02:00
Simon Voordouw
d47c8ca07b replace default settings in json with split yml files 2017-07-10 16:07:38 +02:00
peteruithoven
7a111371e9 Fixed code in readme 2017-07-07 18:11:37 +02:00
peteruithoven
94c21360b2 Added simple example 2017-07-07 18:10:29 +02:00
Simon Voordouw
dc99f417da add progress reporting 2017-07-04 14:19:07 +02:00
Peter Uithoven
b517ad222b Added version to package.json 2017-07-03 14:47:34 +02:00
Peter Uithoven
d8fdfd3e11 Fixed package.json syntax error 2017-07-03 14:45:11 +02:00
Peter Uithoven
c7f4553b4e Added name to package.json 2017-07-03 14:44:40 +02:00
Simon Voordouw
1f206e5784 remove erronous bracket 2017-06-22 14:06:26 +02:00
Simon Voordouw
3f998bd604 add low, medium and high quality setting profiles 2017-06-22 13:43:45 +02:00