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

checkpoint sla support work

Browse source
This commit is contained in:
Stewart Allen 2020-04-25 14:35:54 -04:00
commit d8925e0b28
3 changed files with 77 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/kiri-conf.js
View file

@ -321,6 +321,7 @@ let gs_kiri_conf = exports;
slaFirstOffset: 0, slaFirstOffset: 0,
slaSupportLayers: 0, slaSupportLayers: 0,
slaSupportDensity: 0, slaSupportDensity: 0,
slaSupportSize: 0.5
} }
}, },
cam:{ cam:{

96
js/kiri-driver-sla.js
View file

@ -114,6 +114,8 @@ let gs_kiri_sla = exports;
snew.push(slice); snew.push(slice);
zoff += height; zoff += height;
} }
// compensate for midline start
zoff -= height / 2;
// replace slices with new appended array // replace slices with new appended array
slices = widget.slices = snew.concat(slices.map(s => { slices = widget.slices = snew.concat(slices.map(s => {
s.tops.forEach(t => t.poly.setZ(s.z + zoff)); s.tops.forEach(t => t.poly.setZ(s.z + zoff));
@ -180,6 +182,9 @@ let gs_kiri_sla = exports;
if (process.slaSupportLayers && process.slaSupportDensity) { if (process.slaSupportLayers && process.slaSupportDensity) {
computeSupports(widget, process); computeSupports(widget, process);
} }
// slices.forEach(slice => {
// console.log(slice.index, slice.z.toFixed(3), (slice.down ? slice.down.z - slice.z : 0).toFixed(3));
// });
ondone(); ondone();
}, function(update) { }, function(update) {
return onupdate(0.0 + update * 0.25); return onupdate(0.0 + update * 0.25);
@ -273,17 +278,19 @@ let gs_kiri_sla = exports;
let seq = 0, let seq = 0,
seqLast = 0, seqLast = 0,
spacing = (1 - process.slaSupportDensity) * 10, spacing = (1 - process.slaSupportDensity) * 10,
size = Math.bound((1 - process.slaSupportDensity), 0.1, 0.5); size = Math.bound(process.slaSupportSize * process.slaSupportDensity, 0.1, 0.5);
// compute and project support pillars // compute and project support pillars
slices.forEach(slice => { slices.forEach(slice => {
if (slice.can_emit) { if (slice.can_emit) {
if (seq === 0 || slice.index - seqLast > 5) { if (seq === 0 || slice.index - seqLast > 5) {
slice.supports = slice.bear_up.map(p => { // slice.supports = slice.bear_up.map(p => {
// return p.clone(true).setZ(slice.z);
// });
slice.bear_up.map(p => {
return p.clone(true).setZ(slice.z); return p.clone(true).setZ(slice.z);
}); }).forEach(p => {
slice.supports.forEach(p => { projectSupport(process, slice, p, size, spacing);
projectSupport(slice, p, size, spacing);
}); });
seq++; seq++;
} else if (seq > 5) { } else if (seq > 5) {
@ -303,7 +310,7 @@ let gs_kiri_sla = exports;
}); });
} }
function projectSupport(slice, poly, size, spacing) { function projectSupport(process, slice, poly, size, spacing) {
let flat = poly.circularityDeep() > 0.1, let flat = poly.circularityDeep() > 0.1,
arr = [ poly ]; arr = [ poly ];
@ -313,13 +320,14 @@ let gs_kiri_sla = exports;
let out = [], let out = [],
seg = [], seg = [],
per = poly.perimeter(), per = poly.perimeter(),
crit = 0; crit = 0,
polys = poly.clone(true).flattenTo([]);
poly.forEachSegment((p1, p2) => { polys.forEach(p => p.forEachSegment((p1, p2) => {
let rec = {dist: p1.distTo2D(p2), p1, p2}; let rec = {dist: p1.distTo2D(p2), p1, p2};
if (rec.dist >= spacing) crit++; if (rec.dist >= spacing) crit++;
seg.push(rec); seg.push(rec);
}); }));
seg.sort((a,b) => { seg.sort((a,b) => {
return b.dist - a.dist; return b.dist - a.dist;
@ -333,7 +341,7 @@ let gs_kiri_sla = exports;
let num = Math.ceil(dist / spacing) + 1, let num = Math.ceil(dist / spacing) + 1,
step = dist / num, step = dist / num,
pt = p1; pt = p1;
while (num-- > 0) { while (num-- >= 0) {
out.push(pt); out.push(pt);
pt = pt.offsetPointTo(p2, step); pt = pt.offsetPointTo(p2, step);
} }
@ -345,27 +353,73 @@ let gs_kiri_sla = exports;
} }
// mark support pillar for each point // mark support pillar for each point
out.forEach(p => projectPillar(slice, p, size, 0)); out.forEach(p => projectPillar(process, slice, p, size, []));
// inset polygon for flat area support // inset polygon for flat area support
if (flat) poly.offset(1, arr); if (flat) poly.offset(Math.max(0.2, 1 - process.slaSupportDensity), arr);
} }
} }
function projectPillar(slice, point, size, depth) { function projectPillar(process, slice, point, size, track) {
if (!slice.supports) slice.supports = []; if (!slice.supports) slice.supports = [];
let pillar = newPolygon().centerRectangle(point, size/2, size/2).setZ(slice.z);
if (depth > 10) { let pillar = newPolygon().centerRectangle(point, size/2, size/2).setZ(slice.z),
let trim = slice.tops.filter(t => { max = process.slaSupportSize,
if (point.isInPolygon(t.poly)) return true; inc = process.slaSlice * 2,
let pin = pillar.points.filter(p => p.isInPolygon(t.poly)); end = false, // center intersects
return pin.length; over = [], // overlapping points
safe = []; // non-overlapping points
// slice.supports.push(pillar); return;
track.min = track.min ? Math.min(track.min, size) : size;
track.max = (track.max ? true : false) || size >= max;
slice.tops.forEach(t => {
if (track.length > 3 && point.isInPolygon(t.poly)) {
end = true;
}
pillar.points.forEach(p => {
let isin = p.isInPolygon(t.poly);
if (isin) {
over.push(p);
} else {
safe.push(p);
}
}); });
if (trim.length) return; });
if (end) {
// backtrack shrinking pillars if not landing on a flat
return;
} }
if (over.length) {
// move toward average of safe points
if (safe.length) {
let x = 0, y = 0;
safe.forEach(p => { x += p.x; y += p.y });
x /= safe.length;
y /= safe.length;
point = point.offsetPointTo({x, y, z:slice.z}, inc / 2);
}
if (track.max) {
size -= inc;
}
} else if (!track.max) {
size += inc;
}
if (size < track.min) {
return;
}
if (pillar) { if (pillar) {
slice.supports.push(pillar); slice.supports.push(pillar);
if (slice.down) projectPillar(slice.down, point, Math.min(size + 0.1, 1), depth + 1); track.push(pillar);
if (slice.down) {
projectPillar(process, slice.down, point, Math.min(size, max), track);
}
} }
} }

1
js/kiri-init.js
View file

@ -1479,6 +1479,7 @@ var gs_kiri_init = exports;
slaSupport: LOCAL ? UC.newGroup('support', null, {modes:SLA, group:"sla-support"}) : null, slaSupport: LOCAL ? UC.newGroup('support', null, {modes:SLA, group:"sla-support"}) : null,
slaSupportLayers: LOCAL ? UC.newInput('layers', {title:'base support layers\n0-10', convert:UC.toInt, bound:UC.bound(0,10), modes:SLA}) : null, slaSupportLayers: LOCAL ? UC.newInput('layers', {title:'base support layers\n0-10', convert:UC.toInt, bound:UC.bound(0,10), modes:SLA}) : null,
slaSupportDensity: LOCAL ? UC.newInput('density', {title:'used to compute the\nnumber of support pillars\n0.0-1.0 (0 = disable)', convert:UC.toFloat, bound:UC.bound(0,1), modes:SLA}) : null, slaSupportDensity: LOCAL ? UC.newInput('density', {title:'used to compute the\nnumber of support pillars\n0.0-1.0 (0 = disable)', convert:UC.toFloat, bound:UC.bound(0,1), modes:SLA}) : null,
slaSupportSize: LOCAL ? UC.newInput('size', {title:'max size of a\nsupport pillar\nin millimeters', convert:UC.toFloat, bound:UC.bound(0,1), modes:SLA}) : null,
slaOutput: UC.newGroup('output', null, {modes:SLA, group:"sla-first"}), slaOutput: UC.newGroup('output', null, {modes:SLA, group:"sla-first"}),
slaFirstOffset: UC.newInput('z offset', {title:'z layer offset\nalmost always 0.0\n0.0-1.0 in millimeters', convert:UC.toFloat, bound:UC.bound(0,1), modes:SLA, expert:true}), slaFirstOffset: UC.newInput('z offset', {title:'z layer offset\nalmost always 0.0\n0.0-1.0 in millimeters', convert:UC.toFloat, bound:UC.bound(0,1), modes:SLA, expert:true}),