vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-06-01 21:44:31 +02:00
Code Issues Projects Releases Wiki Activity

updated to three.js r72

Browse Source
This commit is contained in:
casperlamboo 2015-10-14 17:11:29 +02:00 committed by Simon Voordouw
parent 4526307df4
commit d367fbe021
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,3 +2,5 @@
*.DS_Store *.DS_Store
jspm_packages/* jspm_packages/*
bundle.js

22
config.js
View File

@ -1,20 +1,21 @@
System.config({ System.config({
"baseURL": "/", baseURL: "/",
"defaultJSExtensions": true, defaultJSExtensions: true,
"transpiler": "babel", transpiler: "babel",
"babelOptions": { babelOptions: {
"optional": [ "optional": [
"runtime" "runtime"
] ]
}, },
"paths": { paths: {
"github:*": "jspm_packages/github/*", "github:*": "jspm_packages/github/*",
"npm:*": "jspm_packages/npm/*" "npm:*": "jspm_packages/npm/*"
} },
}); bundles: {
"bundle.js": []
},
System.config({ map: {
"map": {
"babel": "npm:babel-core@5.8.21", "babel": "npm:babel-core@5.8.21",
"babel-runtime": "npm:babel-runtime@5.8.20", "babel-runtime": "npm:babel-runtime@5.8.20",
"clipper-lib": "npm:clipper-lib@1.0.0", "clipper-lib": "npm:clipper-lib@1.0.0",
@ -23,7 +24,7 @@ System.config({
"nodeca/js-yaml": "github:nodeca/js-yaml@3.3.1", "nodeca/js-yaml": "github:nodeca/js-yaml@3.3.1",
"read-yaml": "npm:read-yaml@1.0.0", "read-yaml": "npm:read-yaml@1.0.0",
"systemjs/plugin-json": "github:systemjs/plugin-json@0.1.0", "systemjs/plugin-json": "github:systemjs/plugin-json@0.1.0",
"three.js": "github:mrdoob/three.js@master", "three.js": "github:mrdoob/three.js@r72",
"github:jspm/nodelibs-assert@0.1.0": { "github:jspm/nodelibs-assert@0.1.0": {
"assert": "npm:assert@1.3.0" "assert": "npm:assert@1.3.0"
}, },
@ -92,4 +93,3 @@ System.config({
} }
} }
}); });

24
example/app.js
View File

@ -3,19 +3,17 @@ import PRINTER_SETTINGS from 'settings/printer_settings.json!';
import USER_SETTINGS from 'settings/user_settings.json!'; import USER_SETTINGS from 'settings/user_settings.json!';
import * as SLICER from 'src/index'; import * as SLICER from 'src/index';
setTimeout(() => { var settings = new SLICER.Settings();
var settings = new SLICER.Settings(); settings.updateConfig(PRINTER_SETTINGS["ultimaker2go"]);
settings.updateConfig(PRINTER_SETTINGS["ultimaker2go"]); settings.updateConfig(USER_SETTINGS);
settings.updateConfig(USER_SETTINGS);
var geometry = new THREE.TorusGeometry(20, 10, 30, 30); var geometry = new THREE.TorusGeometry(20, 10, 30, 30);
var slicer = new SLICER.Slicer(); var slicer = new SLICER.Slicer();
//var slicer = new SLICER.SlicerWorker(); //var slicer = new SLICER.SlicerWorker();
slicer.setGeometry(geometry.clone()); slicer.setGeometry(geometry.clone());
slicer.onfinish = function (gCode) { slicer.onfinish = function (gCode) {
document.getElementById('gcode').innerHTML = gCode.replace(/(?:\r\n|\r|\n)/g, '<br />'); document.getElementById('gcode').innerHTML = gCode.replace(/(?:\r\n|\r|\n)/g, '<br />');
}; };
slicer.slice(settings); slicer.slice(settings);
});

2
package.json
View File

@ -9,7 +9,7 @@
"nodeca/js-yaml": "github:nodeca/js-yaml@^3.3.1", "nodeca/js-yaml": "github:nodeca/js-yaml@^3.3.1",
"read-yaml": "npm:read-yaml@^1.0.0", "read-yaml": "npm:read-yaml@^1.0.0",
"systemjs/plugin-json": "github:systemjs/plugin-json@^0.1.0", "systemjs/plugin-json": "github:systemjs/plugin-json@^0.1.0",
"three.js": "github:mrdoob/three.js@master" "three.js": "github:mrdoob/three.js@r72"
}, },
"devDependencies": { "devDependencies": {
"babel": "npm:babel-core@^5.1.13", "babel": "npm:babel-core@^5.1.13",

2
src/gcode.js
View File

@ -161,4 +161,4 @@ export default class {
getGCode () { getGCode () {
return this.settings.startCode() + this.gcode + this.settings.endCode(); return this.settings.startCode() + this.gcode + this.settings.endCode();
} }
} }

2
src/settings.js
View File

@ -55,4 +55,4 @@ export default class {
return gcode; return gcode;
} }
} }

4
src/slicer.js
View File

@ -30,7 +30,7 @@ export default class {
if (geometry.type === 'BufferGeometry') { if (geometry.type === 'BufferGeometry') {
geometry = new THREE.Geometry().fromBufferGeometry(geometry); geometry = new THREE.Geometry().fromBufferGeometry(geometry);
} }
else if (geometry.type === 'Geometry') { else if (geometry.type.endsWith('Geometry')) {
geometry = geometry.clone(); geometry = geometry.clone();
} }
else { else {
@ -138,7 +138,7 @@ export default class {
var layerHeight = settings.config["layerHeight"]; var layerHeight = settings.config["layerHeight"];
var height = settings.config["dimensionsZ"]; var height = settings.config["dimensionsZ"];
var numLayers = height / layerHeight; var numLayers = Math.floor(height / layerHeight);
var layerIntersectionIndexes = []; var layerIntersectionIndexes = [];
var layerIntersectionPoints = []; var layerIntersectionPoints = [];