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

fix start point for bisection. remove delta in segment emit (unused)

Browse source
This commit is contained in:
Stewart Allen 2017-10-29 19:46:34 -04:00
commit f39ebbdcb8
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/geo-polygon.js
View file

@ -644,11 +644,7 @@ var gs_base_polygon = exports;
PRO.emitSegment = function(i1, i2) { PRO.emitSegment = function(i1, i2) {
var poly = newPolygon(), var poly = newPolygon(),
start = i1.p2.pos, start = i1.p2.pos,
end = i2.p1.pos, end = i2.p1.pos;
delta = end - start;
while (delta < 0) {
delta += this.length;
}
poly.setOpen(); poly.setOpen();
poly.push(i1); poly.push(i1);
this.forEachPoint(function(p, pos) { this.forEachPoint(function(p, pos) {

17
js/kiri-print.js
View file

@ -381,10 +381,11 @@ var gs_kiri_print = exports;
var more = true; var more = true;
bounds.forEach(function(bp) { bounds.forEach(function(bp) {
if (!more) return; if (!more) return;
var paths = bp.bisect(startPoint, p1); var paths = bp.bisect(p1, p2);
if (!paths || paths.length !== 2) return; if (!paths || paths.length !== 2) return;
var path = paths[0].perimeter() < paths[1].perimeter() ? paths[0] : paths[1]; var path = paths[0].perimeter() < paths[1].perimeter() ? paths[0] : paths[1];
// console.log({bisect: path.length, z: path.first().z, l:path.perimeter()}); if (p1.distTo2D(path.first() > p1.distTo2D(path.last()))) path.reverse();
// console.log(path === paths[0] ? "first" : "last"); // failing on "last"
path.forEachPoint(function(p) { path.forEachPoint(function(p) {
preout.push(newOut(p, 0)); preout.push(newOut(p, 0));
}); });
@ -400,15 +401,15 @@ var gs_kiri_print = exports;
var proxy = polys.map(function(poly) { var proxy = polys.map(function(poly) {
return {poly: poly, first: poly.first(), last: poly.last()}; return {poly: poly, first: poly.first(), last: poly.last()};
}); });
// var lp = startPoint; var lp = startPoint;
startPoint = tip2tipEmit(proxy, startPoint, function(el, point, count) { startPoint = tip2tipEmit(proxy, startPoint, function(el, point, count) {
var poly = el.poly; var poly = el.poly;
if (poly.last() === point) poly.reverse(); if (poly.last() === point) poly.reverse();
poly.forEachPoint(function(p, i) { poly.forEachPoint(function(p, i) {
// if (i === 0 && lp) checkBisect(lp, p, bounds); if (i === 0 && lp) checkBisect(lp, p, bounds);
preout.push(newOut(p, i === 0 ? 0 : fillMult)); preout.push(newOut(p, i === 0 ? 0 : fillMult));
lp = p;
}); });
// lp = point;
}); });
} }
@ -494,8 +495,6 @@ var gs_kiri_print = exports;
// support polygon // support polygon
next.setZ(z); next.setZ(z);
outputTraces([].appendAll(next).appendAll(next.inner || []), extrude); outputTraces([].appendAll(next).appendAll(next.inner || []), extrude);
// outputTraces(next, extrude);
// outputTraces(next.inner, extrude);
if (next.fills) { if (next.fills) {
next.fills.forEach(function(p) { p.z = z }); next.fills.forEach(function(p) { p.z = z });
outputFills(next.fills, extrude, next.inner); outputFills(next.fills, extrude, next.inner);
@ -503,10 +502,8 @@ var gs_kiri_print = exports;
} else { } else {
// top object // top object
outputTraces([].appendAll(next.traces).appendAll(next.innerTraces() || []), extrude); outputTraces([].appendAll(next.traces).appendAll(next.innerTraces() || []), extrude);
// outputTraces(next.traces, extrude);
// outputTraces(next.innerTraces(), extrude);
outputFills(next.fill_lines, extrude, next.inner); outputFills(next.fill_lines, extrude, next.inner);
outputSparse(next.fill_sparse, extrude, next.inner); outputSparse(next.fill_sparse, extrude, [next.poly].appendAll(next.poly.inner || []));
} }
}, function(obj) { }, function(obj) {
return obj instanceof Polygon ? obj : obj.poly; return obj instanceof Polygon ? obj : obj.poly;