fixed spelling errors

index.html

@@ -31,7 +31,7 @@ $(document).ready(function () {
 
 		var slice = $("<li class='hidden'><a href='slice_test.html#" + localip + "'>" + name + "</a></li>");
 		var webworker = $("<li class='hidden'><a href='webworker_test.html#" + localip + "'>" + name + "</a></li>");
-		var editor = $("<li class='hidden'><a href='three.js-master/editor_viewer#" + localip + "'>" + name + "</a></li>");
+		var editor = $("<li class='hidden'><a href='three.js-master/editor_slicer#" + localip + "'>" + name + "</a></li>");
 		
 		listSliceTest.append(slice);
 		listSliceWebworker.append(webworker);

settings/user_settings.json

@@ -4,16 +4,16 @@
 	"topThickness": 0.8, 
 	"shellThickness": 0.4, 
 	"brimOffset": 5.0, 
-	"fillGritSize": 5.0, 
+	"fillGridSize": 5.0, 
 	"travelSpeed": 200.0, 
 	"retractionAmount": 3.0, 
 	"retractionEnabled": true, 
 	"retractionSpeed": 50.0, 
 	"retractionMinDistance": 0.0, 
-	"supportAccaptanceMargin": 1.5, 
+	"supportAcceptanceMargin": 1.5, 
-	"supportDistanceY": 0.4, 
+	"supportDistanceY": 0.2, 
 	"supportUse": true, 
-	"supportGritSize": 6.0, 
+	"supportGridSize": 6.0, 
 	"supportMargin": 2.0,  
 	"supportPlateSize": 4.0, 
 	"outerLine": {

src/slicer.js

@@ -134,106 +134,109 @@ D3D.Slicer.prototype.slice = function (layerHeight, height) {
 	for (var layer = 0; layer < layersIntersections.length; layer ++) {
 		var layerIntersections = layersIntersections[layer];
 
-		var y = layer * layerHeight;
+		if (layerIntersections.length > 0) {
 
-		var intersections = [];
+			var y = layer * layerHeight;
-		for (var i = 0; i < layerIntersections.length; i ++) {
+
-			var index = layerIntersections[i];
+			var intersections = [];
-			var line = this.lines[index].line;
+			for (var i = 0; i < layerIntersections.length; i ++) {
+				var index = layerIntersections[i];
+				var line = this.lines[index].line;
+
+				if (line.start.y === line.end.y) {
+					var x = line.start.x;
+					var z = line.start.z;
+				}
+				else {
+					var alpha = (y - line.start.y) / (line.end.y - line.start.y);
+					var x = line.end.x * alpha + line.start.x * (1 - alpha);
+					var z = line.end.z * alpha + line.start.z * (1 - alpha);
+				}
+				intersections[index] = new THREE.Vector2(z, x);
 
-			if (line.start.y === line.end.y) {
-				var x = line.start.x;
-				var z = line.start.z;
 			}
-			else {
-				var alpha = (y - line.start.y) / (line.end.y - line.start.y);
-				var x = line.end.x * alpha + line.start.x * (1 - alpha);
-				var z = line.end.z * alpha + line.start.z * (1 - alpha);
-			}
-			intersections[index] = new THREE.Vector2(z, x);
 
-		}
+			var done = [];
+			var sliceParts = [];
+			for (var i = 0; i < layerIntersections.length; i ++) {
+				var index = layerIntersections[i];
 
-		var done = [];
+				if (done.indexOf(index) === -1) {
-		var sliceParts = [];
+					var shape = [];
-		for (var i = 0; i < layerIntersections.length; i ++) {
-			var index = layerIntersections[i];
 
-			if (done.indexOf(index) === -1) {
+					while (index !== -1) {
-				var shape = [];
+						var intersection = intersections[index];
+						shape.push({X: intersection.x, Y: intersection.y});
 
-				while (index !== -1) {
+						var connects = this.lines[index].connects;
-					var intersection = intersections[index];
+						var faceNormals = this.lines[index].normals;
-					shape.push({X: intersection.x, Y: intersection.y});
+						for (var j = 0; j < connects.length; j ++) {
+							index = connects[j];
 
-					var connects = this.lines[index].connects;
+							if (intersections[index] !== undefined && done.indexOf(index) === -1) {
-					var faceNormals = this.lines[index].normals;
+								done.push(index);
-					for (var j = 0; j < connects.length; j ++) {
-						index = connects[j];
 
-						if (intersections[index] !== undefined && done.indexOf(index) === -1) {
+								var a = new THREE.Vector2(intersection.x, intersection.y);
-							done.push(index);
+								var b = intersections[index];
 
-							var a = new THREE.Vector2(intersection.x, intersection.y);
+								var faceNormal = faceNormals[Math.floor(j/2)];
-							var b = intersections[index];
 
-							var faceNormal = faceNormals[Math.floor(j/2)];
+								if (a.distanceTo(b) === 0 || faceNormal.equals(new THREE.Vector2(0, 0))) {
-
+									connects = connects.concat(this.lines[index].connects);
-							if (a.distanceTo(b) === 0 || faceNormal.equals(new THREE.Vector2(0, 0))) {
+									faceNormals = faceNormals.concat(this.lines[index].normals);
-								connects = connects.concat(this.lines[index].connects);
-								faceNormals = faceNormals.concat(this.lines[index].normals);
-								index = -1;
-							}
-							else {
-								var normal = a.sub(b).normal().normalize();
-
-								if (normal.dot(faceNormal) >= 0) {
-								//if (true) {
-									break;
-								}
-								else {
 									index = -1;
 								}
+								else {
+									var normal = a.sub(b).normal().normalize();
+
+									if (normal.dot(faceNormal) >= 0) {
+									//if (true) {
+										break;
+									}
+									else {
+										index = -1;
+									}
+								}
+							}
+							else {
+								index = -1;
 							}
 						}
-						else {
+					}
-							index = -1;
+
-						}
+					//think this check is not nescesary, always higher as 0
+					if (shape.length > 1) {
+						var part = new D3D.Paths([shape]).clean(0.01);
+						sliceParts.push(part);
 					}
 				}
+			}
 
-				//think this check is not nescesary, always higher as 0
+			var slice = new D3D.Slice();
-				if (shape.length > 0) {
+
-					var part = new D3D.Paths([shape]).clean(0.01);
+			for (var i = 0; i < sliceParts.length; i ++) {
-					sliceParts.push(part);
+				var slicePart1 = sliceParts[i];
+				var merge = false;
+
+				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 (!merge) {
+					slice.addIntersect(slicePart1);
 				}
 			}
+
+			slices.push(slice);
+
+			this.progress.sliceLayer = layer;
+			this.updateProgress();
 		}
-
-		var slice = new D3D.Slice();
-
-		for (var i = 0; i < sliceParts.length; i ++) {
-			var slicePart1 = sliceParts[i];
-			var merge = false;
-
-			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 (!merge) {
-				slice.addIntersect(slicePart1);
-			}
-		}
-
-		slices.push(slice);
-
-		this.progress.sliceLayer = layer;
-		this.updateProgress();
 	}
 	return slices;
 };
@@ -245,13 +248,13 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 	var layerHeight = printer.config["layerHeight"];
 	var nozzleDiameter = printer.config["nozzleDiameter"] * scale;
 	var shellThickness = printer.config["shellThickness"] * scale;
-	var fillGritSize = printer.config["fillGritSize"] * scale;
+	var fillGridSize = printer.config["fillGridSize"] * scale;
 	var brimOffset = printer.config["brimOffset"] * scale;
 	var bottomThickness = printer.config["bottomThickness"];
 	var topThickness = printer.config["topThickness"];
 	var useSupport = printer.config["supportUse"];
-	var supportGritSize = printer.config["supportGritSize"] * scale;
+	var supportGridSize = printer.config["supportGridSize"] * scale;
-	var supportAccaptanceMargin = printer.config["supportAccaptanceMargin"] * scale;
+	var supportAcceptanceMargin = printer.config["supportAcceptanceMargin"] * scale;
 	var supportMargin = printer.config["supportMargin"] * scale;
 	var plateSize = printer.config["supportPlateSize"] * scale;
 	var supportDistanceY = printer.config["supportDistanceY"];
@@ -266,12 +269,16 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 		top: this.geometry.boundingBox.min.x * scale, 
 		right: this.geometry.boundingBox.max.z * scale, 
 		bottom: this.geometry.boundingBox.max.x * scale
-	}, fillGritSize, true, true);
+	}, fillGridSize, true, true);
 
 	console.log("generating outer lines and inner lines");
 	for (var layer = 0; layer < slices.length; layer ++) {
 		var slice = slices[layer];
 
+		if (layer === 0) {
+			console.log(slice.parts[0]);
+		}
+
 		for (var i = 0; i < slice.parts.length; i ++) {
 			var part = slice.parts[i];
 
@@ -340,7 +347,7 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 			top: this.geometry.boundingBox.min.x * scale, 
 			right: this.geometry.boundingBox.max.z * scale, 
 			bottom: this.geometry.boundingBox.max.x * scale
-		}, supportGritSize, true, true);
+		}, supportGridSize, true, true);
 
 		var supportAreas = new D3D.Paths([], true);
 
@@ -375,7 +382,7 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 				var slicePart = slice.parts[i];
 				var outerLine = slicePart.outerLine;
 
-				var overlap = supportSkin.offset(supportAccaptanceMargin).intersect(outerLine);
+				var overlap = supportSkin.offset(supportAcceptanceMargin).intersect(outerLine);
 				var overhang = outerLine.difference(overlap);
 
 				if (overlap.length === 0 || overhang.length > 0) {
@@ -384,7 +391,7 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 					//supportAreas = supportAreas.union(overhang);
 
-					supportAreas = supportAreas.union(overhang.offset(supportAccaptanceMargin).intersect(outerLine));
+					supportAreas = supportAreas.union(overhang.offset(supportAcceptanceMargin).intersect(outerLine));
 				}
 			}
 		}

src/slicerworker.js

@@ -1,7 +1,7 @@
 D3D.SlicerWorker = function () {
 	'use strict';
 
-	this.worker = new Worker('../../webworker/worker.js');
+	this.worker = new Worker(window.location.origin + '/webworker/worker.js');
 
 	var scope = this;
 	this.worker.addEventListener('message', function (event) {

three.js-master/editor_slicer/js/Sidebar.Geometry.Modifiers.js

@@ -65,6 +65,19 @@ Sidebar.Geometry.Modifiers = function ( signals, object ) {
 
 	}
 
+	var button = new UI.Button( 'Snap to grid' );
+	button.onClick( function () {
+
+		geometry.computeBoundingBox();
+
+		object.position.y = -geometry.boundingBox.min.y;
+		
+		object.updateMatrix();
+
+	} );
+
+	container.add( button );
+
 	//
 
 	return container;

three.js-master/editor_slicer/js/Sidebar.Slicer.js

@@ -125,7 +125,6 @@ Sidebar.Slicer = function ( editor ) {
 		var slicer = new D3D.SlicerWorker();
 
 		slicer.onprogress = function (_progress) {
-			console.log(_progress);
 			progress.setValue(Math.round(_progress.procent * 100) + "%");
 		};
 		slicer.onfinish = function (gcode) {

webworker_test.html

@@ -99,8 +99,8 @@ function init () {
 		var mesh = new THREE.Mesh(geometry, material);
 
 		mesh.rotation.x = -Math.PI/2;
-		mesh.scale.x = mesh.scale.y = mesh.scale.z = 0.5;
+		mesh.scale.x = mesh.scale.y = mesh.scale.z = 1;
-		mesh.position.y = -0.1;
+		//mesh.position.y = -0.1;
 		mesh.position.x = 60;
 		mesh.position.z = 60;