AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add multi-colored paths within the same geometry

Browse source
This commit is contained in:
Stewart Allen 2020-11-09 00:00:57 -05:00
commit 50c51084a6
9 changed files with 84 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/geo/polygon.js
View file

@ -1378,7 +1378,7 @@
union.fillang = fillang; union.fillang = fillang;
return union; return union;
} else { } else {
console.log({check_union_call_path: union, this: this, poly}); console.trace({check_union_call_path: union, this: this, poly});
} }
} }

12
src/kiri/codec.js
View file

@ -114,13 +114,8 @@
lines: encodePointArray(layer.lines, state), lines: encodePointArray(layer.lines, state),
faces: codec.allocFloat32Array(layer.faces), faces: codec.allocFloat32Array(layer.faces),
color: layer.color, color: layer.color,
paths: layer.paths.map(path => { paths: layer.paths,
return { cpath: layer.cpath
index: path.index,
faces: path.faces,
z: path.z
}
})
} }) } })
}; };
return enc; return enc;
@ -134,7 +129,8 @@
lines: decodePointArray(v.data[i].lines), lines: decodePointArray(v.data[i].lines),
faces: v.data[i].faces, faces: v.data[i].faces,
color: v.data[i].color, color: v.data[i].color,
paths: v.data[i].paths paths: v.data[i].paths,
cpath: v.data[i].cpath
}; };
} }
return render; return render;

2
src/kiri/main.js
View file

@ -1929,7 +1929,7 @@
KIRI.work.clear(); KIRI.work.clear();
STACKS.clear(); STACKS.clear();
hideSlider(); hideSlider();
updateSliderMax(); setVisibleLayer(0,0);
setWidgetVisibility(true); setWidgetVisibility(true);
setOpacity(1); setOpacity(1);
break; break;

14
src/kiri/print.js
View file

@ -25,6 +25,8 @@
let lastPoint = null, let lastPoint = null,
lastEmit = null; lastEmit = null;
KIRI.Print = Print;
KIRI.newPrint = function(settings, widgets, id) { KIRI.newPrint = function(settings, widgets, id) {
return new Print(settings, widgets, id); return new Print(settings, widgets, id);
}; };
@ -51,9 +53,11 @@
this.bounds = null; this.bounds = null;
this.imported = null; this.imported = null;
this.hsv2rgb = hsv2rgb; // this.hsv2rgb = hsv2rgb;
} }
Print.hsv2rgb = hsv2rgb;
PRO.addOutput = addOutput; PRO.addOutput = addOutput;
PRO.tip2tipEmit = tip2tipEmit; PRO.tip2tipEmit = tip2tipEmit;
PRO.extrudePerMM = extrudePerMM; PRO.extrudePerMM = extrudePerMM;
@ -245,7 +249,7 @@
} }
// hsv values all = 0 to 1 // hsv values all = 0 to 1
function hsv2rgb(hsv) { function hsv2rgb(hsv, hex) {
let seg = Math.floor(hsv.h * 6), let seg = Math.floor(hsv.h * 6),
rem = hsv.h - (seg * (1/6)), rem = hsv.h - (seg * (1/6)),
p = hsv.v * (1.0 - (hsv.s)), p = hsv.v * (1.0 - (hsv.s)),
@ -285,7 +289,11 @@
break; break;
} }
return out; return hex ? (
((out.r * 255) << 16) ||
((out.g * 255) << 8) ||
(out.b * 255)
) : out;
} }
// PRO.getLayerCount = function() { // PRO.getLayerCount = function() {

20
src/kiri/render.js
View file

@ -161,7 +161,8 @@
contour.push(new THREE.Vector2(p.x, p.y)); contour.push(new THREE.Vector2(p.x, p.y));
}); });
const {index, faces} = ProfiledContourGeometry(profile, contour, poly.isClosed()); const {index, faces} = ProfiledContourGeometry(profile, contour, poly.isClosed());
const one = this.current.paths[0]; const cur = this.current;
const one = cur.paths[0];
if (one) { if (one) {
// merge all contour geometry for massive speed gain // merge all contour geometry for massive speed gain
const add = one.faces.length / 3; const add = one.faces.length / 3;
@ -169,12 +170,27 @@
index[i] += add; index[i] += add;
} }
const feces = new Float32Array(one.faces.length + faces.length); const feces = new Float32Array(one.faces.length + faces.length);
const indln = one.index.length;
feces.set(one.faces); feces.set(one.faces);
feces.set(faces, one.faces.length); feces.set(faces, one.faces.length);
one.faces = feces; one.faces = feces;
one.index.appendAll(index); one.index.appendAll(index);
// allow changing colors
if (opts.color) {
if (!cur.cpath) {
// seed
cur.cpath = [ Object.assign({ start: 0, count: indln - 1 }, cur.color) ];
} else {
// rewrite last color count if color or opacity have changed
const pc = cur.cpath[cur.cpath.length - 1];
if (pc.face !== opts.color.face || pc.opacity !== opts.color.opacity) {
pc.count = indln - 1;
cur.cpath.push(Object.assign({ start: indln, count: Infinity }, opts.color));
}
}
}
} else { } else {
this.current.paths.push({ index, faces, z: poly.getZ() }); cur.paths.push({ index, faces, z: poly.getZ() });
} }
this.stats.contour++; this.stats.contour++;
}); });

33
src/kiri/stacks.js
View file

@ -10,7 +10,7 @@
emissive = 0x101010, emissive = 0x101010,
metalness = 0, metalness = 0,
roughness = 0.3, roughness = 0.3,
newMesh = createPhongMesh; newMat = createPhongMat;
let stacks = {}, let stacks = {},
tallest = 0, tallest = 0,
@ -108,11 +108,11 @@
const ctrl = DYN[label]; const ctrl = DYN[label];
ctrl.toggle.checked = true; ctrl.toggle.checked = true;
const { polys, lines, faces, paths } = data; const { polys, lines, faces, paths, cpath } = data;
if (polys.length || lines.length) { if (polys.length || lines.length) {
const mat = new THREE.LineBasicMaterial({ const mat = new THREE.LineBasicMaterial({
transparent: data.color.opacity != 1, transparent: data.color.opacity != 1,
opacity: data.color.opacity, opacity: data.color.opacity || 1,
color: data.color.line color: data.color.line
}); });
const geo = new THREE.Geometry(), vert = geo.vertices; const geo = new THREE.Geometry(), vert = geo.vertices;
@ -129,7 +129,7 @@
ctrl.group.push(mat); ctrl.group.push(mat);
} }
if (faces.length) { if (faces.length) {
const mat = newMesh(data); const mat = newMat(data);
const geo = new THREE.BufferGeometry(); const geo = new THREE.BufferGeometry();
geo.setAttribute('position', new THREE.BufferAttribute(faces, 3)); geo.setAttribute('position', new THREE.BufferAttribute(faces, 3));
geo.computeFaceNormals(); geo.computeFaceNormals();
@ -141,43 +141,54 @@
ctrl.group.push(mat); ctrl.group.push(mat);
} }
if (paths.length) { if (paths.length) {
const mat = newMesh(data); let mat = [];
if (cpath) {
cpath.forEach(c => { mat.push(newMat({ color: c })) });
} else {
mat.push(newMat(data));
}
// const mat = newMat(data);
paths.forEach((path, i) => { paths.forEach((path, i) => {
const { index, faces, z } = path; const { index, faces, z, colors } = path;
const geo = new THREE.BufferGeometry(); const geo = new THREE.BufferGeometry();
geo.setAttribute('position', new THREE.BufferAttribute(faces, 3)); geo.setAttribute('position', new THREE.BufferAttribute(faces, 3));
geo.setIndex(index); geo.setIndex(index);
geo.computeFaceNormals(); geo.computeFaceNormals();
geo.computeVertexNormals(); geo.computeVertexNormals();
if (cpath) {
cpath.forEach((c, i) => geo.addGroup(c.start, c.count, i));
} else {
geo.addGroup(0, Infinity, 0);
}
const mesh = new THREE.Mesh(geo, mat); const mesh = new THREE.Mesh(geo, mat);
mesh.position.z = z; mesh.position.z = z;
mesh.castShadow = true; mesh.castShadow = true;
mesh.receiveShadow = true; mesh.receiveShadow = true;
group.add(mesh); group.add(mesh);
}); });
ctrl.group.push(mat); ctrl.group.appendAll(mat);
} }
} }
}; };
function createStandardMesh(data) { function createStandardMat(data) {
return new THREE.MeshStandardMaterial({ return new THREE.MeshStandardMaterial({
emissive, emissive,
roughness, roughness,
metalness, metalness,
transparent: data.color.opacity != 1, transparent: data.color.opacity != 1,
opacity: data.color.opacity, opacity: data.color.opacity || 1,
color: data.color.face, color: data.color.face,
side: THREE.DoubleSide side: THREE.DoubleSide
}); });
} }
function createPhongMesh(data) { function createPhongMat(data) {
return new THREE.MeshPhongMaterial({ return new THREE.MeshPhongMaterial({
shininess, shininess,
specular, specular,
transparent: data.color.opacity != 1, transparent: data.color.opacity != 1,
opacity: data.color.opacity, opacity: data.color.opacity || 1,
color: data.color.face, color: data.color.face,
side: THREE.DoubleSide side: THREE.DoubleSide
}); });

34
src/mode/fdm/prepare.js
View file

@ -24,9 +24,9 @@
let device = settings.device, let device = settings.device,
nozzle = device.extruders[0].extNozzle, nozzle = device.extruders[0].extNozzle,
process = settings.process, process = settings.process,
bounds = settings.bounds,
mode = settings.mode, mode = settings.mode,
output = [], output = [],
bounds = settings.bounds,
printPoint = newPoint(0,0,0), printPoint = newPoint(0,0,0),
firstLayerHeight = process.firstSliceHeight || process.sliceHeight, firstLayerHeight = process.firstSliceHeight || process.sliceHeight,
maxLayers = 0, maxLayers = 0,
@ -388,6 +388,10 @@
const moveColor = opts.move >= 0 ? opts.move : 0xaaaaaa; const moveColor = opts.move >= 0 ? opts.move : 0xaaaaaa;
const printColor = opts.print >= 0 ? opts.print : 0x777700; const printColor = opts.print >= 0 ? opts.print : 0x777700;
const layers = []; const layers = [];
const hsv2rgb = KIRI.Print.hsv2rgb;
const maxspd = levels.map(level => {
return level.map(o => o.speed || 0).reduce((a, v) => Math.max(a,v));
}).reduce((a, v) => Math.max(a, v));
let lastOut = null; let lastOut = null;
let current = null; let current = null;
@ -395,6 +399,8 @@
levels.forEach((level, index) => { levels.forEach((level, index) => {
const prints = {}; const prints = {};
const moves = []; const moves = [];
const output = new KIRI.Render();
layers.push(output);
const pushPrint = (toolid, poly) => { const pushPrint = (toolid, poly) => {
toolid = toolid || 0; toolid = toolid || 0;
@ -414,9 +420,10 @@
} }
if (lastOut) { if (lastOut) {
if (out.emit) { if (out.emit) {
if (!lastOut.emit) { if (!lastOut.emit || out.speed !== lastOut.speed) {
current = newPolygon().setOpen(); current = newPolygon().setOpen();
current.push(lastOut.point); current.push(lastOut.point);
current.color = hsv2rgb({h:out.speed/maxspd, s:1, v:1}, true);
pushPrint(out.tool, current); pushPrint(out.tool, current);
} }
current.push(out.point); current.push(out.point);
@ -432,6 +439,7 @@
current = newPolygon().setOpen(); current = newPolygon().setOpen();
current.push(out.point); current.push(out.point);
if (out.emit) { if (out.emit) {
current.color = hsv2rgb({h:out.speed/maxspd, s:1, v:1}, true);
pushPrint(out.tool, current); pushPrint(out.tool, current);
} else { } else {
moves.push(current); moves.push(current);
@ -445,17 +453,25 @@
moves.push(current); moves.push(current);
} }
const output = new KIRI.Render();
layers.push(output);
output output
.setLayer('move', moveColor) .setLayer('move', moveColor)
.addPolys(moves, { thin: true, z: opts.z }); .addPolys(moves, { thin: true, z: opts.z });
Object.values(prints).forEach(array => { Object.values(prints).forEach(array => {
output array.forEach(poly => {
.setLayer(opts.action || 'print', printColor) output
.addPolys(array, thin ? .setLayer(opts.action || 'print', printColor)
{ thin, z: opts.z } : .addPolys([ poly ], thin ? { thin, z: opts.z } :
{ offset: array.width, height, z: opts.z }) {
offset: array.width, height, z: opts.z,
color: { face: poly.color, line: poly.color }
})
})
// output
// .setLayer(opts.action || 'print', printColor)
// .addPolys(array, thin ? { thin, z: opts.z } :
// { offset: array.width, height, z: opts.z,
// xcolor: { face: hsv2rgb({h:index/levels.length, s:1, v:1}, true) }
// })
}); });
update(index / output.length); update(index / output.length);

2
src/mode/fdm/slice.js
View file

@ -671,7 +671,7 @@
let minarea = minArea || 1, let minarea = minArea || 1,
tops = slice.tops, tops = slice.tops,
solids = slice.solids, solids = slice.solids,
unioned = POLY.union(solids), unioned = POLY.union(solids, undefined, true).flat(), // TODO verify
isSLA = (spacing === undefined && angle === undefined); isSLA = (spacing === undefined && angle === undefined);
if (solids.length === 0) return false; if (solids.length === 0) return false;

2
src/mode/sla/slice.js
View file

@ -160,7 +160,7 @@
let traces = POLY.nest(POLY.flatten(slice.topShells())); let traces = POLY.nest(POLY.flatten(slice.topShells()));
let trims = slice.solids || []; let trims = slice.solids || [];
traces.appendAll(trims); traces.appendAll(trims);
let union = POLY.union(traces); let union = POLY.union(traces, undefined, true);
slice.unioned = union; slice.unioned = union;
}, "solid"); }, "solid");
} else { } else {