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

remove mostly unused top.outer array

Browse source
This commit is contained in:
Stewart Allen 2017-12-06 19:01:08 -05:00
commit 0784e11c50
2 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/kiri-print.js
View file

@ -519,7 +519,7 @@ var gs_kiri_print = exports;
} }
} else { } else {
// top object // top object
var bounds = POLY.flatten(next.outer); var bounds = POLY.flatten(next.gatherOuter([]));
outputTraces([].appendAll(next.traces).appendAll(next.innerTraces() || []), bounds); outputTraces([].appendAll(next.traces).appendAll(next.innerTraces() || []), bounds);
outputFills(next.fill_lines, bounds); outputFills(next.fill_lines, bounds);
outputSparse(next.fill_sparse, bounds); outputSparse(next.fill_sparse, bounds);

30
js/kiri-slice.js
View file

@ -84,7 +84,6 @@ var gs_kiri_slice = exports;
this.poly = polygon; // outline poly this.poly = polygon; // outline poly
this.traces = null; // array of offset/inset trace polygons (ordered outer to inner) this.traces = null; // array of offset/inset trace polygons (ordered outer to inner)
this.inner = null; // array of inner fillable areas (inset from last trace) this.inner = null; // array of inner fillable areas (inset from last trace)
this.outer = null; // array of outer trace polygons (TODO remove)
this.fill_lines = null; // solid fill lines (array of points) this.fill_lines = null; // solid fill lines (array of points)
this.fill_sparse = null; // sparse fill area open polygons (poly lines) this.fill_sparse = null; // sparse fill area open polygons (poly lines)
this.solids = null; // solid fill regions in otherwise sparse fill (from solids.trimmed) this.solids = null; // solid fill regions in otherwise sparse fill (from solids.trimmed)
@ -108,6 +107,19 @@ var gs_kiri_slice = exports;
return top; return top;
}; };
/**
* Appends all outermost trace polygons into a given array and returns it
*
* @param {Polygon[]} out array to populate
* @returns {Polygon[]} array of top polygons
*/
Top.prototype.gatherOuter = function(out) {
this.traces.forEach(function(trace) {
if (trace.depth === 0) out.append(trace);
});
return out;
};
/** ****************************************************************** /** ******************************************************************
* Slice Prototype Functions * Slice Prototype Functions
******************************************************************* */ ******************************************************************* */
@ -230,19 +242,6 @@ var gs_kiri_slice = exports;
return out; return out;
}; };
/**
* Appends all outermost trace polygons into a given array and returns it
*
* @param {Polygon[]} out array to populate
* @returns {Polygon[]} array of top polygons
*/
PRO.gatherOuter = function(out) {
this.tops.forEach(function(top) {
out.appendAll(top.outer);
});
return out;
};
/** /**
* Appends all solid area polygons into a given array and returns it * Appends all solid area polygons into a given array and returns it
* *
@ -366,7 +365,6 @@ var gs_kiri_slice = exports;
if (vase) top.poly = top.poly.clone(false); if (vase) top.poly = top.poly.clone(false);
top.traces = []; top.traces = [];
top.inner = []; top.inner = [];
top.outer = [];
var last = []; var last = [];
if (count) { if (count) {
@ -376,8 +374,6 @@ var gs_kiri_slice = exports;
top.traces = last; top.traces = last;
} else { } else {
POLY.expand([top.poly], -offset1, top.poly.getZ(), top.traces, count, -offsetN, function(polys, countNow) { POLY.expand([top.poly], -offset1, top.poly.getZ(), top.traces, count, -offsetN, function(polys, countNow) {
// first offset is the outer poly group (max count #)
if (count === countNow) top.outer = polys;
last = polys; last = polys;
// mark each poly with depth (offset #) starting at 0 // mark each poly with depth (offset #) starting at 0
polys.forEach(function(p) { p.depth = count - countNow }); polys.forEach(function(p) { p.depth = count - countNow });