@mark1russell7/packing 0.2.9 → 0.2.10

package/build/index.js

@@ -1716,6 +1716,9 @@ function packSkyline(rects, outer, options = {}) {
 /**
 * This function packs rectangles with a skyline in a free space. Each cell has a free range: the skyline is its start,
 * and `limit` is its end. A cell with less room than the lowest rectangle left goes to its next free range.
+*
+* A rectangle that needs more cells than the outer rectangle has goes at the left edge. Its y is the first y where each
+* cell is free over its height. Then each cell starts after the rectangle, as in the plain skyline.
 */
 function packSkylineInSpace(rects, outer, order, space) {
 	const width = Math.floor(outer.size.x);
@@ -1751,9 +1754,27 @@ function packSkylineInSpace(rects, outer, order, space) {
 			x = 0;
 			y = 0;
 			for (let i = 0; i < width; i++) if (Number.isFinite(skyline[i]) && skyline[i] > y) y = skyline[i];
+			for (let moved = true; moved;) {
+				moved = false;
+				for (let i = 0; i < width; i++) {
+					if (!Number.isFinite(skyline[i])) continue;
+					const [s, e] = rangeOf(i, y);
+					const next = s > y ? s : e < y + rh ? rangeOf(i, e)[0] : y;
+					if (next > y && Number.isFinite(next)) {
+						y = next;
+						moved = true;
+					}
+				}
+			}
 			rect.position.set(x + ox, y + oy);
 			rect.wasPacked = true;
-			outer.size.y = Math.max(outer.size.y, y + rh);
+			const top = y + rh;
+			for (let i = 0; i < width; i++) {
+				if (!Number.isFinite(skyline[i])) continue;
+				if (top <= limit[i]) skyline[i] = top;
+				else [skyline[i], limit[i]] = rangeOf(i, top);
+			}
+			outer.size.y = Math.max(outer.size.y, top);
 			continue;
 		}
 		let found = findWindow(skyline, width, rw, limit, rh);