mirror of
https://github.com/Doodle3D/Doodle3D-Slicer.git
synced 2025-06-11 09:53:18 +02:00
added gcode class, removed gulp
gulp didn’t make any more sense to use because it is build modulair
This commit is contained in:
@ -1,53 +1,101 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html lang="en">
|
||||
<html lang='en'>
|
||||
<head>
|
||||
<script src="library/jquery.js"></script>
|
||||
<script src="library/three.js"></script>
|
||||
<script src="library/stl_loader.js"></script>
|
||||
<script src='library/jquery.js'></script>
|
||||
<script src='library/three.js'></script>
|
||||
<script src='library/stl_loader.js'></script>
|
||||
|
||||
<script src="src/utils.js"></script>
|
||||
<script src="src/box.js"></script>
|
||||
<script src="src/slicerworker.js"></script>
|
||||
<script src='src/utils.js'></script>
|
||||
<script src='src/box.js'></script>
|
||||
<script src='src/printer.js'></script>
|
||||
<script src='src/slicerworker.js'></script>
|
||||
|
||||
<title>Doedel Drie Dee || Webworker Test</title>
|
||||
<style>
|
||||
canvas {border: 1px solid black;}
|
||||
#progress {height: 20px; width: 200px; border: 1px solid black; overflow: hidden;}
|
||||
#progress-bar {height: 20px; background-color: lightblue; width: 0%;}
|
||||
#progress_bar {height: 20px; background-color: lightblue; width: 0%;}
|
||||
.block {border: 1px solid black; width: 400px; height: 400px; display: inline-block;}
|
||||
#start_print {display: none;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<canvas id="3d-preview" height="400" width="400"></canvas>
|
||||
<canvas id="canvas" width="400" height="400"></canvas>
|
||||
<div id="progress"><div id="progress-bar"></div></div>
|
||||
<canvas id='3d-preview' height='400' width='400'></canvas>
|
||||
<div class='block'>
|
||||
<p>State: <span id='state'></span></p>
|
||||
<p>Bed Temp: <span id='bed_temp'></span></p>
|
||||
<p>Bed Target Temp: <span id='bed_target_temp'></span></p>
|
||||
<p>Nozzle Temp: <span id='nozzle_temp'></span></p>
|
||||
<p>Nozzle Target Temp: <span id='nozzle_target_temp'></span></p>
|
||||
<p>Current Line: <span id='current_line'></span></p>
|
||||
<p>Buffered Lines: <span id='buffered_lines'></span></p>
|
||||
<p>Total Lines: <span id='total_lines'></span></p>
|
||||
<p>Batches To Send: <span id='print_batches'></span></p>
|
||||
<div id='progress'><div id='progress_bar'></div></div>
|
||||
<button id="start_print">Start Print</button>
|
||||
<button id="stop_print">Stop Print</button>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
var USER_SETTINGS, PRINTER_SETTINGS, doodleBox, gcode, slicerWorker;
|
||||
var USER_SETTINGS, PRINTER_SETTINGS, doodleBox, gcode, slicerWorker, printer;
|
||||
|
||||
function init () {
|
||||
"use strict";
|
||||
'use strict';
|
||||
var scene = createScene();
|
||||
|
||||
var localIp = location.hash.substring(1);
|
||||
doodleBox = new D3D.Box(localIp);
|
||||
|
||||
printer = new D3D.Printer().updateConfig(USER_SETTINGS).updateConfig(PRINTER_SETTINGS['ultimaker2go']);
|
||||
|
||||
doodleBox.onupdate = function (data) {
|
||||
|
||||
document.getElementById('state').innerHTML = data.state;
|
||||
document.getElementById('bed_temp').innerHTML = data.bed;
|
||||
document.getElementById('bed_target_temp').innerHTML = data.bed_target;
|
||||
document.getElementById('nozzle_temp').innerHTML = data.hotend;
|
||||
document.getElementById('nozzle_target_temp').innerHTML = data.hotend_target;
|
||||
document.getElementById('current_line').innerHTML = data.current_line;
|
||||
document.getElementById('buffered_lines').innerHTML = data.buffered_lines;
|
||||
document.getElementById('total_lines').innerHTML = data.total_lines;
|
||||
document.getElementById('print_batches').innerHTML = doodleBox.printBatches.length;
|
||||
};
|
||||
|
||||
document.getElementById('stop_print').onclick = function () {
|
||||
doodleBox.stopPrint(printer);
|
||||
};
|
||||
|
||||
var slicer = new D3D.SlicerWorker();
|
||||
|
||||
slicer.setSettings(USER_SETTINGS, PRINTER_SETTINGS["ultimaker"]);
|
||||
slicer.setSettings(USER_SETTINGS, PRINTER_SETTINGS['ultimaker2go']);
|
||||
|
||||
var progressBar = document.getElementById('progress_bar');
|
||||
slicer.onprogress = function (progress) {
|
||||
progressBar.style.width = progress.procent * 100 + '%';
|
||||
};
|
||||
slicer.onfinish = function (_gcode) {
|
||||
gcode = _gcode;
|
||||
var button = document.getElementById('start_print');
|
||||
button.style.display = 'initial';
|
||||
button.onclick = function () {
|
||||
doodleBox.print(gcode);
|
||||
};
|
||||
};
|
||||
|
||||
var loader = new THREE.STLLoader();
|
||||
loader.load("models/dom.stl", function (geometry) {
|
||||
//var geometry = new THREE.TorusGeometry(20, 10, 30, 30).clone();
|
||||
loader.load('models/pokemon/pikachu.stl', function (geometry) {
|
||||
var geometry = new THREE.TorusGeometry(20, 10, 30, 30).clone();
|
||||
|
||||
var material = new THREE.MeshPhongMaterial({color: 0x00ff00, wireframe: false});
|
||||
var mesh = new THREE.Mesh(geometry, material);
|
||||
|
||||
|
||||
mesh.rotation.x = -Math.PI/2;
|
||||
mesh.scale.x = mesh.scale.y = mesh.scale.z = 1;
|
||||
//mesh.position.y = -9.260265119962973e-17;
|
||||
mesh.position.x = 100;
|
||||
mesh.position.z = 100;
|
||||
mesh.scale.x = mesh.scale.y = mesh.scale.z = 0.5;
|
||||
mesh.position.y = -0.1;
|
||||
mesh.position.x = 60;
|
||||
mesh.position.z = 60;
|
||||
|
||||
scene.add(mesh);
|
||||
|
||||
@ -61,7 +109,7 @@ function init () {
|
||||
function createScene () {
|
||||
var scene = new THREE.Scene();
|
||||
|
||||
var renderer = new THREE.WebGLRenderer({canvas: document.getElementById("3d-preview"), antialias: true});
|
||||
var renderer = new THREE.WebGLRenderer({canvas: document.getElementById('3d-preview'), antialias: true});
|
||||
renderer.setClearColor(0xffffff, 1);
|
||||
|
||||
var camera = new THREE.PerspectiveCamera(75, renderer.domElement.width/renderer.domElement.height, 1, 10000);
|
||||
@ -73,7 +121,7 @@ function createScene () {
|
||||
var directionalLight = new THREE.PointLight(0xffffff, 0.5);
|
||||
camera.add(directionalLight);
|
||||
|
||||
applyMouseControls(renderer, camera, new THREE.Vector3(100, 0, 100), 1000);
|
||||
applyMouseControls(renderer, camera, new THREE.Vector3(50, 0, 50), 1000);
|
||||
|
||||
function applyMouseControls (renderer, camera, center, maxDistance) {
|
||||
var distance = 20;
|
||||
@ -90,9 +138,9 @@ function createScene () {
|
||||
camera.lookAt(center);
|
||||
}
|
||||
|
||||
$(renderer.domElement).on("mousedown", function (e) {
|
||||
$(renderer.domElement).on('mousedown', function (e) {
|
||||
moveCamera = true;
|
||||
}).on("wheel", function (e) {
|
||||
}).on('wheel', function (e) {
|
||||
var event = e.originalEvent;
|
||||
|
||||
event.preventDefault();
|
||||
@ -101,9 +149,9 @@ function createScene () {
|
||||
updateCamera();
|
||||
});
|
||||
|
||||
$(window).on("mouseup", function (e) {
|
||||
$(window).on('mouseup', function (e) {
|
||||
moveCamera = false;
|
||||
}).on("mousemove", function (e) {
|
||||
}).on('mousemove', function (e) {
|
||||
var event = e.originalEvent;
|
||||
|
||||
if (moveCamera === true) {
|
||||
@ -126,7 +174,7 @@ function createScene () {
|
||||
}
|
||||
|
||||
(function () {
|
||||
"use strict";
|
||||
'use strict';
|
||||
|
||||
var loadedItems = 0;
|
||||
function loaded () {
|
||||
@ -136,11 +184,11 @@ function createScene () {
|
||||
}
|
||||
}
|
||||
|
||||
loadSettings("settings/user_settings.json", function (data) {
|
||||
loadSettings('settings/user_settings.json', function (data) {
|
||||
USER_SETTINGS = data;
|
||||
loaded();
|
||||
});
|
||||
loadSettings("settings/printer_settings.json", function (data) {
|
||||
loadSettings('settings/printer_settings.json', function (data) {
|
||||
PRINTER_SETTINGS = data;
|
||||
loaded();
|
||||
});
|
||||
|
Reference in New Issue
Block a user