mirror of
https://github.com/Doodle3D/Doodle3D-Slicer.git
synced 2024-12-23 03:23:48 +01:00
created save space
This commit is contained in:
parent
5050bc0e40
commit
2f3f60a921
@ -5,6 +5,7 @@
|
|||||||
<!--<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>-->
|
<!--<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>-->
|
||||||
<script src="library/jquery.js"></script>
|
<script src="library/jquery.js"></script>
|
||||||
<script src="library/three.js"></script>
|
<script src="library/three.js"></script>
|
||||||
|
<script src="library/cal.js"></script>
|
||||||
|
|
||||||
<script src="src/utils.js"></script>
|
<script src="src/utils.js"></script>
|
||||||
<script src="src/box.js"></script>
|
<script src="src/box.js"></script>
|
||||||
@ -14,10 +15,13 @@
|
|||||||
<script src="gcode/testgcode.js"></script>
|
<script src="gcode/testgcode.js"></script>
|
||||||
<script src="gcode/easterbunny.js"></script>
|
<script src="gcode/easterbunny.js"></script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
canvas {border: 1px solid black;}
|
||||||
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<canvas id="3d-preview" height="480" width="720"></canvas>
|
<canvas id="3d-preview" height="400" width="400"></canvas>
|
||||||
<canvas id="canvas" width="200" height="200"></canvas>
|
<canvas id="canvas" width="400" height="400"></canvas>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var localIp = location.hash.substring(1);
|
var localIp = location.hash.substring(1);
|
||||||
@ -26,7 +30,7 @@ var doodleBox = new D3D.Box(localIp);
|
|||||||
doodleBox.onload = function () {
|
doodleBox.onload = function () {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var gcode = slicer.getGcode(doodleBox.printer);
|
/*var gcode = slicer.getGcode(doodleBox.printer);
|
||||||
|
|
||||||
var print = $(document.createElement("a")).html("Print").on("click", function () {
|
var print = $(document.createElement("a")).html("Print").on("click", function () {
|
||||||
doodleBox.print(gcode);
|
doodleBox.print(gcode);
|
||||||
@ -38,7 +42,7 @@ doodleBox.onload = function () {
|
|||||||
download: "test.gcode",
|
download: "test.gcode",
|
||||||
href: "data:text/plain," + encodeURIComponent(gcode.join("\n"))
|
href: "data:text/plain," + encodeURIComponent(gcode.join("\n"))
|
||||||
});
|
});
|
||||||
$("body").append(print, stop, download);
|
$("body").append(print, stop, download);*/
|
||||||
};
|
};
|
||||||
|
|
||||||
var scene = new THREE.Scene();
|
var scene = new THREE.Scene();
|
||||||
@ -61,24 +65,41 @@ var slicer = new D3D.Slicer().setGeometry(geometry);
|
|||||||
//var slices = slicer.slice(200, 0.2);
|
//var slices = slicer.slice(200, 0.2);
|
||||||
var slices = slicer.slice(1, 1);
|
var slices = slicer.slice(1, 1);
|
||||||
|
|
||||||
var canvas = document.getElementById("canvas");
|
CAL.Scene.setCanvas(document.getElementById("canvas"));
|
||||||
var context = canvas.getContext("2d");
|
|
||||||
|
|
||||||
|
var shapes = [];
|
||||||
|
|
||||||
for (var layer = 0; layer < slices.length; layer ++) {
|
for (var layer = 0; layer < slices.length; layer ++) {
|
||||||
var slice = slices[layer];
|
var slice = slices[layer];
|
||||||
|
|
||||||
for (var i = 0; i < slice.length; i ++) {
|
for (var i = 0; i < slice.length; i ++) {
|
||||||
var shape = slice[i];
|
var shape = new CAL.Shape({shapeColor: false});
|
||||||
|
CAL.Scene.add(shape);
|
||||||
|
shapes.push(shape);
|
||||||
|
|
||||||
context.beginPath();
|
for (var j = 0; j < slice[i].length; j ++) {
|
||||||
for (var j = 0; j <= shape.length; j ++) {
|
var point = slice[i][j];
|
||||||
var point = shape[(j % shape.length)];
|
shape.addPoint(new CAL.Vector((point.x-100) * 5 + 200, (point.y-100) * 5 + 200));
|
||||||
|
|
||||||
context.lineTo((point.x-100) * 3 + 100, (point.y-100) * 3 + 100);
|
|
||||||
}
|
}
|
||||||
//context.closePath();
|
}
|
||||||
context.strokeStyle = "rgb(" + Math.round(Math.random()*255) + ", " + Math.round(Math.random()*255) + ", " + Math.round(Math.random()*255) + ")";
|
}
|
||||||
context.stroke();
|
|
||||||
|
CAL.Scene.draw();
|
||||||
|
|
||||||
|
CAL.Scene.context.strokeStyle = "#FF0000";
|
||||||
|
|
||||||
|
|
||||||
|
for (var i = 0; i < shapes.length; i ++) {
|
||||||
|
var shape = shapes[i];
|
||||||
|
|
||||||
|
console.log(shape.points.length);
|
||||||
|
|
||||||
|
for (var j = 0; j < shape.points.length; j ++) {
|
||||||
|
var normal = shape.getNormal(j).scale(20);
|
||||||
|
var point = shape.points[j];
|
||||||
|
|
||||||
|
normal.draw(CAL.Scene.context, point.x, point.y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
21
src/box.js
21
src/box.js
@ -64,25 +64,10 @@ D3D.Box.prototype.updateState = function () {
|
|||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
//que api calls so they don't overload the d3d box
|
//que api calls so they don't overload the d3d box
|
||||||
getAPI(this.api + "printer/state", function (data) {
|
getAPI(this.api + "info/status", function (data) {
|
||||||
self.printer.state = data.state;
|
self.printer.data = data;
|
||||||
|
|
||||||
if (data.state !== "connecting" && data.state !== "disconnected") {
|
self.update();
|
||||||
|
|
||||||
getAPI(self.api + "printer/temperature", function (data) {
|
|
||||||
self.printer.temperature = data;
|
|
||||||
|
|
||||||
getAPI(self.api + "printer/progress", function (data) {
|
|
||||||
self.printer.progress = data;
|
|
||||||
|
|
||||||
//finish updating state
|
|
||||||
self.update();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
self.update();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
D3D.Box.prototype.print = function (gcode) {
|
D3D.Box.prototype.print = function (gcode) {
|
||||||
|
@ -8,10 +8,8 @@
|
|||||||
D3D.Printer = function (config) {
|
D3D.Printer = function (config) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
this.state = "connecting";
|
this.data = {};
|
||||||
this.temperature = {};
|
|
||||||
this.progress = {};
|
|
||||||
|
|
||||||
for (var i in config) {
|
for (var i in config) {
|
||||||
if (i.indexOf("printer") === 0) {
|
if (i.indexOf("printer") === 0) {
|
||||||
this[i] = config[i];
|
this[i] = config[i];
|
||||||
|
@ -62,7 +62,7 @@ D3D.Slicer.prototype.createLines = function () {
|
|||||||
|
|
||||||
//set connecting lines (based on face)
|
//set connecting lines (based on face)
|
||||||
|
|
||||||
|
//something wrong here, 3 face can go in different direction
|
||||||
this.lines[a].connects.push(b, c);
|
this.lines[a].connects.push(b, c);
|
||||||
this.lines[b].connects.push(a, c);
|
this.lines[b].connects.push(a, c);
|
||||||
this.lines[c].connects.push(a, b);
|
this.lines[c].connects.push(a, b);
|
||||||
@ -81,6 +81,7 @@ D3D.Slicer.prototype.slice = function (height, step) {
|
|||||||
var plane = new THREE.Plane();
|
var plane = new THREE.Plane();
|
||||||
|
|
||||||
for (var z = 0; z < height; z += step) {
|
for (var z = 0; z < height; z += step) {
|
||||||
|
z += 1;
|
||||||
plane.set(new THREE.Vector3(0, -1, 0), z);
|
plane.set(new THREE.Vector3(0, -1, 0), z);
|
||||||
|
|
||||||
var slice = [];
|
var slice = [];
|
||||||
@ -121,8 +122,6 @@ D3D.Slicer.prototype.slice = function (height, step) {
|
|||||||
for (var j = 0; j < connects.length; j ++) {
|
for (var j = 0; j < connects.length; j ++) {
|
||||||
index = connects[j];
|
index = connects[j];
|
||||||
|
|
||||||
console.log(j, intersections[index]);
|
|
||||||
|
|
||||||
if (intersections[index] && done.indexOf(index) === -1) {
|
if (intersections[index] && done.indexOf(index) === -1) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -130,6 +129,8 @@ D3D.Slicer.prototype.slice = function (height, step) {
|
|||||||
index = -1;
|
index = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log(j);
|
||||||
}
|
}
|
||||||
|
|
||||||
//think this check is not nescesary, always higher as 0
|
//think this check is not nescesary, always higher as 0
|
||||||
|
Loading…
Reference in New Issue
Block a user