added support for non closing parts

slice_test.html

@@ -25,16 +25,16 @@ canvas {border: 1px solid black;}
 <canvas id="canvas" width="400" height="400"></canvas>
 
 <script>
-var USER_SETTINGS, PRINTER_SETTINGS, doodleBox, gcode;
+var USER_SETTINGS, PRINTER_SETTINGS, doodleBox, gcode, scene;
 
 function init () {
 	"use strict";
-	var scene = createScene();
+	scene = createScene();
 
 	var localIp = location.hash.substring(1);
-	//doodleBox = new D3D.Box(localIp);
+	doodleBox = new D3D.Box(localIp).init();
 
-	var printer = new D3D.Printer().updateConfig(USER_SETTINGS).updateConfig(PRINTER_SETTINGS["ultimaker"]);
+	var printer = new D3D.Printer().updateConfig(USER_SETTINGS).updateConfig(PRINTER_SETTINGS["ultimaker2go"]);
 
 	var loader = new THREE.STLLoader();
 	loader.load('models/pokemon/pikachu.stl', function (geometry) {
@@ -66,11 +66,29 @@ function init () {
 			return geometry;
 		})();
 		*/
-		var material = new THREE.MeshPhongMaterial({color: 0x00ff00, wireframe: false});
+
+		/*var path = [{x: 60, y: 40}, {x: 60, y: 50}, {x: 60, y: 60}, {x: 80, y: 60}, {x: 40, y: 40}, {x: 50, y: 40}, {x: 10, y: 60}];
+		var geometry = new THREE.Geometry();
+
+		for (var i = 0; i < path.length; i ++) {
+			var point = path[i];
+
+			geometry.vertices.push(new THREE.Vector3(point.x, 0, point.y));
+			geometry.vertices.push(new THREE.Vector3(point.x, 50, point.y));
+		}
+
+		for (var i = 0; i < path.length - 1; i ++) {
+			var base = i * 2;
+
+			geometry.faces.push(new THREE.Face3(base, base + 1, base + 2));
+			geometry.faces.push(new THREE.Face3(base + 3, base + 2, base + 1));
+		}*/
+
+		var material = new THREE.MeshPhongMaterial({color: 0x00ff00, wireframe: false, side: THREE.DoubleSide});
 		var mesh = new THREE.Mesh(geometry, material);
 		
 		mesh.rotation.x = -Math.PI/2;
-		mesh.scale.x = mesh.scale.y = mesh.scale.z = 1;
+		//mesh.scale.x = mesh.scale.y = mesh.scale.z = 1;
 		mesh.position.x = 60;
 		mesh.position.z = 60;
 

src/slice.js

@@ -26,7 +26,12 @@ D3D.Slice.prototype.optimizePaths = function (start) {
 
 		for (var i = 0; i < this.parts.length; i ++) {
 			var part = this.parts[i];
+			if (part.addFill) {
 				var bounds = part.outerLine.bounds();
+			}
+			else {
+				var bounds = part.intersect.bounds();
+			}
 
 			var top = bounds.top - start.y;
 			var bottom = start.y - bounds.bottom;
@@ -44,6 +49,7 @@ D3D.Slice.prototype.optimizePaths = function (start) {
 		var part = this.parts.splice(closestPart, 1)[0];
 		parts.push(part);
 
+		if (part.addFill) {
 			if (part.outerLine.length > 0) {
 				part.outerLine = part.outerLine.optimizePath(start);
 				start = part.outerLine.lastPoint();
@@ -61,6 +67,11 @@ D3D.Slice.prototype.optimizePaths = function (start) {
 				part.fill = part.fill.optimizePath(start);
 				start = part.fill.lastPoint();
 			}
+		}
+		else {
+			part.intersect.optimizePath(start);
+			start = part.intersect.lastPoint();
+		}
 
 	}
 
@@ -79,18 +90,31 @@ D3D.Slice.prototype.getOutline = function () {
 	var outLines = new D3D.Paths([], true);
 
 	for (var i = 0; i < this.parts.length; i ++) {
+		var part = this.parts[i];
+
+		if (part.addFill) {
 			outLines.join(this.parts[i].outerLine);
 		}
+	}
 
 	return outLines;
 };
-D3D.Slice.prototype.addIntersect = function (intersect) {
+D3D.Slice.prototype.add = function (intersect) {
 	'use strict';
 
+	if (intersect.closed) {
 		this.parts.push({
 			intersect: intersect, 
 			innerLines: [],
 			outerLine: new D3D.Paths([], true), 
-		fill: new D3D.Paths([], false)
+			fill: new D3D.Paths([], false), 
+			addFill: true
 		});
+	}
+	else {
+		this.parts.push({
+			intersect: intersect, 
+			addFill: false
+		});
+	}
 };

src/slicer.js

@@ -182,6 +182,8 @@ D3D.Slicer.prototype._slice = function (lines, printer) {
 			var sliceParts = [];
 			for (var i = 0; i < layerIntersections.length; i ++) {
 				var index = layerIntersections[i];
+				var firstPoint = index;
+				var closed = false;
 
 				if (done.indexOf(index) === -1) {
 					var shape = [];
@@ -195,10 +197,17 @@ D3D.Slicer.prototype._slice = function (lines, printer) {
 
 						var connects = lines[index].connects.clone();
 						var faceNormals = lines[index].normals.clone();
+
+						if (shape.length > 2 && connects.indexOf(firstPoint) !== -1) {
+							closed = true;
+							break;
+						}
+
 						for (var j = 0; j < connects.length; j ++) {
 							index = connects[j];
 
-							if (intersections[index] !== undefined && done.indexOf(index) === -1) {
+							if (done.indexOf(index) === -1) {
+								if (intersections[index] !== undefined) {
 
 									var a = new THREE.Vector2(intersection.x, intersection.y);
 									var b = new THREE.Vector2(intersections[index].x, intersections[index].y);
@@ -223,13 +232,60 @@ D3D.Slicer.prototype._slice = function (lines, printer) {
 										}
 									}
 								}
+								else {
+									done.push(index);
+									index = -1;
+								}
+							}
 							else {
 								index = -1;
 							}
 						}
 					}
 
-					var part = new D3D.Paths([shape]).clean(0.01);
+					if (!closed) {
+						var index = firstPoint;
+
+						while (index !== -1) {
+							if (index !== firstPoint) {
+								done.push(index);
+
+								var intersection = intersections[index];
+								console.log(intersection);
+								//uppercase X and Y because clipper vector
+								shape.unshift({X: intersection.x, Y: intersection.y});
+							}
+
+							var connects = lines[index].connects.clone();
+
+							for (var j = 0; j < connects.length; j ++) {
+								index = connects[j];
+
+								if (done.indexOf(index) === -1) {
+									if (intersections[index] !== undefined) {
+										if (a.distanceTo(b) < 0.0001) {
+											done.push(index);
+
+											connects = connects.concat(lines[index].connects);
+											index = -1;
+										}
+										else {
+											break;
+										}
+									}
+									else {
+										done.push(index);
+										index = -1;
+									}
+								}
+								else {
+									index = -1;
+								}
+							}
+						}
+					}
+
+					var part = new D3D.Paths([shape], closed).clean(0.01);
 					if (part.length > 0) {
 						sliceParts.push(part);
 					}
@@ -240,19 +296,24 @@ D3D.Slicer.prototype._slice = function (lines, printer) {
 
 			for (var i = 0; i < sliceParts.length; i ++) {
 				var slicePart1 = sliceParts[i];
+				if (slicePart1.closed) {
 					var merge = false;
 
 					for (var j = 0; j < slice.parts.length; j ++) {
 						var slicePart2 = slice.parts[j].intersect;
 
-					if (slicePart2.intersect(slicePart1).length > 0) {
+						if (slicePart2.closed && slicePart2.intersect(slicePart1).length > 0) {
 							slicePart2.join(slicePart1);
 							merge = true;
 							break;
 						}
 					}
 					if (!merge) {
-					slice.addIntersect(slicePart1);
+						slice.add(slicePart1);
+					}
+				}
+				else {
+					slice.add(slicePart1);
 				}
 			}
 
@@ -284,6 +345,7 @@ D3D.Slicer.prototype._generateInnerLines = function (slices, printer) {
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
+			if (part.addFill) {
 				var outerLine = part.intersect.clone().scaleUp(scale).offset(-nozzleRadius);
 
 				if (outerLine.length > 0) {
@@ -302,6 +364,7 @@ D3D.Slicer.prototype._generateInnerLines = function (slices, printer) {
 				}
 			}
 		}
+	}
 
 	this.progress.generatedInnerLines = true;
 	this._updateProgress(printer);
@@ -340,6 +403,8 @@ D3D.Slicer.prototype._generateInfills = function (slices, printer) {
 
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
+
+			if (part.addFill) {
 				var outerLine = part.outerLine;
 
 				if (outerLine.length > 0) {
@@ -378,6 +443,7 @@ D3D.Slicer.prototype._generateInfills = function (slices, printer) {
 				}
 			}
 		}
+	}
 
 	this.progress.generatedInfills = true;
 	this._updateProgress(printer);
@@ -471,6 +537,7 @@ D3D.Slicer.prototype._optimizePaths = function (slices, printer) {
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
+			if (part.addFill) {
 				part.outerLine.scaleDown(scale);
 				for (var j = 0; j < part.innerLines.length; j ++) {
 					var innerLine = part.innerLines[j];
@@ -478,6 +545,7 @@ D3D.Slicer.prototype._optimizePaths = function (slices, printer) {
 				}
 				part.fill.scaleDown(scale);
 			}
+		}
 
 		if (slice.support !== undefined) {
 			slice.support.scaleDown(scale);
@@ -572,6 +640,7 @@ D3D.Slicer.prototype._slicesToGCode = function (slices, printer) {
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
+			if (part.addFill) {
 				pathToGCode(part.outerLine, false, true, "outerLine");
 
 				for (var j = 0; j < part.innerLines.length; j ++) {
@@ -581,6 +650,11 @@ D3D.Slicer.prototype._slicesToGCode = function (slices, printer) {
 
 				pathToGCode(part.fill, true, false, "fill");
 			}
+			else {
+				var retract = !(slice.parts.length === 1 && slice.support === undefined);
+				pathToGCode(part.intersect, retract, retract, "outerLine");
+			}
+		}
 
 		if (slice.support !== undefined) {
 			pathToGCode(slice.support, true, true, "support");

webworker_test.html

@@ -47,7 +47,7 @@ function init () {
 	var scene = createScene();
 
 	var localIp = location.hash.substring(1);
-	doodleBox = new D3D.Box(localIp).init();
+	/*doodleBox = new D3D.Box(localIp).init();
 	doodleBox.onupdate = function (data) {
 		document.getElementById('state').innerHTML = data.state;
 		document.getElementById('bed_temp').innerHTML = data.bed;
@@ -58,7 +58,7 @@ function init () {
 		document.getElementById('buffered_lines').innerHTML = data.buffered_lines;
 		document.getElementById('total_lines').innerHTML = data.total_lines;
 		document.getElementById('print_batches').innerHTML = doodleBox._printBatches.length;
-	};
+	};*/
 
 	printer = new D3D.Printer().updateConfig(USER_SETTINGS).updateConfig(PRINTER_SETTINGS['ultimaker2go']);