diff --git a/README.md b/README.md index bd2c19f..ce97499 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ var mesh = new THREE.Mesh(geometry, material); doodleBox.onload = function () { "use strict"; - var slicer = new D3D.Slicer().setGeometry(mesh); + var slicer = new D3D.Slicer().setMesh(mesh); var gcode = slicer.getGcode(doodleBox.printer); doodleBox.print(gcode); diff --git a/build/d3d.js b/build/d3d.js index 8fd3451..6093345 100644 --- a/build/d3d.js +++ b/build/d3d.js @@ -90,7 +90,7 @@ Array.prototype.clone = function () { return array; }; -function applyMouseControls (renderer, camera, maxDistance) { +function applyMouseControls (renderer, camera, center, maxDistance) { "use strict"; //TODO //impliment touch controls @@ -102,10 +102,12 @@ function applyMouseControls (renderer, camera, maxDistance) { var moveCamera = false; function updateCamera () { - camera.position.x = Math.cos(rotY)*Math.sin(rotX)*distance; - camera.position.y = Math.sin(rotY)*distance; - camera.position.z = Math.cos(rotY)*Math.cos(rotX)*distance; - camera.lookAt(new THREE.Vector3(0, 0, 0)); + camera.position.set( + Math.cos(rotY)*Math.sin(rotX)*distance, + Math.sin(rotY)*distance, + Math.cos(rotY)*Math.cos(rotX)*distance + ).add(center); + camera.lookAt(center); } $(renderer.domElement).on("mousedown", function (e) { @@ -632,9 +634,11 @@ D3D.Slicer = function () { this.lines = []; }; -D3D.Slicer.prototype.setGeometry = function (mesh) { +D3D.Slicer.prototype.setMesh = function (mesh) { "use strict"; + mesh.updateMatrix(); + var geometry = mesh.geometry.clone(); geometry.mergeVertices(); geometry.applyMatrix(mesh.matrix); @@ -731,8 +735,7 @@ D3D.Slicer.prototype.slice = function (height, step) { var x = line.start.x * alpha + line.end.x * (1 - alpha); var z = line.start.z * alpha + line.end.z * (1 - alpha); - //remove +100 when implimenting good stucture for creating geometry is complete - intersections[index] = new THREE.Vector2(x + 100, z + 100); + intersections[index] = new THREE.Vector2(x, z); } var done = []; @@ -773,6 +776,28 @@ D3D.Slicer.prototype.slice = function (height, step) { } } + /* + for (var i = 0; i < shape.length; i ++) { + var point = shape[i]; + var previousPoint = shape[(i + shape.length - 1) % shape.length]; + var nextPoint = shape[(i + 1) % shape.length]; + + var point = new THREE.Vector2(point.X, point.Y); + var previousPoint = new THREE.Vector2(previousPoint.X, previousPoint.Y); + var nextPoint = new THREE.Vector2(nextPoint.X, nextPoint.Y); + //var lineLength = nextPoint.sub(previousPoint).length(); + + var normal = nextPoint.sub(previousPoint).normal().normalize(); + var distance = Math.abs(normal.dot(point.sub(previousPoint))); + + //something better for offset check + if (distance <= 0.01) { + shape.splice(i, 1); + i --; + } + } + */ + //think this check is not nescesary, always higher as 0 if (shape.length > 0) { slice.push(shape); @@ -1093,8 +1118,8 @@ D3D.Slicer.prototype.drawPaths = function (printer, min, max) { var slice = data[layer % data.length]; drawLines(slice.outerLayer, "red"); - //drawLines(slice.innerLayer, "green"); - //drawLines(slice.fill, "blue"); + drawLines(slice.innerLayer, "green"); + drawLines(slice.fill, "blue"); drawVertexes(slice.outerLayer, "green"); } diff --git a/build/d3d.min.js b/build/d3d.min.js index 885acf5..580b948 100644 --- a/build/d3d.min.js +++ b/build/d3d.min.js @@ -1 +1 @@ -function sendAPI(t,e,i){"use strict";$.ajax({url:t,type:"POST",data:e,dataType:"json",timeout:1e4,success:function(t){"success"===t.status?void 0!==i&&i(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),sendAPI(t,e,i)})}function getAPI(t,e){"use strict";$.ajax({url:t,dataType:"json",timeout:5e3,success:function(t){"success"===t.status?void 0!==e&&e(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),getAPI(t,e)})}function downloadFile(t,e){"use strict";$(document.createElement("a")).attr({download:t,href:"data:text/plain,"+e})[0].click()}function applyMouseControls(t,e,i){"use strict";function r(){e.position.x=Math.cos(s)*Math.sin(o)*n,e.position.y=Math.sin(s)*n,e.position.z=Math.cos(s)*Math.cos(o)*n,e.lookAt(new THREE.Vector3(0,0,0))}var n=20,o=0,s=0,a=!1;$(t.domElement).on("mousedown",function(t){a=!0}).on("wheel",function(t){var e=t.originalEvent;e.preventDefault(),n=THREE.Math.clamp(n-e.wheelDelta,1,i),r()}),$(window).on("mouseup",function(t){a=!1}).on("mousemove",function(t){var e=t.originalEvent;a===!0&&(o=(o-e.webkitMovementX/100)%(2*Math.PI),s=THREE.Math.clamp(s+e.webkitMovementY/100,-Math.PI/2,Math.PI/2),r())}),r()}var D3D={version:"0.1",website:"http://www.doodle3d.com/",contact:"develop@doodle3d.com"};THREE.Vector2.prototype.normal=function(){"use strict";var t=this.y,e=-this.x;return this.set(t,e)},Array.prototype.clone=function(){"use strict";for(var t=[],e=0;e0&&this.printer.status.buffered_lines+this.batchSize<=this.maxBufferedLines?this.printBatch():this.updateState()},D3D.Box.prototype.updateState=function(){"use strict";var t=this;this.getInfoStatus(function(e){t.printer.status=e,void 0!==t.onupdate&&t.onupdate(e),t.update()})},D3D.Box.prototype.print=function(t){"use strict";for(this.currentBatch=0,t=t.clone();t.length>0;){var e=t.splice(0,Math.min(this.batchSize,t.length));this.printBatches.push(e)}return this},D3D.Box.prototype.printBatch=function(){"use strict";var t=this,e=this.printBatches.shift();this.setPrinterPrint({start:0===this.currentBatch?!0:!1,first:0===this.currentBatch?!0:!1,gcode:e.join("\n")},function(e){console.log("batch sent: "+t.currentBatch,e),t.printBatches.length>0&&t.currentBatch++,t.updateState()})},D3D.Box.prototype.stopPrint=function(){"use strict";this.printBatches=[],this.currentBatch=0;var t=["M107 ;fan off","G91 ;relative positioning","G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure","G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more","G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way","M84 ;disable axes / steppers","G90 ;absolute positioning","M104 S180",";M140 S70","M117 Done ;display message (20 characters to clear whole screen)"];return this.setPrinterStop({gcode:t.join("\n")},function(t){console.log("Printer stop command sent")}),this},D3D.Box.prototype.getConfig=function(t,e){"use strict";return getAPI(this.api+"config/?"+t.join("=&")+"=",e),this},D3D.Box.prototype.getConfigAll=function(t){"use strict";return getAPI(this.api+"config/all",t),this},D3D.Box.prototype.setConfig=function(t,e){"use strict";var i=this;return sendAPI(this.api+"config",t,function(r){for(var n in r.validation)"ok"!==r.validation[n]&&delete t[n];i.updateConfig(t),i.printer.updateConfig(t),void 0!==e&&e(r)}),this},D3D.Box.prototype.getInfo=function(t){"use strict";return getAPI(this.api+"info",t),this},D3D.Box.prototype.getInfoStatus=function(t){"use strict";return getAPI(this.api+"info/status",t),this},D3D.Box.prototype.downloadInfoLogFiles=function(){"use strict";window.location=this.api+"info/logfiles"},D3D.Box.prototype.getInfoAcces=function(t){"use strict";return getAPI(this.api+"info/access",t),this},D3D.Box.prototype.getNetworkScan=function(t){"use strict";return getAPI(this.api+"network/scan",t),this},D3D.Box.prototype.getNetworkKnown=function(t){"use strict";return getAPI(this.api+"network/known",t),this},D3D.Box.prototype.getNetworkStatus=function(t){"use strict";return getAPI(this.api+"network/status",t),this},D3D.Box.prototype.setNetworkAssosiate=function(t,e){"use strict";return sendAPI(this.api+"network/associate",t,e),this},D3D.Box.prototype.setNetworkDisassosiate=function(t){"use strict";return sendAPI(this.api+"network/disassociate",{},t),this},D3D.Box.prototype.setNetworkOpenAP=function(t){"use strict";return sendAPI(this.api+"network/openap",{},t),this},D3D.Box.prototype.setNetworkRemove=function(t,e){"use strict";return sendAPI(this.api+"network/remove",{ssid:t},e),this},D3D.Box.prototype.getNetworkSignin=function(t){"use strict";return getAPI(this.api+"network/signin",t),this},D3D.Box.prototype.getNetworkAlive=function(t){"use strict";return getAPI(this.api+"network/alive",t),this},D3D.Box.prototype.getPrinterTemperature=function(t){"use strict";return getAPI(this.api+"printer/temperature",t),this},D3D.Box.prototype.getPrinterProgress=function(t){"use strict";return getAPI(this.api+"printer/progress",t),this},D3D.Box.prototype.getPrinterState=function(t){"use strict";return getAPI(this.api+"printer/state",t),this},D3D.Box.prototype.getPrinterListAll=function(t){"use strict";return getAPI(this.api+"printer/listall",t),this},D3D.Box.prototype.setPrinterHeatup=function(t){"use strict";return sendAPI(this.api+"printer/heatup",{},t),this},D3D.Box.prototype.setPrinterPrint=function(t,e){"use strict";return sendAPI(this.api+"printer/print",t,e),this},D3D.Box.prototype.setPrinterStop=function(t,e){"use strict";return sendAPI(this.api+"printer/stop",t,e),this},D3D.Box.prototype.getSketch=function(t,e){"use strict";return getAPI(this.api+"sketch/?id="+t,e),this},D3D.Box.prototype.setSketch=function(t,e){"use strict";return sendAPI(this.api+"sketch",{data:t},e),this},D3D.Box.prototype.getSketchStatus=function(t){"use strict";return getAPI(this.api+"sketch/status",t),this},D3D.Box.prototype.setSketchClear=function(t){"use strict";return sendAPI(this.api+"sketch/clear",t),this},D3D.Box.prototype.getSystemVersions=function(t){"use strict";return getAPI(this.api+"system/fwversions",t),this},D3D.Box.prototype.getUpdateStatus=function(t){"use strict";return getAPI(this.api+"update/status",t),this},D3D.Box.prototype.setUpdateDownload=function(t){"use strict";return sendAPI(this.api+"update/download",{},t),this},D3D.Box.prototype.setUpdateInstall=function(t){"use strict";return sendAPI(this.api+"update/install",{},t),this},D3D.Box.prototype.setUpdateClear=function(t){"use strict";return sendAPI(this.api+"update/clear",{},t),this},D3D.Printer=function(t){"use strict";this.status={},this.config={},this.updateConfig(t)},D3D.Printer.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("printer")&&(this.config[e]=t[e]);return this},D3D.Printer.prototype.getStartCode=function(){"use strict";var t=this.config["printer.startcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.getEndCode=function(){"use strict";var t=this.config["printer.endcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.subsituteVariables=function(t){"use strict";var e=this.config["printer.temperature"],i=this.config["printer.bed.temperature"],r=this.config["printer.heatup.temperature"],n=this.config["printer.heatup.bed.temperature"],o=this.config["printer.type"],s=this.config["printer.heatedbed"];switch(o){case"makerbot_replicator2":o="r2";break;case"makerbot_replicator2x":o="r2x";break;case"makerbot_thingomatic":o="t6";break;case"makerbot_generic":o="r2";break;case"_3Dison_plus":o="r2"}var a=s?"":";";return t=t.replace(/{printingTemp}/gi,e),t=t.replace(/{printingBedTemp}/gi,i),t=t.replace(/{preheatTemp}/gi,r),t=t.replace(/{preheatBedTemp}/gi,n),t=t.replace(/{printerType}/gi,o),t=t.replace(/{if heatedBed}/gi,a)},D3D.Slicer=function(){"use strict";this.lines=[]},D3D.Slicer.prototype.setGeometry=function(t){"use strict";var e=t.geometry.clone();return e.mergeVertices(),e.applyMatrix(t.matrix),e instanceof THREE.BufferGeometry&&(e=(new THREE.Geometry).fromBufferGeometry(e)),this.geometry=e,this.createLines(),this},D3D.Slicer.prototype.createLines=function(){"use strict";function t(t,r){var n=e[t+"_"+r]||e[r+"_"+t];return void 0===n&&(n=i.lines.length,e[t+"_"+r]=n,i.lines.push({line:new THREE.Line3(i.geometry.vertices[t],i.geometry.vertices[r]),connects:[],normals:[]})),n}this.lines=[];for(var e={},i=this,r=0;r=a;a++)a>=0&&(void 0===i[a]&&(i[a]=[]),i[a].push(r));for(var p=[],c=1;c0)break;f=-1}else f=-1}v.length>0&&m.push(v)}}if(!(m.length>0))break;p.push(m)}return p},D3D.Slicer.prototype.getInset=function(t,e){"use strict";var i=new ClipperLib.Paths,r=new ClipperLib.ClipperOffset(1,1);return r.AddPaths(t,ClipperLib.JoinType.jtRound,ClipperLib.EndType.etClosedPolygon),r.Execute(i,-e),i},D3D.Slicer.prototype.getFillTemplate=function(t,e,i,r){"use strict";var n=new ClipperLib.Paths;if(i)for(var o=0;t>=o;o+=e)n.push([{X:o,Y:0},{X:o,Y:t}]);if(r)for(var o=0;t>=o;o+=e)n.push([{X:0,Y:o},{X:t,Y:o}]);return n},D3D.Slicer.prototype.slicesToData=function(t,e){"use strict";for(var i=100,r=e.config["printer.layerHeight"]*i,n=e.config["printer.dimensions.z"]*i,o=e.config["printer.wallThickness"]*i,s=e.config["printer.shellThickness"]*i,a=e.config["printer.fillSize"]*i,p=(e.config["printer.brimOffset"]*i,[]),c=this.getFillTemplate(n,a,!0,!0),u=0;ud;d+=o){var g=this.getInset(h,d);f=f.concat(g)}for(var D=g||h,y=!1,d=1;s/r>d;d++){var m=ClipperLib.JS.Clone(t[u+d]);if(ClipperLib.JS.ScaleUpPaths(m,i),0===m.length||y&&0===y.length){y=[];break}if(y===!1)y=m;else{var v=new ClipperLib.Clipper,P=new ClipperLib.Paths;v.AddPaths(m,ClipperLib.PolyType.ptSubject,!0),v.AddPaths(y,ClipperLib.PolyType.ptClip,!0),v.Execute(ClipperLib.ClipType.ctIntersection,P),y=P}}var b=new ClipperLib.Clipper,w=new ClipperLib.Paths;b.AddPaths(D,ClipperLib.PolyType.ptSubject,!0),b.AddPaths(y,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctDifference,w);var b=new ClipperLib.Clipper,x=new ClipperLib.Paths;b.AddPaths(D,ClipperLib.PolyType.ptSubject,!0),b.AddPaths(w,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctDifference,x);var C=[],b=new ClipperLib.Clipper,B=new ClipperLib.Paths;b.AddPaths(c,ClipperLib.PolyType.ptSubject,!1),b.AddPaths(x,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctIntersection,B),C=C.concat(B);var S=this.getFillTemplate(n,o,u%2===0,u%2===1),b=new ClipperLib.Clipper,T=new ClipperLib.Paths;b.AddPaths(S,ClipperLib.PolyType.ptSubject,!1),b.AddPaths(w,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctIntersection,T),C=C.concat(T),ClipperLib.JS.ScaleDownPaths(h,i),ClipperLib.JS.ScaleDownPaths(f,i),ClipperLib.JS.ScaleDownPaths(C,i),p.push({outerLayer:h,innerLayer:f,fill:C})}return p},D3D.Slicer.prototype.dataToGcode=function(t,e){"use strict";function i(t){for(var e=[],i=0;if&&l&&e.push(["G0","E"+(D-d).toFixed(3),"F"+(60*h).toFixed(3)].join(" ")),e.push(["G0","X"+a.X.toFixed(3)+" Y"+a.Y.toFixed(3)+" Z"+w,"F"+60*p].join(" ")),D>f&&l&&e.push(["G0","E"+D.toFixed(3),"F"+(60*h).toFixed(3)].join(" "));else{var c=(new THREE.Vector2).set(a.X,a.Y),g=(new THREE.Vector2).set(n.X,n.Y),P=c.distanceTo(g);D+=P*u*r/m*v,e.push(["G1","X"+a.X.toFixed(3)+" Y"+a.Y.toFixed(3)+" Z"+w,"F"+y,"E"+D.toFixed(3)].join(" "))}n=a}return e}for(var r=e.config["printer.layerHeight"],n=e.config["printer.speed"],o=e.config["printer.bottomLayerSpeed"],s=e.config["printer.firstLayerSlow"],a=e.config["printer.bottomFlowRate"],p=e.config["printer.travelSpeed"],c=e.config["printer.filamentThickness"],u=e.config["printer.wallThickness"],l=(e.config["printer.enableTraveling"],e.config["printer.retraction.enabled"]),h=e.config["printer.retraction.speed"],f=e.config["printer.retraction.minDistance"],d=e.config["printer.retraction.amount"],g=e.getStartCode(),D=0,y=s?(60*o).toFixed(3):(60*n).toFixed(3),m=Math.pow(c/2,2)*Math.PI,v=a,P=0;Pl;l++){var h=p[l%p.length];r(h.outerLayer,"red"),n(h.outerLayer,"green")}return c},D3D.Slicer.prototype.getGcode=function(t){"use strict";var e=t.config["printer.layerHeight"],i=t.config["printer.dimensions.z"],r=(new Date).getTime(),n=this.slice(i,e),o=(new Date).getTime();console.log("Slicing: "+(o-r)+"ms");var r=(new Date).getTime(),s=this.slicesToData(n,t),o=(new Date).getTime();console.log("Data: "+(o-r)+"ms");var r=(new Date).getTime(),a=this.dataToGcode(s,t),o=(new Date).getTime();return console.log("Gcode: "+(o-r)+"ms"),a}; \ No newline at end of file +function sendAPI(t,e,i){"use strict";$.ajax({url:t,type:"POST",data:e,dataType:"json",timeout:1e4,success:function(t){"success"===t.status?void 0!==i&&i(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),sendAPI(t,e,i)})}function getAPI(t,e){"use strict";$.ajax({url:t,dataType:"json",timeout:5e3,success:function(t){"success"===t.status?void 0!==e&&e(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),getAPI(t,e)})}function downloadFile(t,e){"use strict";$(document.createElement("a")).attr({download:t,href:"data:text/plain,"+e})[0].click()}function applyMouseControls(t,e,i,r){"use strict";function n(){e.position.set(Math.cos(a)*Math.sin(s)*o,Math.sin(a)*o,Math.cos(a)*Math.cos(s)*o).add(i),e.lookAt(i)}var o=20,s=0,a=0,p=!1;$(t.domElement).on("mousedown",function(t){p=!0}).on("wheel",function(t){var e=t.originalEvent;e.preventDefault(),o=THREE.Math.clamp(o-e.wheelDelta,1,r),n()}),$(window).on("mouseup",function(t){p=!1}).on("mousemove",function(t){var e=t.originalEvent;p===!0&&(s=(s-e.webkitMovementX/100)%(2*Math.PI),a=THREE.Math.clamp(a+e.webkitMovementY/100,-Math.PI/2,Math.PI/2),n())}),n()}var D3D={version:"0.1",website:"http://www.doodle3d.com/",contact:"develop@doodle3d.com"};THREE.Vector2.prototype.normal=function(){"use strict";var t=this.y,e=-this.x;return this.set(t,e)},Array.prototype.clone=function(){"use strict";for(var t=[],e=0;e0&&this.printer.status.buffered_lines+this.batchSize<=this.maxBufferedLines?this.printBatch():this.updateState()},D3D.Box.prototype.updateState=function(){"use strict";var t=this;this.getInfoStatus(function(e){t.printer.status=e,void 0!==t.onupdate&&t.onupdate(e),t.update()})},D3D.Box.prototype.print=function(t){"use strict";for(this.currentBatch=0,t=t.clone();t.length>0;){var e=t.splice(0,Math.min(this.batchSize,t.length));this.printBatches.push(e)}return this},D3D.Box.prototype.printBatch=function(){"use strict";var t=this,e=this.printBatches.shift();this.setPrinterPrint({start:0===this.currentBatch?!0:!1,first:0===this.currentBatch?!0:!1,gcode:e.join("\n")},function(e){console.log("batch sent: "+t.currentBatch,e),t.printBatches.length>0&&t.currentBatch++,t.updateState()})},D3D.Box.prototype.stopPrint=function(){"use strict";this.printBatches=[],this.currentBatch=0;var t=["M107 ;fan off","G91 ;relative positioning","G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure","G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more","G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way","M84 ;disable axes / steppers","G90 ;absolute positioning","M104 S180",";M140 S70","M117 Done ;display message (20 characters to clear whole screen)"];return this.setPrinterStop({gcode:t.join("\n")},function(t){console.log("Printer stop command sent")}),this},D3D.Box.prototype.getConfig=function(t,e){"use strict";return getAPI(this.api+"config/?"+t.join("=&")+"=",e),this},D3D.Box.prototype.getConfigAll=function(t){"use strict";return getAPI(this.api+"config/all",t),this},D3D.Box.prototype.setConfig=function(t,e){"use strict";var i=this;return sendAPI(this.api+"config",t,function(r){for(var n in r.validation)"ok"!==r.validation[n]&&delete t[n];i.updateConfig(t),i.printer.updateConfig(t),void 0!==e&&e(r)}),this},D3D.Box.prototype.getInfo=function(t){"use strict";return getAPI(this.api+"info",t),this},D3D.Box.prototype.getInfoStatus=function(t){"use strict";return getAPI(this.api+"info/status",t),this},D3D.Box.prototype.downloadInfoLogFiles=function(){"use strict";window.location=this.api+"info/logfiles"},D3D.Box.prototype.getInfoAcces=function(t){"use strict";return getAPI(this.api+"info/access",t),this},D3D.Box.prototype.getNetworkScan=function(t){"use strict";return getAPI(this.api+"network/scan",t),this},D3D.Box.prototype.getNetworkKnown=function(t){"use strict";return getAPI(this.api+"network/known",t),this},D3D.Box.prototype.getNetworkStatus=function(t){"use strict";return getAPI(this.api+"network/status",t),this},D3D.Box.prototype.setNetworkAssosiate=function(t,e){"use strict";return sendAPI(this.api+"network/associate",t,e),this},D3D.Box.prototype.setNetworkDisassosiate=function(t){"use strict";return sendAPI(this.api+"network/disassociate",{},t),this},D3D.Box.prototype.setNetworkOpenAP=function(t){"use strict";return sendAPI(this.api+"network/openap",{},t),this},D3D.Box.prototype.setNetworkRemove=function(t,e){"use strict";return sendAPI(this.api+"network/remove",{ssid:t},e),this},D3D.Box.prototype.getNetworkSignin=function(t){"use strict";return getAPI(this.api+"network/signin",t),this},D3D.Box.prototype.getNetworkAlive=function(t){"use strict";return getAPI(this.api+"network/alive",t),this},D3D.Box.prototype.getPrinterTemperature=function(t){"use strict";return getAPI(this.api+"printer/temperature",t),this},D3D.Box.prototype.getPrinterProgress=function(t){"use strict";return getAPI(this.api+"printer/progress",t),this},D3D.Box.prototype.getPrinterState=function(t){"use strict";return getAPI(this.api+"printer/state",t),this},D3D.Box.prototype.getPrinterListAll=function(t){"use strict";return getAPI(this.api+"printer/listall",t),this},D3D.Box.prototype.setPrinterHeatup=function(t){"use strict";return sendAPI(this.api+"printer/heatup",{},t),this},D3D.Box.prototype.setPrinterPrint=function(t,e){"use strict";return sendAPI(this.api+"printer/print",t,e),this},D3D.Box.prototype.setPrinterStop=function(t,e){"use strict";return sendAPI(this.api+"printer/stop",t,e),this},D3D.Box.prototype.getSketch=function(t,e){"use strict";return getAPI(this.api+"sketch/?id="+t,e),this},D3D.Box.prototype.setSketch=function(t,e){"use strict";return sendAPI(this.api+"sketch",{data:t},e),this},D3D.Box.prototype.getSketchStatus=function(t){"use strict";return getAPI(this.api+"sketch/status",t),this},D3D.Box.prototype.setSketchClear=function(t){"use strict";return sendAPI(this.api+"sketch/clear",t),this},D3D.Box.prototype.getSystemVersions=function(t){"use strict";return getAPI(this.api+"system/fwversions",t),this},D3D.Box.prototype.getUpdateStatus=function(t){"use strict";return getAPI(this.api+"update/status",t),this},D3D.Box.prototype.setUpdateDownload=function(t){"use strict";return sendAPI(this.api+"update/download",{},t),this},D3D.Box.prototype.setUpdateInstall=function(t){"use strict";return sendAPI(this.api+"update/install",{},t),this},D3D.Box.prototype.setUpdateClear=function(t){"use strict";return sendAPI(this.api+"update/clear",{},t),this},D3D.Printer=function(t){"use strict";this.status={},this.config={},this.updateConfig(t)},D3D.Printer.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("printer")&&(this.config[e]=t[e]);return this},D3D.Printer.prototype.getStartCode=function(){"use strict";var t=this.config["printer.startcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.getEndCode=function(){"use strict";var t=this.config["printer.endcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.subsituteVariables=function(t){"use strict";var e=this.config["printer.temperature"],i=this.config["printer.bed.temperature"],r=this.config["printer.heatup.temperature"],n=this.config["printer.heatup.bed.temperature"],o=this.config["printer.type"],s=this.config["printer.heatedbed"];switch(o){case"makerbot_replicator2":o="r2";break;case"makerbot_replicator2x":o="r2x";break;case"makerbot_thingomatic":o="t6";break;case"makerbot_generic":o="r2";break;case"_3Dison_plus":o="r2"}var a=s?"":";";return t=t.replace(/{printingTemp}/gi,e),t=t.replace(/{printingBedTemp}/gi,i),t=t.replace(/{preheatTemp}/gi,r),t=t.replace(/{preheatBedTemp}/gi,n),t=t.replace(/{printerType}/gi,o),t=t.replace(/{if heatedBed}/gi,a)},D3D.Slicer=function(){"use strict";this.lines=[]},D3D.Slicer.prototype.setMesh=function(t){"use strict";t.updateMatrix();var e=t.geometry.clone();return e.mergeVertices(),e.applyMatrix(t.matrix),e instanceof THREE.BufferGeometry&&(e=(new THREE.Geometry).fromBufferGeometry(e)),this.geometry=e,this.createLines(),this},D3D.Slicer.prototype.createLines=function(){"use strict";function t(t,r){var n=e[t+"_"+r]||e[r+"_"+t];return void 0===n&&(n=i.lines.length,e[t+"_"+r]=n,i.lines.push({line:new THREE.Line3(i.geometry.vertices[t],i.geometry.vertices[r]),connects:[],normals:[]})),n}this.lines=[];for(var e={},i=this,r=0;r=a;a++)a>=0&&(void 0===i[a]&&(i[a]=[]),i[a].push(r));for(var p=[],c=1;c0)break;f=-1}else f=-1}v.length>0&&m.push(v)}}if(!(m.length>0))break;p.push(m)}return p},D3D.Slicer.prototype.getInset=function(t,e){"use strict";var i=new ClipperLib.Paths,r=new ClipperLib.ClipperOffset(1,1);return r.AddPaths(t,ClipperLib.JoinType.jtRound,ClipperLib.EndType.etClosedPolygon),r.Execute(i,-e),i},D3D.Slicer.prototype.getFillTemplate=function(t,e,i,r){"use strict";var n=new ClipperLib.Paths;if(i)for(var o=0;t>=o;o+=e)n.push([{X:o,Y:0},{X:o,Y:t}]);if(r)for(var o=0;t>=o;o+=e)n.push([{X:0,Y:o},{X:t,Y:o}]);return n},D3D.Slicer.prototype.slicesToData=function(t,e){"use strict";for(var i=100,r=e.config["printer.layerHeight"]*i,n=e.config["printer.dimensions.z"]*i,o=e.config["printer.wallThickness"]*i,s=e.config["printer.shellThickness"]*i,a=e.config["printer.fillSize"]*i,p=(e.config["printer.brimOffset"]*i,[]),c=this.getFillTemplate(n,a,!0,!0),u=0;ud;d+=o){var g=this.getInset(h,d);f=f.concat(g)}for(var D=g||h,y=!1,d=1;s/r>d;d++){var m=ClipperLib.JS.Clone(t[u+d]);if(ClipperLib.JS.ScaleUpPaths(m,i),0===m.length||y&&0===y.length){y=[];break}if(y===!1)y=m;else{var v=new ClipperLib.Clipper,P=new ClipperLib.Paths;v.AddPaths(m,ClipperLib.PolyType.ptSubject,!0),v.AddPaths(y,ClipperLib.PolyType.ptClip,!0),v.Execute(ClipperLib.ClipType.ctIntersection,P),y=P}}var b=new ClipperLib.Clipper,w=new ClipperLib.Paths;b.AddPaths(D,ClipperLib.PolyType.ptSubject,!0),b.AddPaths(y,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctDifference,w);var b=new ClipperLib.Clipper,x=new ClipperLib.Paths;b.AddPaths(D,ClipperLib.PolyType.ptSubject,!0),b.AddPaths(w,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctDifference,x);var C=[],b=new ClipperLib.Clipper,B=new ClipperLib.Paths;b.AddPaths(c,ClipperLib.PolyType.ptSubject,!1),b.AddPaths(x,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctIntersection,B),C=C.concat(B);var S=this.getFillTemplate(n,o,u%2===0,u%2===1),b=new ClipperLib.Clipper,T=new ClipperLib.Paths;b.AddPaths(S,ClipperLib.PolyType.ptSubject,!1),b.AddPaths(w,ClipperLib.PolyType.ptClip,!0),b.Execute(ClipperLib.ClipType.ctIntersection,T),C=C.concat(T),ClipperLib.JS.ScaleDownPaths(h,i),ClipperLib.JS.ScaleDownPaths(f,i),ClipperLib.JS.ScaleDownPaths(C,i),p.push({outerLayer:h,innerLayer:f,fill:C})}return p},D3D.Slicer.prototype.dataToGcode=function(t,e){"use strict";function i(t){for(var e=[],i=0;if&&l&&e.push(["G0","E"+(D-d).toFixed(3),"F"+(60*h).toFixed(3)].join(" ")),e.push(["G0","X"+a.X.toFixed(3)+" Y"+a.Y.toFixed(3)+" Z"+w,"F"+60*p].join(" ")),D>f&&l&&e.push(["G0","E"+D.toFixed(3),"F"+(60*h).toFixed(3)].join(" "));else{var c=(new THREE.Vector2).set(a.X,a.Y),g=(new THREE.Vector2).set(n.X,n.Y),P=c.distanceTo(g);D+=P*u*r/m*v,e.push(["G1","X"+a.X.toFixed(3)+" Y"+a.Y.toFixed(3)+" Z"+w,"F"+y,"E"+D.toFixed(3)].join(" "))}n=a}return e}for(var r=e.config["printer.layerHeight"],n=e.config["printer.speed"],o=e.config["printer.bottomLayerSpeed"],s=e.config["printer.firstLayerSlow"],a=e.config["printer.bottomFlowRate"],p=e.config["printer.travelSpeed"],c=e.config["printer.filamentThickness"],u=e.config["printer.wallThickness"],l=(e.config["printer.enableTraveling"],e.config["printer.retraction.enabled"]),h=e.config["printer.retraction.speed"],f=e.config["printer.retraction.minDistance"],d=e.config["printer.retraction.amount"],g=e.getStartCode(),D=0,y=s?(60*o).toFixed(3):(60*n).toFixed(3),m=Math.pow(c/2,2)*Math.PI,v=a,P=0;Pl;l++){var h=p[l%p.length];r(h.outerLayer,"red"),r(h.innerLayer,"green"),r(h.fill,"blue"),n(h.outerLayer,"green")}return c},D3D.Slicer.prototype.getGcode=function(t){"use strict";var e=t.config["printer.layerHeight"],i=t.config["printer.dimensions.z"],r=(new Date).getTime(),n=this.slice(i,e),o=(new Date).getTime();console.log("Slicing: "+(o-r)+"ms");var r=(new Date).getTime(),s=this.slicesToData(n,t),o=(new Date).getTime();console.log("Data: "+(o-r)+"ms");var r=(new Date).getTime(),a=this.dataToGcode(s,t),o=(new Date).getTime();return console.log("Gcode: "+(o-r)+"ms"),a}; \ No newline at end of file diff --git a/slice_test.html b/slice_test.html index 1952e8e..ea88dd7 100644 --- a/slice_test.html +++ b/slice_test.html @@ -35,7 +35,7 @@ var printerConfig = { "printer.dimensions.x": 200, "printer.dimensions.y": 200, "printer.dimensions.z": 200, - "printer.enableTraveling": true, //wat is dit? + "printer.enableTraveling": true, //wat is dit? "printer.endcode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)", "printer.filamentThickness": 2.89, "printer.firstLayerSlow": true, @@ -43,7 +43,7 @@ var printerConfig = { "printer.heatup.bed.temperature": 70, "printer.heatup.enabled": true, "printer.heatup.temperature": 180, - "printer.layerHeight": 0.2, + "printer.layerHeight": 0.3, "printer.retraction.amount": 3, "printer.retraction.enabled": true, "printer.retraction.minDistance": 5, @@ -65,8 +65,8 @@ var printerConfig = { }; var printer = new D3D.Printer(printerConfig); -//var localIp = location.hash.substring(1); -//var doodleBox = new D3D.Box(localIp); +var localIp = location.hash.substring(1); +var doodleBox = new D3D.Box(localIp); //var printer = doodleBox.printer; var scene = new THREE.Scene(); @@ -76,16 +76,16 @@ renderer.setClearColor(0xffffff, 1); var camera = new THREE.PerspectiveCamera(75, renderer.domElement.width/renderer.domElement.height, 1, 10000); -applyMouseControls(renderer, camera, 1000); +applyMouseControls(renderer, camera, new THREE.Vector3(100, 0, 100), 1000); var geometry = (function () { "use strict"; var circle = new THREE.Shape(); - circle.absarc(0, 0, 10, 0, Math.PI*2, false); + circle.absarc(0, 0, 100, 0, Math.PI*2, false); var hole = new THREE.Path(); - hole.absarc(0, 0, 5, 0, Math.PI*2, true ); + hole.absarc(0, 0, 15, 0, Math.PI*2, true ); circle.holes.push(hole); @@ -103,16 +103,18 @@ var geometry = (function () { })(); var material = new THREE.MeshBasicMaterial({color: 0x000000, wireframe: true}); -var geometry = new THREE.TorusGeometry(20, 10, 30, 30); -//var geometry = new THREE.BoxGeometry(20, 5, 20, 1, 1, 1); -var geometry = new THREE.SphereGeometry(10, 10, 10); +//var geometry = new THREE.TorusGeometry(20, 10, 30, 30); +var geometry = new THREE.BoxGeometry(20, 20, 20, 1, 1, 1); +//var geometry = new THREE.SphereGeometry(10, 10, 10); var mesh = new THREE.Mesh(geometry, material); +mesh.position.x = 100; +mesh.position.z = 100; scene.add(mesh); var canvas = document.getElementById("canvas"); var context = canvas.getContext("2d"); -var slicer = new D3D.Slicer().setGeometry(mesh); +var slicer = new D3D.Slicer().setMesh(mesh); gcode = slicer.getGcode(printer); @@ -139,7 +141,7 @@ loader.load('stl/overhang_test.stl', function (geometry) { var canvas = document.getElementById("canvas"); var context = canvas.getContext("2d"); - var slicer = new D3D.Slicer().setGeometry(geometry); + var slicer = new D3D.Slicer().setMesh(geometry); var layer = 149; var img = slicer.drawPaths(printer, layer, layer + 1); diff --git a/src/slicer.js b/src/slicer.js index f20d90f..7a7ae77 100644 --- a/src/slicer.js +++ b/src/slicer.js @@ -17,9 +17,11 @@ D3D.Slicer = function () { this.lines = []; }; -D3D.Slicer.prototype.setGeometry = function (mesh) { +D3D.Slicer.prototype.setMesh = function (mesh) { "use strict"; + mesh.updateMatrix(); + var geometry = mesh.geometry.clone(); geometry.mergeVertices(); geometry.applyMatrix(mesh.matrix); @@ -116,8 +118,7 @@ D3D.Slicer.prototype.slice = function (height, step) { var x = line.start.x * alpha + line.end.x * (1 - alpha); var z = line.start.z * alpha + line.end.z * (1 - alpha); - //remove +100 when implimenting good stucture for creating geometry is complete - intersections[index] = new THREE.Vector2(x + 100, z + 100); + intersections[index] = new THREE.Vector2(x, z); } var done = []; @@ -158,6 +159,28 @@ D3D.Slicer.prototype.slice = function (height, step) { } } + /* + for (var i = 0; i < shape.length; i ++) { + var point = shape[i]; + var previousPoint = shape[(i + shape.length - 1) % shape.length]; + var nextPoint = shape[(i + 1) % shape.length]; + + var point = new THREE.Vector2(point.X, point.Y); + var previousPoint = new THREE.Vector2(previousPoint.X, previousPoint.Y); + var nextPoint = new THREE.Vector2(nextPoint.X, nextPoint.Y); + //var lineLength = nextPoint.sub(previousPoint).length(); + + var normal = nextPoint.sub(previousPoint).normal().normalize(); + var distance = Math.abs(normal.dot(point.sub(previousPoint))); + + //something better for offset check + if (distance <= 0.01) { + shape.splice(i, 1); + i --; + } + } + */ + //think this check is not nescesary, always higher as 0 if (shape.length > 0) { slice.push(shape); @@ -478,8 +501,8 @@ D3D.Slicer.prototype.drawPaths = function (printer, min, max) { var slice = data[layer % data.length]; drawLines(slice.outerLayer, "red"); - //drawLines(slice.innerLayer, "green"); - //drawLines(slice.fill, "blue"); + drawLines(slice.innerLayer, "green"); + drawLines(slice.fill, "blue"); drawVertexes(slice.outerLayer, "green"); } diff --git a/src/utils.js b/src/utils.js index fdf4e97..fa005e1 100644 --- a/src/utils.js +++ b/src/utils.js @@ -90,7 +90,7 @@ Array.prototype.clone = function () { return array; }; -function applyMouseControls (renderer, camera, maxDistance) { +function applyMouseControls (renderer, camera, center, maxDistance) { "use strict"; //TODO //impliment touch controls @@ -102,10 +102,12 @@ function applyMouseControls (renderer, camera, maxDistance) { var moveCamera = false; function updateCamera () { - camera.position.x = Math.cos(rotY)*Math.sin(rotX)*distance; - camera.position.y = Math.sin(rotY)*distance; - camera.position.z = Math.cos(rotY)*Math.cos(rotX)*distance; - camera.lookAt(new THREE.Vector3(0, 0, 0)); + camera.position.set( + Math.cos(rotY)*Math.sin(rotX)*distance, + Math.sin(rotY)*distance, + Math.cos(rotY)*Math.cos(rotX)*distance + ).add(center); + camera.lookAt(center); } $(renderer.domElement).on("mousedown", function (e) {