diff --git a/files.html b/files.html index 3b1336cd8988dc51aafb385f9eb89f76a62ef239..5c37b560303bddcbd420fe41191b8de0060394ba 100644 --- a/files.html +++ b/files.html @@ -168,9 +168,8 @@ <a href='./modules/processes/cut/raster'>raster</a><br> <i> mill</i><br> <i> raster</i><br> + <a href='./modules/processes/mill/raster/2.5D'>2.5D</a><br> <a href='./modules/processes/mill/raster/2D'>2D</a><br> -<i> 3D</i><br> - <a href='./modules/processes/mill/raster/3D/rough'>rough</a><br> <i> read</i><br> <a href='./modules/read/png'>png</a><br> <a href='./modules/read/stl'>stl</a><br> diff --git a/modules/index.js b/modules/index.js index 7cc0da1ceac3425c5506123e84000d891de56a8b..de206bcefec5f0905d64a60bf23743b7f898c5b9 100644 --- a/modules/index.js +++ b/modules/index.js @@ -138,9 +138,8 @@ module_label(' cut') module_menu(' raster','modules/processes/cut/raster') module_label(' mill') module_label(' raster') +module_menu(' 2.5D','modules/processes/mill/raster/2.5D') module_menu(' 2D','modules/processes/mill/raster/2D') -module_label(' 3D') -module_menu(' rough','modules/processes/mill/raster/3D/rough') module_label('read') module_menu(' png','modules/read/png') module_menu(' stl','modules/read/stl') diff --git a/modules/processes/mill/raster/3D/rough b/modules/processes/mill/raster/2.5D similarity index 98% rename from modules/processes/mill/raster/3D/rough rename to modules/processes/mill/raster/2.5D index 1d137b4cddfa1a108adc48aeb8a50da4d4ea7509..359bd2b5495c61e730ce9858ac5d28aadd7eb5ce 100644 --- a/modules/processes/mill/raster/3D/rough +++ b/modules/processes/mill/raster/2.5D @@ -1,8 +1,8 @@ // -// mill raster 3D rough +// mill raster 2.5D // // Neil Gershenfeld -// (c) Massachusetts Institute of Technology 2018 +// (c) Massachusetts Institute of Technology 2019 // // This work may be reproduced, modified, distributed, performed, and // displayed for any purpose, but must acknowledge the mods @@ -20,7 +20,7 @@ var mod = {} // // name // -var name = 'mill raster 3D rough' +var name = 'mill raster 2.5D' // // initialization // @@ -94,11 +94,6 @@ var outputs = { mods.output(mod,'offset',pixels) } }, - depth:{type:'', - event:function(){ - mods.output(mod,'depth',0) - } - }, toolpath:{type:'', event:function(){ cmd = {} @@ -454,8 +449,7 @@ function add_depth() { var newpath = [] for (var seg = 0; seg < mod.path.length; ++seg) { var depth = cut - if ((mod.path[seg][0][0] == mod.path[seg][mod.path[seg].length-1][0]) - && (mod.path[seg][0][0] == mod.path[seg][mod.path[seg].length-1][0])) { + if (mod.path[seg][0][0] == mod.path[seg][mod.path[seg].length-1][0]) { var newseg = [] while (depth <= max) { var idepth = -Math.round(mod.dpi*depth)