CC: _segments

Author: kurkle

src/elements/element.line.js

@@ -211,6 +211,10 @@ function getSegment(segment, points, bounds) {
 }
 
 export function boundSegment(segment, points, bounds) {
+	if (!bounds) {
+		return [segment];
+	}
+
 	const {axis, start: startBound, end: endBound} = bounds;
 	const count = points.length;
 	const {compare, between, normalize} = axisFn(axis);
@@ -249,12 +253,10 @@ export function boundSegment(segment, points, bounds) {
 }
 
 export function boundSegments(line, bounds) {
-	const segments = line.segments;
-	const points = line.points;
 	const result = [];
-	let i, ilen, sub;
-	for (i = 0, ilen = segments.length; i < ilen; ++i) {
-		sub = boundSegment(segments[i], points, bounds);
+
+	for (let segment of line.segments) {
+		let sub = boundSegment(segment, line.points, bounds);
 		if (sub.length) {
 			result.push(...sub);
 		}

src/plugins/plugin.filler.js

@@ -242,7 +242,10 @@ function _clip(ctx, target, clipY) {
 }
 
 const TAU = Math.PI * 2;
-function getBounds(axis, first, last) {
+function getBounds(axis, first, last, loop) {
+	if (loop) {
+		return;
+	}
 	let start = first[axis];
 	let end = last[axis];
 
@@ -259,21 +262,20 @@ function _segments(line, target, axis) {
 	const parts = [];
 
 	for (let segment of line.segments) {
-		const bounds = getBounds(axis, points[segment.start]._view, points[segment.end]._view);
+		const bounds = getBounds(axis, points[segment.start]._view, points[segment.end]._view, segment.loop);
 
 		if (!target.segments) {
 			// Special case for boundary not supporting `segments` (simpleArc)
 			// Bounds are provided as `target` for partial circle, or undefined for full circle
-			parts.push({source: segment, target: !segment.loop && bounds});
+			parts.push({source: segment, target: bounds});
 			continue;
 		}
 
 		// Get all segments from `target` that intersect the bounds of current segment of `line`
-		const subs = segment.loop ? target.segments : boundSegments(target, bounds);
+		const subs = boundSegments(target, bounds);
 
 		for (let sub of subs) {
-			const fillSources = sub.loop ? [segment] :
-				boundSegment(segment, points, getBounds(axis, tpoints[sub.start]._view, tpoints[sub.end]._view));
+			const fillSources = boundSegment(segment, points, getBounds(axis, tpoints[sub.start]._view, tpoints[sub.end]._view, sub.loop));
 
 			for (let source of fillSources) {
 				parts.push({source, target: sub});