Commit Graph

29 Commits

Author SHA1 Message Date
casperlamboo
e4880106f1 remove progress promise
@mith @peteruithoven
2017-07-19 20:54:21 +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
1d2a9ba965 use npm version of three.js 2017-07-18 12:38:03 +02:00
casperlamboo
0a041ddae0 update progress api 2017-07-18 12:26:30 +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
8988bc4368 remove stl loader 2017-07-18 10:21:37 +02:00
Simon Voordouw
f87a9c0a56 don't export settings object 2017-07-11 13:49:21 +02:00
peteruithoven
94c21360b2 Added simple example 2017-07-07 18:10:29 +02:00
casperlamboo
85b2040ce9 add save example 2017-06-22 13:22:17 +02:00
Simon Voordouw
9210504ea4 update dependencies and fix Three.js imports 2017-06-22 13:21:19 +02:00
casperlamboo
a9ae3b220e update three.js 2017-06-22 13:21:19 +02:00
casperlamboo
52e9ba31e0 add stl loader 2017-06-22 13:21:19 +02:00
casperlamboo
18456a402a implement better viewer as example 2017-06-22 13:21:18 +02:00
casperlamboo
2ec71ddef6 update config 2017-06-22 13:21:18 +02:00
casperlamboo
e457994496 implement async slicing 2017-06-22 13:21:18 +02:00
casperlamboo
38a3c312e2 remove event dispatcher 2017-06-22 13:21:18 +02:00
casperlamboo
a4d345b018 replace event dispatcher 2017-06-22 13:21:18 +02:00
casperlamboo
ef09d7216a update to jspm 0.17 2017-06-22 13:21:18 +02:00
casperlamboo
183622e143 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	example/app.js
#	package.json
2017-05-13 15:41:46 +02:00
casperlamboo
0f10629a3c add save example 2017-05-13 15:39:45 +02:00
Simon Voordouw
da8a54550a update dependencies and fix Three.js imports 2017-05-12 16:32:05 +02:00
casperlamboo
e9c2f653bf update three.js 2017-01-18 13:30:57 +01:00
casperlamboo
7f2b8da15f add stl loader 2016-10-16 11:10:39 +02:00
casperlamboo
0d5587a9c9 implement better viewer as example 2016-10-13 16:33:40 +02:00
casperlamboo
91fc46621f update config 2016-08-26 21:43:46 +02:00
casperlamboo
bf9d98611a implement async slicing 2016-08-19 14:46:02 +02:00
casperlamboo
84f3656580 remove event dispatcher 2016-08-19 14:09:25 +02:00
casperlamboo
5f2a3a6328 replace event dispatcher 2016-07-19 14:32:48 +02:00
casperlamboo
ab3b241fcb update to jspm 0.17 2016-07-18 18:28:47 +02:00