From ab9167e446a5af19eb081fe9f6bfe22840352697 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 24 Apr 2015 21:32:39 +0200 Subject: [PATCH] cleaner structure --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 16 ++++++++++++++++ src/doodle.html => doodle.html | 8 ++++---- src/favicon.ico => favicon.ico | Bin src/favicon.png => favicon.png | Bin src/favicon_alt.ico => favicon_alt.ico | Bin {src/gcode => gcode}/easterbunny.js | 0 {src/gcode => gcode}/testgcode.js | 0 src/index.html => index.html | 6 +++--- {src/library => library}/cal.js | 0 {src/library => library}/csg.js | 0 {src/library => library}/jquery.js | 0 {src/library => library}/three.js | 0 src/slice_test.html => slice_test.html | 13 +++++++------ src/.DS_Store | Bin 10244 -> 0 bytes src/{script => }/box.js | 0 src/library/.DS_Store | Bin 6148 -> 0 bytes src/{script => }/printer.js | 4 +++- src/script/.DS_Store | Bin 6148 -> 0 bytes src/{script => }/slicer.js | 21 ++++++++++----------- src/{script => }/utils.js | 0 21 files changed, 43 insertions(+), 25 deletions(-) delete mode 100644 .DS_Store create mode 100644 .gitignore rename src/doodle.html => doodle.html (95%) rename src/favicon.ico => favicon.ico (100%) rename src/favicon.png => favicon.png (100%) rename src/favicon_alt.ico => favicon_alt.ico (100%) rename {src/gcode => gcode}/easterbunny.js (100%) rename {src/gcode => gcode}/testgcode.js (100%) rename src/index.html => index.html (91%) rename {src/library => library}/cal.js (100%) rename {src/library => library}/csg.js (100%) rename {src/library => library}/jquery.js (100%) rename {src/library => library}/three.js (100%) rename src/slice_test.html => slice_test.html (88%) delete mode 100644 src/.DS_Store rename src/{script => }/box.js (100%) delete mode 100644 src/library/.DS_Store rename src/{script => }/printer.js (96%) delete mode 100644 src/script/.DS_Store rename src/{script => }/slicer.js (89%) rename src/{script => }/utils.js (100%) diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - - - - + + + + diff --git a/src/favicon.ico b/favicon.ico similarity index 100% rename from src/favicon.ico rename to favicon.ico diff --git a/src/favicon.png b/favicon.png similarity index 100% rename from src/favicon.png rename to favicon.png diff --git a/src/favicon_alt.ico b/favicon_alt.ico similarity index 100% rename from src/favicon_alt.ico rename to favicon_alt.ico diff --git a/src/gcode/easterbunny.js b/gcode/easterbunny.js similarity index 100% rename from src/gcode/easterbunny.js rename to gcode/easterbunny.js diff --git a/src/gcode/testgcode.js b/gcode/testgcode.js similarity index 100% rename from src/gcode/testgcode.js rename to gcode/testgcode.js diff --git a/src/index.html b/index.html similarity index 91% rename from src/index.html rename to index.html index edf8802..c669503 100644 --- a/src/index.html +++ b/index.html @@ -3,9 +3,9 @@ Doedel Drie Dee - - - + + + diff --git a/src/library/cal.js b/library/cal.js similarity index 100% rename from src/library/cal.js rename to library/cal.js diff --git a/src/library/csg.js b/library/csg.js similarity index 100% rename from src/library/csg.js rename to library/csg.js diff --git a/src/library/jquery.js b/library/jquery.js similarity index 100% rename from src/library/jquery.js rename to library/jquery.js diff --git a/src/library/three.js b/library/three.js similarity index 100% rename from src/library/three.js rename to library/three.js diff --git a/src/slice_test.html b/slice_test.html similarity index 88% rename from src/slice_test.html rename to slice_test.html index 5409c2c..61a7f9f 100644 --- a/src/slice_test.html +++ b/slice_test.html @@ -6,10 +6,10 @@ - - - - + + + + @@ -55,9 +55,10 @@ scene.add(mesh); var slicer = new D3D.Slicer(geometry); -/*var slices = slicer.slice(20, 0.2); +var slices = slicer.slice(200, 0.2); +//document.write(JSON.stringify(slices)); -var canvas = document.getElementById("canvas"); +/*var canvas = document.getElementById("canvas"); var context = canvas.getContext("2d"); for (var layer = 0; layer < slices.length; layer ++) { diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 946a3d398af9125ab2a6535d56d493bf09fe784f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMU2GIp6h5aEn3;ukN+}dDuv)Ao6x>pl1){KRw+I4K-Ik@$vh41R?S$#fx-+{i zG&OxxqDCLos6i7{5O_2^_@WWi_@q&IfEN@0V|>ylj2b=n-r2IdZAna2Aeo!YJ@@b2 zJNKJ!=G$`@0I)N!wE+YHK%$FTbpd5FB-YQaX{pL*qcKJ_6GbV6nRl>mf$5d$Kfsw=-$ePE#+vP&i0-?O#0cDdxfuWGK?tK-Zj%nYL{n z@0T>2Lv8VlJ(A_aPyUi1ThcpX$6{LE%>aDS7u{Gn<%q4_q&GWUGV|-)cRrY4K$;F7 zQgj_lk2+cJ=6_3PO~Y|Rp=($*r+V(Z`I4+qs!`Osn!)(6JsNjYZr>&Li{)P0;8Z!4-f!rmNp*3TZMiAK(sL!Q0|~>@?9om;Z)wgzT+Ej+G7-_>a++#8&NlvPbdm*_K7Hn$OCR%%1A3oBs2BCA{1Ylwz*6=|YJU25h7nGoM*vr47lFHa1GvC~ zSc9_TfRVASxN%%hsFD^+@EqXx}_P`&_P1qa*f9gJtx=Uk8-b-8qtMUV_>_a3DOE?n0t>m*f^ z`^;2YH$_uO*&wOAya+GB%Ww+L!@KYv zT!PQwbNCW2!&UeizJc%Hd-xT8hduvlj_Bq5)MRz8=p|+{ zPOH_TcdJ5-+%2o~MDKQ`gTF^Ah;BBGK(KT!XLR2lyGTBNEAK zaT%_{AT|-nn(=-N;RbBSFmA)`*nyoGBZ@tOJ@_cbaR3L2YDb7{M~Q3}+V}(>$8ns% zCvg&=#uNA~K8Mc}^zk-$};xx;MGJ&e)zeg+P zD8zG?X=~ eqV&K28SpP1M)~o-AO915E28_dpG~)I{Qo!P`*q#` diff --git a/src/script/box.js b/src/box.js similarity index 100% rename from src/script/box.js rename to src/box.js diff --git a/src/library/.DS_Store b/src/library/.DS_Store deleted file mode 100644 index c7a6b55ac35f79e1d47e4b262febd0d4fd7ce623..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-sZu5Pi`-6uj)wW5Bz`e-M}TrXq-UbzM*oQrhmlKixMUE|kq#mSv`7-pphs zNgp(60HoFK;|5p)XxIdk7!{Flwd>521(S}k#WlV$bmRMdWuRjW$=Vx?_(YE_pZ)rG z!`QR$3NIKK@2OjC@J8&^Z}EUzwkO6%Mh5DRd0+UU)zaUn*Qr;Z<ACx zf`MQl7&s9IcxH<<7lxsOfnXpQ*fSveLuL~!j+3Eo9aMS+ATAhIp)Gd_smYGTaWZ5N zC0QxaN|RqPl9e-_J+C-UhE|TGGjklD`S0?QbauwGrXv-@(7`}3FlXT0+@+lVcl>0k zm;8B2c)>t0aAFLk#rk=@;!FA2dhmL3)@HU>HWA62#Gufg{RGgFedJO*tv`#+yy7?+ U$|w@oa$@`lC?TPOfq!7&7yT|OH1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 retractionamount && retractionEnabled) { + if (extruder > retractionAmount && retractionEnabled) { gcode.push([ "G0", - "E" + (extruder - retractionamount).toFixed(3), - "F" + (retractionspeed * 60).toFixed(3) + "E" + (extruder - retractionAmount).toFixed(3), + "F" + (retractionSpeed * 60).toFixed(3) ].join(" ")); } @@ -198,11 +197,11 @@ D3D.Slicer.prototype.getGcode = function (printer) { "F" + (travelSpeed*60) ].join(" ")); - if (extruder > retractionamount && retractionEnabled) { + if (extruder > retractionAmount && retractionEnabled) { gcode.push([ "G0", "E" + extruder.toFixed(3), - "F" + (retractionspeed * 60).toFixed(3) + "F" + (retractionSpeed * 60).toFixed(3) ].join(" ")); } } diff --git a/src/script/utils.js b/src/utils.js similarity index 100% rename from src/script/utils.js rename to src/utils.js