vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-11-16 11:07:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	example/app.js
#	package.json
This commit is contained in:
casperlamboo 2017-05-13 15:41:46 +02:00
commit 183622e143
12 changed files with 148 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
example/app.js Normal file
View File

@ -0,0 +1,45 @@
import * as THREE from 'three.js';
import stlLoader from 'three.js/loaders/STLLoader';
import React from 'react';
import ReactDOM, { render } from 'react-dom';
import * as SLICER from 'src/index.js';
import generateRawData from './generateRawData.js';
import SlicerViewer from './SlicerViewer.js';
const settings = new SLICER.Settings({
...SLICER.printerSettings['ultimaker2go'],
...SLICER.userSettings
});
const stlLoader = new THREE.STLLoader();
stlLoader.load('stl/Airplane.stl', (geometry) => {
geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI / -2));
geometry.applyMatrix(new THREE.Matrix4().setPosition(new THREE.Vector3(50, -0.1, 50)));
// geometry.applyMatrix(new THREE.Matrix4().scale(0.8));
geometry.mergeVertices();
geometry.computeFaceNormals();
const rawData = generateRawData(geometry, settings);
render(<SlicerViewer
layerIntersectionPoints={rawData.layerIntersectionPoints}
layerShapes={rawData.layerShapes}
slices={rawData.slices}
settings={settings.config}
/>, document.getElementById('container'));
});
// const geometry = new THREE.TorusGeometry(20, 10, 30, 30).clone();
// geometry.applyMatrix(new THREE.Matrix4().setPosition(new THREE.Vector3(60, 0, 60)));
// geometry.mergeVertices();
// geometry.computeFaceNormals();
//
// const rawData = generateRawData(geometry, settings);
//
// render(<SlicerViewer
// layerIntersectionPoints={rawData.layerIntersectionPoints}
// layerShapes={rawData.layerShapes}
// slices={rawData.slices}
// settings={settings.config}
// />, document.getElementById('container'));

138
jspm.config.js
View File

@ -14,9 +14,9 @@ SystemJS.config({
"core-js": "npm:core-js@1.2.7", "core-js": "npm:core-js@1.2.7",
"plugin-babel": "npm:systemjs-plugin-babel@0.0.12", "plugin-babel": "npm:systemjs-plugin-babel@0.0.12",
"react": "npm:react@15.3.2", "react": "npm:react@15.3.2",
"domain": "github:jspm/nodelibs-domain@0.2.0-alpha", "domain": "npm:jspm-nodelibs-domain@0.2.0",
"zlib": "github:jspm/nodelibs-zlib@0.2.0-alpha", "zlib": "npm:jspm-nodelibs-zlib@0.2.0",
"https": "github:jspm/nodelibs-https@0.2.0-alpha", "https": "npm:jspm-nodelibs-https@0.2.0",
"react-dom": "npm:react-dom@15.3.2", "react-dom": "npm:react-dom@15.3.2",
"babel-plugin-transform-react-jsx": "npm:babel-plugin-transform-react-jsx@6.8.0", "babel-plugin-transform-react-jsx": "npm:babel-plugin-transform-react-jsx@6.8.0",
"three.js/loaders/STLLoader": "github:mrdoob/three.js@r83/examples/js/loaders/STLLoader.js", "three.js/loaders/STLLoader": "github:mrdoob/three.js@r83/examples/js/loaders/STLLoader.js",
@ -71,16 +71,6 @@ SystemJS.config({
"iconv-lite": "npm:iconv-lite@0.4.13" "iconv-lite": "npm:iconv-lite@0.4.13"
} }
}, },
"github:jspm/nodelibs-domain@0.2.0-alpha": {
"map": {
"domain-browserify": "npm:domain-browser@1.1.7"
}
},
"github:jspm/nodelibs-zlib@0.2.0-alpha": {
"map": {
"zlib-browserify": "npm:browserify-zlib@0.1.4"
}
},
"npm:browserify-zlib@0.1.4": { "npm:browserify-zlib@0.1.4": {
"map": { "map": {
"readable-stream": "npm:readable-stream@2.1.5", "readable-stream": "npm:readable-stream@2.1.5",
@ -115,6 +105,16 @@ SystemJS.config({
"esutils": "npm:esutils@2.0.2", "esutils": "npm:esutils@2.0.2",
"to-fast-properties": "npm:to-fast-properties@1.0.2" "to-fast-properties": "npm:to-fast-properties@1.0.2"
} }
},
"npm:jspm-nodelibs-zlib@0.2.0": {
"map": {
"zlib-browserify": "npm:browserify-zlib@0.1.4"
}
},
"npm:jspm-nodelibs-domain@0.2.0": {
"map": {
"domain-browserify": "npm:domain-browser@1.1.7"
}
} }
} }
}, },
@ -159,27 +159,28 @@ SystemJS.config({
"github:*/*.json" "github:*/*.json"
], ],
map: { map: {
"clipper-js": "github:Doodle3D/clipper-js@1.0.2",
"three.js": "github:mrdoob/three.js@r83", "three.js": "github:mrdoob/three.js@r83",
"assert": "github:jspm/nodelibs-assert@0.2.0-alpha", "assert": "npm:jspm-nodelibs-assert@0.2.0",
"buffer": "github:jspm/nodelibs-buffer@0.2.0-alpha", "buffer": "npm:jspm-nodelibs-buffer@0.2.0",
"child_process": "github:jspm/nodelibs-child_process@0.2.0-alpha", "child_process": "npm:jspm-nodelibs-child_process@0.2.0",
"constants": "github:jspm/nodelibs-constants@0.2.0-alpha", "constants": "npm:jspm-nodelibs-constants@0.2.0",
"crypto": "github:jspm/nodelibs-crypto@0.2.0-alpha", "crypto": "npm:jspm-nodelibs-crypto@0.2.0",
"events": "github:jspm/nodelibs-events@0.2.0-alpha", "events": "npm:jspm-nodelibs-events@0.2.0",
"fs": "github:jspm/nodelibs-fs@0.2.0-alpha", "fs": "npm:jspm-nodelibs-fs@0.2.0",
"http": "github:jspm/nodelibs-http@0.2.0-alpha", "http": "npm:jspm-nodelibs-http@0.2.0",
"json": "github:systemjs/plugin-json@0.1.2", "json": "github:systemjs/plugin-json@0.1.2",
"Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master", "Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
"module": "github:jspm/nodelibs-module@0.2.0-alpha", "module": "npm:jspm-nodelibs-module@0.2.0",
"os": "github:jspm/nodelibs-os@0.2.0-alpha", "os": "npm:jspm-nodelibs-os@0.2.0",
"path": "github:jspm/nodelibs-path@0.2.0-alpha", "path": "npm:jspm-nodelibs-path@0.2.0",
"process": "github:jspm/nodelibs-process@0.2.0-alpha", "process": "npm:jspm-nodelibs-process@0.2.0",
"stream": "github:jspm/nodelibs-stream@0.2.0-alpha", "stream": "npm:jspm-nodelibs-stream@0.2.0",
"string_decoder": "github:jspm/nodelibs-string_decoder@0.2.0-alpha", "string_decoder": "npm:jspm-nodelibs-string_decoder@0.2.0",
"tty": "github:jspm/nodelibs-tty@0.2.0-alpha", "tty": "npm:jspm-nodelibs-tty@0.2.0",
"url": "github:jspm/nodelibs-url@0.2.0-alpha", "url": "npm:jspm-nodelibs-url@0.2.0",
"util": "github:jspm/nodelibs-util@0.2.0-alpha", "util": "npm:jspm-nodelibs-util@0.2.0",
"vm": "github:jspm/nodelibs-vm@0.2.0-alpha", "vm": "npm:jspm-nodelibs-vm@0.2.0",
"worker": "github:casperlamboo/plugin-worker@master" "worker": "github:casperlamboo/plugin-worker@master"
}, },
packages: { packages: {
@ -191,42 +192,12 @@ SystemJS.config({
"npm:clipper-lib@1.0.0": { "npm:clipper-lib@1.0.0": {
"map": {} "map": {}
}, },
"github:jspm/nodelibs-stream@0.2.0-alpha": {
"map": {
"stream-browserify": "npm:stream-browserify@2.0.1"
}
},
"github:jspm/nodelibs-buffer@0.2.0-alpha": {
"map": {
"buffer-browserify": "npm:buffer@4.9.1"
}
},
"github:jspm/nodelibs-string_decoder@0.2.0-alpha": {
"map": {
"string_decoder-browserify": "npm:string_decoder@0.10.31"
}
},
"github:jspm/nodelibs-url@0.2.0-alpha": {
"map": {
"url-browserify": "npm:url@0.11.0"
}
},
"github:jspm/nodelibs-http@0.2.0-alpha": {
"map": {
"http-browserify": "npm:stream-http@2.4.0"
}
},
"npm:stream-browserify@2.0.1": { "npm:stream-browserify@2.0.1": {
"map": { "map": {
"inherits": "npm:inherits@2.0.3", "inherits": "npm:inherits@2.0.3",
"readable-stream": "npm:readable-stream@2.1.5" "readable-stream": "npm:readable-stream@2.1.5"
} }
}, },
"github:jspm/nodelibs-crypto@0.2.0-alpha": {
"map": {
"crypto-browserify": "npm:crypto-browserify@3.11.0"
}
},
"npm:buffer@4.9.1": { "npm:buffer@4.9.1": {
"map": { "map": {
"base64-js": "npm:base64-js@1.2.0", "base64-js": "npm:base64-js@1.2.0",
@ -377,11 +348,6 @@ SystemJS.config({
"inherits": "npm:inherits@2.0.3" "inherits": "npm:inherits@2.0.3"
} }
}, },
"github:jspm/nodelibs-os@0.2.0-alpha": {
"map": {
"os-browserify": "npm:os-browserify@0.2.1"
}
},
"npm:pbkdf2@3.0.9": { "npm:pbkdf2@3.0.9": {
"map": { "map": {
"create-hmac": "npm:create-hmac@1.1.4" "create-hmac": "npm:create-hmac@1.1.4"
@ -415,6 +381,46 @@ SystemJS.config({
"builtin-status-codes": "npm:builtin-status-codes@2.0.0", "builtin-status-codes": "npm:builtin-status-codes@2.0.0",
"xtend": "npm:xtend@4.0.1" "xtend": "npm:xtend@4.0.1"
} }
},
"npm:jspm-nodelibs-crypto@0.2.0": {
"map": {
"crypto-browserify": "npm:crypto-browserify@3.11.0"
}
},
"npm:jspm-nodelibs-http@0.2.0": {
"map": {
"http-browserify": "npm:stream-http@2.4.0"
}
},
"npm:jspm-nodelibs-os@0.2.0": {
"map": {
"os-browserify": "npm:os-browserify@0.2.1"
}
},
"npm:jspm-nodelibs-buffer@0.2.0": {
"map": {
"buffer-browserify": "npm:buffer@4.9.1"
}
},
"npm:jspm-nodelibs-stream@0.2.0": {
"map": {
"stream-browserify": "npm:stream-browserify@2.0.1"
}
},
"npm:jspm-nodelibs-string_decoder@0.2.0": {
"map": {
"string_decoder-browserify": "npm:string_decoder@0.10.31"
}
},
"npm:jspm-nodelibs-url@0.2.0": {
"map": {
"url-browserify": "npm:url@0.11.0"
}
},
"github:Doodle3D/clipper-js@1.0.2": {
"map": {
"Breush/clipper-lib": "github:Breush/clipper-lib@patch-1"
}
} }
} }
}); });

43
package.json
View File

@ -7,6 +7,7 @@
}, },
"dependencies": { "dependencies": {
"Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master", "Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
"clipper-js": "github:Doodle3D/clipper-js@1.0.2",
"json": "github:systemjs/plugin-json@^0.1.2", "json": "github:systemjs/plugin-json@^0.1.2",
"three.js": "github:mrdoob/three.js@r83", "three.js": "github:mrdoob/three.js@r83",
"worker": "github:casperlamboo/plugin-worker@master" "worker": "github:casperlamboo/plugin-worker@master"
@ -15,33 +16,33 @@
"babel-plugin-transform-react-jsx": "npm:babel-plugin-transform-react-jsx@^6.8.0", "babel-plugin-transform-react-jsx": "npm:babel-plugin-transform-react-jsx@^6.8.0",
"babel-runtime": "npm:babel-runtime@^5.1.13", "babel-runtime": "npm:babel-runtime@^5.1.13",
"core-js": "npm:core-js@^1.2.0", "core-js": "npm:core-js@^1.2.0",
"domain": "github:jspm/nodelibs-domain@^0.2.0-alpha",
"file-saver": "npm:file-saver@^1.3.3", "file-saver": "npm:file-saver@^1.3.3",
"https": "github:jspm/nodelibs-https@^0.2.0-alpha", "domain": "npm:jspm-nodelibs-domain@^0.2.0",
"https": "npm:jspm-nodelibs-https@^0.2.0",
"plugin-babel": "npm:systemjs-plugin-babel@^0.0.12", "plugin-babel": "npm:systemjs-plugin-babel@^0.0.12",
"react": "npm:react@^15.3.2", "react": "npm:react@^15.3.2",
"react-dom": "npm:react-dom@^15.3.2", "react-dom": "npm:react-dom@^15.3.2",
"zlib": "github:jspm/nodelibs-zlib@^0.2.0-alpha" "zlib": "npm:jspm-nodelibs-zlib@^0.2.0"
}, },
"peerDependencies": { "peerDependencies": {
"assert": "github:jspm/nodelibs-assert@^0.2.0-alpha", "assert": "npm:jspm-nodelibs-assert@^0.2.0",
"buffer": "github:jspm/nodelibs-buffer@^0.2.0-alpha", "buffer": "npm:jspm-nodelibs-buffer@^0.2.0",
"child_process": "github:jspm/nodelibs-child_process@^0.2.0-alpha", "child_process": "npm:jspm-nodelibs-child_process@^0.2.0",
"constants": "github:jspm/nodelibs-constants@^0.2.0-alpha", "constants": "npm:jspm-nodelibs-constants@^0.2.0",
"crypto": "github:jspm/nodelibs-crypto@^0.2.0-alpha", "crypto": "npm:jspm-nodelibs-crypto@^0.2.0",
"events": "github:jspm/nodelibs-events@^0.2.0-alpha", "events": "npm:jspm-nodelibs-events@^0.2.0",
"fs": "github:jspm/nodelibs-fs@^0.2.0-alpha", "fs": "npm:jspm-nodelibs-fs@^0.2.0",
"http": "github:jspm/nodelibs-http@^0.2.0-alpha", "http": "npm:jspm-nodelibs-http@^0.2.0",
"module": "github:jspm/nodelibs-module@^0.2.0-alpha", "module": "npm:jspm-nodelibs-module@^0.2.0",
"os": "github:jspm/nodelibs-os@^0.2.0-alpha", "os": "npm:jspm-nodelibs-os@^0.2.0",
"path": "github:jspm/nodelibs-path@^0.2.0-alpha", "path": "npm:jspm-nodelibs-path@^0.2.0",
"process": "github:jspm/nodelibs-process@^0.2.0-alpha", "process": "npm:jspm-nodelibs-process@^0.2.0",
"stream": "github:jspm/nodelibs-stream@^0.2.0-alpha", "stream": "npm:jspm-nodelibs-stream@^0.2.0",
"string_decoder": "github:jspm/nodelibs-string_decoder@^0.2.0-alpha", "string_decoder": "npm:jspm-nodelibs-string_decoder@^0.2.0",
"tty": "github:jspm/nodelibs-tty@^0.2.0-alpha", "tty": "npm:jspm-nodelibs-tty@^0.2.0",
"url": "github:jspm/nodelibs-url@^0.2.0-alpha", "url": "npm:jspm-nodelibs-url@^0.2.0",
"util": "github:jspm/nodelibs-util@^0.2.0-alpha", "util": "npm:jspm-nodelibs-util@^0.2.0",
"vm": "github:jspm/nodelibs-vm@^0.2.0-alpha" "vm": "npm:jspm-nodelibs-vm@^0.2.0"
}, },
"overrides": { "overrides": {
"github:mrdoob/three.js@r83": { "github:mrdoob/three.js@r83": {

2
src/GCode.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
const G_COMMAND = 'G'; const G_COMMAND = 'G';
const M_COMMAND = 'M'; const M_COMMAND = 'M';

2
src/Slicer.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
import slice from './sliceActions/slice.js'; import slice from './sliceActions/slice.js';
import SlicerWorker from './slicerWorker.js!worker'; import SlicerWorker from './slicerWorker.js!worker';

2
src/sliceActions/addBrim.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
import { PRECISION } from '../constants.js'; import { PRECISION } from '../constants.js';
const offsetOptions = { const offsetOptions = {

2
src/sliceActions/calculateLayersIntersections.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
export default function calculateLayersIntersections(lines, settings) { export default function calculateLayersIntersections(lines, settings) {
console.log('calculating layer intersections'); console.log('calculating layer intersections');

2
src/sliceActions/createLines.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
function addLine(geometry, lineLookup, lines, a, b) { function addLine(geometry, lineLookup, lines, a, b) {
const index = lines.length; const index = lines.length;

2
src/sliceActions/intersectionsToShapes.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
import Shape from 'Doodle3D/clipper-js'; import Shape from 'Doodle3D/clipper-js';
export default function intersectionsToShapes(layerIntersectionIndexes, layerIntersectionPoints, lines, settings) { export default function intersectionsToShapes(layerIntersectionIndexes, layerIntersectionPoints, lines, settings) {

2
src/sliceActions/optimizePaths.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
import Shape from 'Doodle3D/clipper-js'; import Shape from 'Doodle3D/clipper-js';
export default function optimizePaths(slices, settings) { export default function optimizePaths(slices, settings) {

2
src/sliceActions/removePrecision.js
View File

@ -1,4 +1,4 @@
import 'three.js'; import * as THREE from 'three.js';
import { PRECISION } from '../constants.js'; import { PRECISION } from '../constants.js';
export default function removePrecision(slices) { export default function removePrecision(slices) {

2
src/slicerWorker.js
View File

@ -1,6 +1,6 @@
import Settings from './Settings.js'; import Settings from './Settings.js';
import slice from './sliceActions/slice.js'; import slice from './sliceActions/slice.js';
import 'three.js'; import * as THREE from 'three.js';
const loader = new THREE.JSONLoader(); const loader = new THREE.JSONLoader();