From 61437295b9ae01f4e6e3be91dc4ea47c59079f98 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Fri, 10 Jul 2015 18:04:10 +0200
Subject: [PATCH] added support for non closing parts

---
 slice_test.html     |  30 ++++--
 src/slice.js        |  68 +++++++++-----
 src/slicer.js       | 218 +++++++++++++++++++++++++++++---------------
 webworker_test.html |   4 +-
 4 files changed, 218 insertions(+), 102 deletions(-)

diff --git a/slice_test.html b/slice_test.html
index f6c0270..277651f 100644
--- a/slice_test.html
+++ b/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;
 
diff --git a/src/slice.js b/src/slice.js
index 431c4a8..f782555 100644
--- a/src/slice.js
+++ b/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];
-			var bounds = part.outerLine.bounds();
+			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,22 +49,28 @@ D3D.Slice.prototype.optimizePaths = function (start) {
 		var part = this.parts.splice(closestPart, 1)[0];
 		parts.push(part);
 
-		if (part.outerLine.length > 0) {
-			part.outerLine = part.outerLine.optimizePath(start);
-			start = part.outerLine.lastPoint();
-		}
+		if (part.addFill) {
+			if (part.outerLine.length > 0) {
+				part.outerLine = part.outerLine.optimizePath(start);
+				start = part.outerLine.lastPoint();
+			}
 
-		for (var j = 0; j < part.innerLines.length; j ++) {
-			var innerLine = part.innerLines[j];
-			if (innerLine.length > 0) {
-				part.innerLines[j] = innerLine.optimizePath(start);
-				start = part.innerLines[j].lastPoint();
+			for (var j = 0; j < part.innerLines.length; j ++) {
+				var innerLine = part.innerLines[j];
+				if (innerLine.length > 0) {
+					part.innerLines[j] = innerLine.optimizePath(start);
+					start = part.innerLines[j].lastPoint();
+				}
+			}
+
+			if (part.fill.length > 0) {
+				part.fill = part.fill.optimizePath(start);
+				start = part.fill.lastPoint();
 			}
 		}
-
-		if (part.fill.length > 0) {
-			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 ++) {
-		outLines.join(this.parts[i].outerLine);
+		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';
 
-	this.parts.push({
-		intersect: intersect, 
-		innerLines: [],
-		outerLine: new D3D.Paths([], true), 
-		fill: new D3D.Paths([], false)
-	});
+	if (intersect.closed) {
+		this.parts.push({
+			intersect: intersect, 
+			innerLines: [],
+			outerLine: new D3D.Paths([], true), 
+			fill: new D3D.Paths([], false), 
+			addFill: true
+		});
+	}
+	else {
+		this.parts.push({
+			intersect: intersect, 
+			addFill: false
+		});
+	}
 };
\ No newline at end of file
diff --git a/src/slicer.js b/src/slicer.js
index c589ac8..03d5cec 100644
--- a/src/slicer.js
+++ b/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,32 +197,44 @@ 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);
+									var a = new THREE.Vector2(intersection.x, intersection.y);
+									var b = new THREE.Vector2(intersections[index].x, intersections[index].y);
 
-								var faceNormal = faceNormals[Math.floor(j/2)];
+									var faceNormal = faceNormals[Math.floor(j/2)];
 
-								if (a.distanceTo(b) < 0.0001 || faceNormal.length() === 0) {
-									done.push(index);
+									if (a.distanceTo(b) < 0.0001 || faceNormal.length() === 0) {
+										done.push(index);
 
-									connects = connects.concat(lines[index].connects);
-									faceNormals = faceNormals.concat(lines[index].normals);
-									index = -1;
-								}
-								else {
-									var normal = a.sub(b).normal().normalize();
-
-									if (normal.dot(faceNormal) > 0) {
-										break;
-									}
-									else {
+										connects = connects.concat(lines[index].connects);
+										faceNormals = faceNormals.concat(lines[index].normals);
 										index = -1;
 									}
+									else {
+										var normal = a.sub(b).normal().normalize();
+
+										if (normal.dot(faceNormal) > 0) {
+											break;
+										}
+										else {
+											index = -1;
+										}
+									}
+								}
+								else {
+									done.push(index);
+									index = -1;
 								}
 							}
 							else {
@@ -229,7 +243,49 @@ D3D.Slicer.prototype._slice = function (lines, printer) {
 						}
 					}
 
-					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];
-				var merge = false;
+				if (slicePart1.closed) {
+					var merge = false;
 
-				for (var j = 0; j < slice.parts.length; j ++) {
-					var slicePart2 = slice.parts[j].intersect;
+					for (var j = 0; j < slice.parts.length; j ++) {
+						var slicePart2 = slice.parts[j].intersect;
 
-					if (slicePart2.intersect(slicePart1).length > 0) {
-						slicePart2.join(slicePart1);
-						merge = true;
-						break;
+						if (slicePart2.closed && slicePart2.intersect(slicePart1).length > 0) {
+							slicePart2.join(slicePart1);
+							merge = true;
+							break;
+						}
+					}
+					if (!merge) {
+						slice.add(slicePart1);
 					}
 				}
-				if (!merge) {
-					slice.addIntersect(slicePart1);
+				else {
+					slice.add(slicePart1);
 				}
 			}
 
@@ -284,19 +345,21 @@ D3D.Slicer.prototype._generateInnerLines = function (slices, printer) {
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
-			var outerLine = part.intersect.clone().scaleUp(scale).offset(-nozzleRadius);
+			if (part.addFill) {
+				var outerLine = part.intersect.clone().scaleUp(scale).offset(-nozzleRadius);
 
-			if (outerLine.length > 0) {
-				part.outerLine = outerLine;
+				if (outerLine.length > 0) {
+					part.outerLine = outerLine;
 
-				for (var offset = nozzleDiameter; offset <= shellThickness; offset += nozzleDiameter) {
-					var innerLine = outerLine.offset(-offset);
+					for (var offset = nozzleDiameter; offset <= shellThickness; offset += nozzleDiameter) {
+						var innerLine = outerLine.offset(-offset);
 
-					if (innerLine.length > 0) {
-						part.innerLines.push(innerLine);
-					}
-					else {
-						break;
+						if (innerLine.length > 0) {
+							part.innerLines.push(innerLine);
+						}
+						else {
+							break;
+						}
 					}
 				}
 			}
@@ -340,40 +403,43 @@ D3D.Slicer.prototype._generateInfills = function (slices, printer) {
 
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
-			var outerLine = part.outerLine;
 
-			if (outerLine.length > 0) {
-				var inset = ((part.innerLines.length > 0) ? part.innerLines[part.innerLines.length - 1] : outerLine);
+			if (part.addFill) {
+				var outerLine = part.outerLine;
 
-				var fillArea = inset.offset(-nozzleRadius);
-				if (surroundingLayer) {
-					if (infillOverlap === 0) {
-						var highFillArea = fillArea.difference(surroundingLayer).intersect(fillArea);
+				if (outerLine.length > 0) {
+					var inset = ((part.innerLines.length > 0) ? part.innerLines[part.innerLines.length - 1] : outerLine);
+
+					var fillArea = inset.offset(-nozzleRadius);
+					if (surroundingLayer) {
+						if (infillOverlap === 0) {
+							var highFillArea = fillArea.difference(surroundingLayer).intersect(fillArea);
+						}
+						else {
+							var highFillArea = fillArea.difference(surroundingLayer).offset(infillOverlap).intersect(fillArea);
+						}
 					}
 					else {
-						var highFillArea = fillArea.difference(surroundingLayer).offset(infillOverlap).intersect(fillArea);
+						var highFillArea = fillArea;
 					}
-				}
-				else {
-					var highFillArea = fillArea;
-				}
-				var lowFillArea = fillArea.difference(highFillArea);
+					var lowFillArea = fillArea.difference(highFillArea);
 
-				var fill = new D3D.Paths([], false);
+					var fill = new D3D.Paths([], false);
 
-				if (lowFillArea.length > 0) {
-					var bounds = lowFillArea.bounds();
-					var lowFillTemplate = this._getFillTemplate(bounds, fillGridSize, true, true);
+					if (lowFillArea.length > 0) {
+						var bounds = lowFillArea.bounds();
+						var lowFillTemplate = this._getFillTemplate(bounds, fillGridSize, true, true);
 
-					part.fill.join(lowFillTemplate.intersect(lowFillArea));
-				}
+						part.fill.join(lowFillTemplate.intersect(lowFillArea));
+					}
 
-				if (highFillArea.length > 0) {
-					var bounds = highFillArea.bounds();
-					var even = (layer % 2 === 0);
-					var highFillTemplate = this._getFillTemplate(bounds, hightemplateSize, even, !even);
+					if (highFillArea.length > 0) {
+						var bounds = highFillArea.bounds();
+						var even = (layer % 2 === 0);
+						var highFillTemplate = this._getFillTemplate(bounds, hightemplateSize, even, !even);
 
-					part.fill.join(highFillTemplate.intersect(highFillArea));
+						part.fill.join(highFillTemplate.intersect(highFillArea));
+					}
 				}
 			}
 		}
@@ -471,12 +537,14 @@ D3D.Slicer.prototype._optimizePaths = function (slices, printer) {
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
-			part.outerLine.scaleDown(scale);
-			for (var j = 0; j < part.innerLines.length; j ++) {
-				var innerLine = part.innerLines[j];
-				innerLine.scaleDown(scale);
+			if (part.addFill) {
+				part.outerLine.scaleDown(scale);
+				for (var j = 0; j < part.innerLines.length; j ++) {
+					var innerLine = part.innerLines[j];
+					innerLine.scaleDown(scale);
+				}
+				part.fill.scaleDown(scale);
 			}
-			part.fill.scaleDown(scale);
 		}
 
 		if (slice.support !== undefined) {
@@ -572,14 +640,20 @@ D3D.Slicer.prototype._slicesToGCode = function (slices, printer) {
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
-			pathToGCode(part.outerLine, false, true, "outerLine");
+			if (part.addFill) {
+				pathToGCode(part.outerLine, false, true, "outerLine");
 
-			for (var j = 0; j < part.innerLines.length; j ++) {
-				var innerLine = part.innerLines[j];
-				pathToGCode(innerLine, false, false, "innerLine");
+				for (var j = 0; j < part.innerLines.length; j ++) {
+					var innerLine = part.innerLines[j];
+					pathToGCode(innerLine, false, false, "innerLine");
+				}
+
+				pathToGCode(part.fill, true, false, "fill");
+			}
+			else {
+				var retract = !(slice.parts.length === 1 && slice.support === undefined);
+				pathToGCode(part.intersect, retract, retract, "outerLine");
 			}
-
-			pathToGCode(part.fill, true, false, "fill");
 		}
 
 		if (slice.support !== undefined) {
diff --git a/webworker_test.html b/webworker_test.html
index f9dc9e3..6a0f429 100644
--- a/webworker_test.html
+++ b/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']);