@weasel-js/core 1.8.1 → 1.9.1

package/dist/renderer/draw.js

@@ -8,30 +8,30 @@ import { getPaintKind as l } from "../core/paintKinds.js";
 import { SPRITE_STRIDE as u } from "./DrawCommand.js";
 import { patternTileSpace as d } from "./math/patternSpace.js";
 import { getMesh as f } from "./cache/cache.js";
-import { resolveStrokeWidth as p } from "../features/paths/tessellate/stroke.js";
-import { outlineMesh as m } from "./cache/outlineMeshCache.js";
-import { outlineStrokeMesh as h, quantizeEmWidth as g } from "./cache/outlineStrokeMeshCache.js";
-import { resolveMarkerSize as _ } from "../core/markerInset.js";
-import { quantizeStrokeScale as v, strokeMesh as y } from "./cache/strokeMeshCache.js";
+import { metricKeepsRects as p } from "../features/paths/tessellate/metric.js";
+import { resolveStrokeWidth as m } from "../features/paths/tessellate/stroke.js";
+import { strokeMesh as h } from "./cache/strokeMeshCache.js";
+import { SYNTHETIC_ITALIC_RADIANS as g } from "./syntheticItalic.js";
+import { outlineGroupMesh as _, outlineGroupStrokeMesh as v } from "./glyphOutlineMesh.js";
+import { resolveStrokeLengths as y } from "./strokeLengths.js";
 import { cachedMarkerCommands as b } from "./cache/markerCommandCache.js";
 import { axisAlignedClipRect as ee, intersectClipRects as x } from "./batchClip.js";
 import { COMPOSITE_PROGRAM_ID as S } from "./effects/composite.js";
-import { SYNTHETIC_ITALIC_RADIANS as te } from "./syntheticItalic.js";
-import { GLYPH_MODE_MSDF as C, GLYPH_MODE_R8 as ne, dynamicPageTextureId as re, ensureFontTexture as ie, glyphFieldScale as ae, syncDynamicPageTexture as oe, textureCacheKey as se } from "@weasel-js/font";
+import { GLYPH_MODE_MSDF as te, GLYPH_MODE_R8 as ne, dynamicPageTextureId as re, ensureFontTexture as ie, glyphFieldScale as ae, syncDynamicPageTexture as oe, textureCacheKey as se } from "@weasel-js/font";
 import { cachedLayoutRuns as ce, resolveTextStyle as le, verticalAlignOffset as ue } from "@weasel-js/text";
 import { tessellate as de } from "@weasel-js/geom/tessellate";
 //#region src/renderer/draw.ts
-function w(e, t, n) {
+function C(e, t, n) {
 	e.gl.drawElements(e.gl.TRIANGLES, t, n, 0), e.stats && e.stats.drawCalls++;
 }
 var fe = /* @__PURE__ */ new WeakMap(), pe = /* @__PURE__ */ new WeakMap();
-function T(e, t) {
+function w(e, t) {
 	let n = fe.get(e);
 	n || (n = /* @__PURE__ */ new WeakMap(), fe.set(e, n));
 	let r = n.get(t);
 	return r || (r = {}, n.set(t, r)), r;
 }
-function E(e, t) {
+function T(e, t) {
 	if (e === void 0 || e.length !== t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
 	return !0;
@@ -39,7 +39,7 @@ function E(e, t) {
 function me(e, t, n, r, i, a) {
 	let o = t.uniform("u_color");
 	if (o === void 0) return;
-	let s = T(e, t), c = s.color;
+	let s = w(e, t), c = s.color;
 	(c === void 0 || c[0] !== n || c[1] !== r || c[2] !== i || c[3] !== a) && (e.gl.uniform4f(o, n, r, i, a), s.color = [
 		n,
 		r,
@@ -47,23 +47,23 @@ function me(e, t, n, r, i, a) {
 		a
 	]);
 }
-function D(e, t, n) {
+function E(e, t, n) {
 	let r = t.uniform("u_alpha");
 	if (r === void 0) return;
-	let i = T(e, t);
+	let i = w(e, t);
 	i.alpha !== n && (e.gl.uniform1f(r, n), i.alpha = n);
 }
-var O = o.identity();
+var D = o.identity();
 function he(e) {
 	let t = pe.get(e);
 	return t || (t = o.screenToClip(e.widthCss, e.heightCss), pe.set(e, t)), t;
 }
-var k = /* @__PURE__ */ new Float32Array(16);
-function A(e, t, n = e.state.colorMatrix) {
-	let r = e.gl, i = T(e, t), a = t.uniform("u_colorMatrix");
+var O = /* @__PURE__ */ new Float32Array(16);
+function k(e, t, n = e.state.colorMatrix) {
+	let r = e.gl, i = w(e, t), a = t.uniform("u_colorMatrix");
 	if (a !== void 0) {
-		for (let e = 0; e < 4; e++) for (let t = 0; t < 4; t++) k[t * 4 + e] = n[e * 5 + t];
-		E(i.colorMatrix, k) || (r.uniformMatrix4fv(a, !1, k), i.colorMatrix = Float32Array.from(k));
+		for (let e = 0; e < 4; e++) for (let t = 0; t < 4; t++) O[t * 4 + e] = n[e * 5 + t];
+		T(i.colorMatrix, O) || (r.uniformMatrix4fv(a, !1, O), i.colorMatrix = Float32Array.from(O));
 	}
 	let o = t.uniform("u_colorBias");
 	if (o !== void 0) {
@@ -73,7 +73,7 @@ function A(e, t, n = e.state.colorMatrix) {
 			n[14],
 			n[19]
 		];
-		E(i.colorBias, e) || (r.uniform4f(o, e[0], e[1], e[2], e[3]), i.colorBias = Float32Array.from(e));
+		T(i.colorBias, e) || (r.uniform4f(o, e[0], e[1], e[2], e[3]), i.colorBias = Float32Array.from(e));
 	}
 }
 function ge(e, t) {
@@ -85,22 +85,22 @@ function _e(e, t) {
 function ve(e, t) {
 	return _e(e, ge(e, t));
 }
-function ye(e, t) {
+function A(e, t) {
 	switch (t.kind) {
-		case "group": return je(e, t);
-		case "path": return Le(e, t);
-		case "text": return At(e, t);
-		case "image": return Jt(e, t);
-		case "sprites": return Yt(e, t);
-		case "shader": return P(e), De(e, t);
+		case "group": return Ae(e, t);
+		case "path": return Fe(e, t);
+		case "text": return Dt(e, t);
+		case "image": return Vt(e, t);
+		case "sprites": return Ht(e, t);
+		case "shader": return F(e), Ee(e, t);
 	}
 }
-var be = /* @__PURE__ */ new Set();
-function xe(e, t) {
+var ye = /* @__PURE__ */ new Set();
+function be(e, t) {
 	let n = `${e}:${t}`;
-	be.has(n) || (be.add(n), (typeof process > "u" || process.env.NODE_ENV !== "production") && console.warn(`weasel drawShader: uniform "${t}" not found in program "${e}". Check spelling, ensure it's used in the shader (unused uniforms are optimized away by the driver).`));
+	ye.has(n) || (ye.add(n), (typeof process > "u" || process.env.NODE_ENV !== "production") && console.warn(`weasel drawShader: uniform "${t}" not found in program "${e}". Check spelling, ensure it's used in the shader (unused uniforms are optimized away by the driver).`));
 }
-function Se(e, t, n, r, i) {
+function xe(e, t, n, r, i) {
 	if (typeof n == "object" && n && !Array.isArray(n) && !(n instanceof Float32Array) && "id" in n && typeof n.id == "string") {
 		let a = n, o = c(a.id);
 		if (!o) {
@@ -138,7 +138,7 @@ function Se(e, t, n, r, i) {
 		return;
 	}
 }
-var Ce = {
+var Se = {
 	float: {
 		fn: "uniform1fv",
 		n: 1
@@ -264,11 +264,11 @@ var Ce = {
 		matrix: !0
 	}
 };
-function we(e) {
+function Ce(e) {
 	return Array.isArray(e) || e instanceof Float32Array || e instanceof Int32Array || e instanceof Uint32Array;
 }
-function Te(e, t, n, r) {
-	let i = typeof process < "u" ? process.env.NODE_ENV !== "production" : !0, a = Ce[n.type];
+function we(e, t, n, r) {
+	let i = typeof process < "u" ? process.env.NODE_ENV !== "production" : !0, a = Se[n.type];
 	if (!a) {
 		i && console.warn(`weasel setUniform: array uniform "${t}" has type ${n.type}, which cannot be written as a whole`);
 		return;
@@ -281,22 +281,22 @@ function Te(e, t, n, r) {
 	let o = e[a.fn];
 	a.matrix ? o.call(e, n.location, !1, r) : o.call(e, n.location, r);
 }
-function Ee(e, t, n, r, i, a) {
+function Te(e, t, n, r, i, a) {
 	for (let [o, s] of Object.entries(r)) {
 		let r = t.uniformArray(o);
-		if (r && we(s)) {
-			Te(e, o, r, s);
+		if (r && Ce(s)) {
+			we(e, o, r, s);
 			continue;
 		}
 		let c = t.uniform(o);
 		if (c === void 0) {
-			xe(n, o);
+			be(n, o);
 			continue;
 		}
-		Se(e, c, s, i, a);
+		xe(e, c, s, i, a);
 	}
 }
-function De(e, t) {
+function Ee(e, t) {
 	let { gl: n, programRegistry: r, quadVbo: i, quadIbo: a, textureCache: s } = e, c = r.get(t.program.id);
 	if (!c) {
 		console.warn(`weasel drawShader: program "${t.program.id}" not compiled on this renderer. Call renderer.registerProgram(handle) after the module-level registerProgram().`);
@@ -314,36 +314,36 @@ function De(e, t) {
 	let p = c.uniform("u_bounds");
 	p !== void 0 && n.uniform4f(p, t.bounds.x, t.bounds.y, t.bounds.w, t.bounds.h);
 	let m = c.uniform("u_view");
-	m !== void 0 && n.uniformMatrix3fv(m, !1, e.state.transform), Ee(n, c, t.program.id, t.uniforms, s, { value: 1 }), Z(e), w(e, 6, e.gl.UNSIGNED_SHORT), l !== void 0 && n.disableVertexAttribArray(l), u !== void 0 && n.disableVertexAttribArray(u), n.bindBuffer(n.ARRAY_BUFFER, null), n.bindBuffer(n.ELEMENT_ARRAY_BUFFER, null);
+	m !== void 0 && n.uniformMatrix3fv(m, !1, e.state.transform), Te(n, c, t.program.id, t.uniforms, s, { value: 1 }), Z(e), C(e, 6, e.gl.UNSIGNED_SHORT), l !== void 0 && n.disableVertexAttribArray(l), u !== void 0 && n.disableVertexAttribArray(u), n.bindBuffer(n.ARRAY_BUFFER, null), n.bindBuffer(n.ELEMENT_ARRAY_BUFFER, null);
 }
-function Oe(e, t, n, r, i) {
+function De(e, t, n, r, i) {
 	let a = e.gl;
-	P(e);
+	F(e);
 	let o = e.renderTarget ?? null, s = e.clipDepth, c = e.clipStack, l = e.drawBatch.clip, u = a.isEnabled(a.SCISSOR_TEST), d = n.acquire(r, i), f = e.state.pushIsolated({ transform: t.transform });
 	e.clipDepth = 0, e.clipStack = [], e.drawBatch.clip = null, a.bindFramebuffer(a.FRAMEBUFFER, d.fbo), e.renderTarget = d, a.viewport(0, 0, r, i), a.disable(a.SCISSOR_TEST), a.stencilMask(255), a.clear(a.COLOR_BUFFER_BIT | a.STENCIL_BUFFER_BIT);
-	for (let n of t.children) ye(e, n);
-	G(e), a.disable(a.BLEND);
+	for (let n of t.children) A(e, n);
+	q(e), a.disable(a.BLEND);
 	for (let o of t.effects) {
 		let t = e.ensureProgram?.(o.program.id) ?? null;
 		if (!t) {
-			xe(o.program.id, "(program)");
+			be(o.program.id, "(program)");
 			continue;
 		}
 		let s = n.acquire(r, i);
-		a.bindFramebuffer(a.FRAMEBUFFER, s.fbo), a.viewport(0, 0, r, i), a.clear(a.COLOR_BUFFER_BIT), Ae(e, t, d.texture, r, i, o.uniforms, void 0, o.program.id), n.release(d), d = s;
+		a.bindFramebuffer(a.FRAMEBUFFER, s.fbo), a.viewport(0, 0, r, i), a.clear(a.COLOR_BUFFER_BIT), ke(e, t, d.texture, r, i, o.uniforms, void 0, o.program.id), n.release(d), d = s;
 	}
-	a.enable(a.BLEND), e.state.pop(), e.clipDepth = s, e.clipStack = c, e.drawBatch.clip = l, e.renderTarget = o, ke(e, r, i, u);
+	a.enable(a.BLEND), e.state.pop(), e.clipDepth = s, e.clipStack = c, e.drawBatch.clip = l, e.renderTarget = o, Oe(e, r, i, u);
 	let p = e.ensureProgram?.(S) ?? null;
-	p && (Z(e), Ae(e, p, d.texture, r, i, void 0, {
+	p && (Z(e), ke(e, p, d.texture, r, i, void 0, {
 		alpha: f.alpha,
 		colorMatrix: f.colorMatrix
 	})), n.release(d);
 }
-function ke(e, t, n, r) {
+function Oe(e, t, n, r) {
 	let i = e.gl, a = e.renderTarget ?? null;
 	i.bindFramebuffer(i.FRAMEBUFFER, a ? a.fbo : null), a ? i.viewport(0, 0, t, n) : (e.restoreTargetRect?.(), r && i.enable(i.SCISSOR_TEST));
 }
-function Ae(e, t, n, r, i, a, o, s) {
+function ke(e, t, n, r, i, a, o, s) {
 	let c = e.gl;
 	c.useProgram(t.handle);
 	let l = t.attribute("a_position"), u = t.attribute("a_uv");
@@ -355,13 +355,13 @@ function Ae(e, t, n, r, i, a, o, s) {
 	let p = t.uniform("u_texel");
 	if (p !== void 0 && c.uniform2f(p, 1 / r, 1 / i), o) {
 		let n = t.uniform("u_alpha");
-		n !== void 0 && c.uniform1f(n, o.alpha), A(e, t, o.colorMatrix);
+		n !== void 0 && c.uniform1f(n, o.alpha), k(e, t, o.colorMatrix);
 	}
-	a && Ee(c, t, s ?? "effect", a, e.textureCache, { value: 1 }), w(e, 6, e.gl.UNSIGNED_SHORT), l !== void 0 && l >= 0 && c.disableVertexAttribArray(l), u !== void 0 && u >= 0 && c.disableVertexAttribArray(u), c.bindBuffer(c.ARRAY_BUFFER, null), c.bindBuffer(c.ELEMENT_ARRAY_BUFFER, null);
+	a && Te(c, t, s ?? "effect", a, e.textureCache, { value: 1 }), C(e, 6, e.gl.UNSIGNED_SHORT), l !== void 0 && l >= 0 && c.disableVertexAttribArray(l), u !== void 0 && u >= 0 && c.disableVertexAttribArray(u), c.bindBuffer(c.ARRAY_BUFFER, null), c.bindBuffer(c.ELEMENT_ARRAY_BUFFER, null);
 }
-function je(e, t) {
+function Ae(e, t) {
 	if (t.effects && t.effects.length > 0 && e.effectTargets && e.deviceWidth && e.deviceHeight) {
-		Oe(e, t, e.effectTargets, e.deviceWidth, e.deviceHeight);
+		De(e, t, e.effectTargets, e.deviceWidth, e.deviceHeight);
 		return;
 	}
 	if (e.state.push({
@@ -371,17 +371,17 @@ function je(e, t) {
 	}), t.clip) {
 		let n = e.clipStack.reduce((e, t) => e + +(t.depth === 0), 0);
 		if (e.clipDepth + n + 1 > 7) throw e.state.pop(), Error("weasel: clip nesting depth exceeded (max 7). You can't nest more than 7 levels of clipped containers in a single draw tree. Flatten the hierarchy or compose poses outside the scene graph.");
-		Me(e, t.clip);
+		je(e, t.clip);
 	}
-	for (let n of t.children) ye(e, n);
-	t.clip && Ne(e), e.state.pop();
+	for (let n of t.children) A(e, n);
+	t.clip && Me(e), e.state.pop();
 }
-function Me(e, t) {
+function je(e, t) {
 	let n = e.state.transform, r = ee(t, n);
 	if (r === null) {
-		Pe(e);
+		j(e);
 		let r = e.clipDepth + 1;
-		vt(e, t, r), e.clipDepth = r, e.clipStack.push({
+		_t(e, t, r), e.clipDepth = r, e.clipStack.push({
 			path: t,
 			transform: n,
 			rect: null,
@@ -393,105 +393,110 @@ function Me(e, t) {
 		rect: r,
 		depth: 0
 	});
-	Fe(e);
+	Ne(e);
 }
-function Ne(e) {
+function Me(e) {
 	let t = e.clipStack.pop();
-	t.depth > 0 && (yt(e, t.path, t.depth - 1, t.transform), e.clipDepth = t.depth - 1), Fe(e);
+	t.depth > 0 && (vt(e, t.path, t.depth - 1, t.transform), e.clipDepth = t.depth - 1), Ne(e);
 }
-function Pe(e) {
+function j(e) {
 	for (let t of e.clipStack) {
 		if (t.depth !== 0) continue;
 		let n = e.clipDepth + 1;
-		vt(e, t.path, n, t.transform), t.depth = n, e.clipDepth = n;
+		_t(e, t.path, n, t.transform), t.depth = n, e.clipDepth = n;
 	}
 }
-function Fe(e) {
+function Ne(e) {
 	let t = null;
 	for (let n of e.clipStack) n.rect && (t = t ? x(t, n.rect) : n.rect);
 	e.drawBatch.clip = t;
 }
-function Ie(e) {
+function Pe(e) {
 	let t = e.clipStack;
 	if (t.length === 0 || e.uncut) return e.clipDepth;
 	for (let e = t.length - 1; e >= 0; e--) if (t[e].rect === null) return t[e].depth;
 	for (let e of t) if (e.depth > 0) return e.depth - 1;
 	return e.clipDepth;
 }
-function j(e) {
-	Pe(e);
+function M(e) {
+	j(e);
 	let t = e.drawBatch.clip;
 	return e.drawBatch.clip = null, e.uncut = !0, t;
 }
-function M(e, t) {
+function N(e, t) {
 	e.drawBatch.clip = t, e.uncut = !1;
 }
-function N(e, t, n, r) {
-	let i = j(e);
-	r(e, t, n), M(e, i);
+function P(e, t, n, r) {
+	let i = M(e);
+	r(e, t, n), N(e, i);
 }
-function P(e) {
-	G(e), e.clipStack.length > 0 && Pe(e);
+function F(e) {
+	q(e), e.clipStack.length > 0 && j(e);
 }
-function Le(e, t) {
-	t.fill && Re(e, t), t.stroke?.paint && Ct(e, t);
+function Fe(e, t) {
+	t.fill && Ie(e, t), t.stroke?.paint && bt(e, t);
 }
-function Re(e, t) {
-	let n = t.fill, r = n.fill === void 0 || n.fill === "solid", i = !!(t.vertexColors && t.vertexColors.length > 0), a = n, o = H(e, n, i);
+function Ie(e, t) {
+	let n = t.fill, r = n.fill === void 0 || n.fill === "solid", i = !!(t.vertexColors && t.vertexColors.length > 0), a = n, o = G(e, n, i);
 	if (o === null) return;
 	if (o !== void 0 && t.path.kind === "rect") {
-		o.kind === "ramp" ? nt(e, t.path, o) : Ye(e, t.path, o);
+		o.kind === "ramp" ? $e(e, t.path, o) : Ge(e, t.path, o);
 		return;
 	}
 	let s = ge(e, t.path);
-	if (W(e, s, o)) return;
+	if (K(e, s, o)) return;
 	let c = _e(e, s);
-	r && i ? it(e, t, a, c) : c.requiresStencil ? bt(e, n, c) : lt(e, n, c);
+	r && i ? nt(e, t, a, c) : c.requiresStencil ? yt(e, n, c) : ct(e, n, c);
 }
-var ze = new Int32Array(Array.from({ length: t }, (e, t) => t)), F = new Float32Array(2 * t);
-function Be(e) {
-	return e === s || E(s, e);
+var Le = new Int32Array(Array.from({ length: t }, (e, t) => t)), I = new Float32Array(2 * t);
+function Re(e) {
+	return e === s || T(s, e);
 }
-function I(e, t, n, r, i = 0) {
-	if (t.clipDepth !== (e.clipStack.length === 0 ? e.clipDepth : Ie(e)) || t.synthBold !== i || !t.foldsAlpha && t.alpha !== e.state.alpha || n !== void 0 && Ve(t, n, r) < 0) return !1;
+function L(e, t, n, r, i = 0) {
+	if (t.clipDepth !== (e.clipStack.length === 0 ? e.clipDepth : Pe(e)) || t.synthBold !== i || !t.foldsAlpha && t.alpha !== e.state.alpha || n !== void 0 && ze(t, n, r) < 0) return !1;
 	let a = e.state.colorMatrix;
-	return t.colorMatrix === a || E(t.colorMatrix, a);
+	return t.colorMatrix === a || T(t.colorMatrix, a);
 }
-function Ve(e, t, n) {
+function ze(e, t, n) {
 	for (let r = 0; r < e.textures.length; r++) {
 		let i = e.textures[r];
 		if (i.kind === "bitmap" && i.image === t) return i.sampling === n ? r + 1 : -1;
 	}
-	return L(e);
+	return R(e);
 }
-function He(e) {
+function Be(e) {
 	for (let t = 0; t < e.textures.length; t++) if (e.textures[t].kind === "ramps") return t + 1;
-	return L(e);
+	return R(e);
 }
-function Ue(e, t) {
+function Ve(e, t) {
 	for (let n = 0; n < e.textures.length; n++) {
 		let r = e.textures[n];
 		if (r.kind === "atlas" && r.id === t) return n + 1;
 	}
-	return L(e);
+	return R(e);
 }
-function L(e) {
+function R(e) {
 	return e.textures.length + 1 < t ? e.textures.length + 1 : -1;
 }
-var We = 256;
-function Ge(e) {
-	return !e.requiresStencil && e.vertices.length >> 1 <= We;
+var z = {
+	maxVertices: 96,
+	maxVerticesInRun: 1024
+};
+function He(e, t) {
+	if (t.requiresStencil) return !1;
+	let n = e.drawBatch.length > 0 ? z.maxVerticesInRun : z.maxVertices;
+	return t.vertices.length >> 1 <= n;
 }
-function R(e, t) {
-	return e.batchState !== void 0 && !I(e, e.batchState) && G(e), e.drawBatch.wouldOverflow(t) && G(e), z(e);
+function B(e, t) {
+	return e.batchState !== void 0 && !L(e, e.batchState) && q(e), e.drawBatch.wouldOverflow(t) && q(e), V(e);
 }
-function z(e) {
+function V(e) {
 	if (e.batchState === void 0) {
-		let t = e.state.colorMatrix, n = Be(t);
+		let t = e.state.colorMatrix, n = Re(t);
 		e.batchState = {
 			alpha: n ? 1 : e.state.alpha,
 			colorMatrix: t,
-			clipDepth: Ie(e),
+			clipDepth: Pe(e),
 			synthBold: 0,
 			foldsAlpha: n,
 			textures: []
@@ -499,9 +504,9 @@ function z(e) {
 	}
 	return e.batchState;
 }
-function B(e, t, n) {
-	e.batchState !== void 0 && !I(e, e.batchState, t, n) && G(e), e.drawBatch.wouldOverflow(4) && G(e);
-	let r = z(e), i = Ve(r, t, n);
+function H(e, t, n) {
+	e.batchState !== void 0 && !L(e, e.batchState, t, n) && q(e), e.drawBatch.wouldOverflow(4) && q(e);
+	let r = V(e), i = ze(r, t, n);
 	return i > r.textures.length && (r.textures.push({
 		kind: "bitmap",
 		image: t,
@@ -511,11 +516,11 @@ function B(e, t, n) {
 		slot: i
 	};
 }
-function V(e, t, n, r) {
-	e.batchState !== void 0 && (!I(e, e.batchState, void 0, void 0, r) || Ue(e.batchState, t) < 0) && G(e), e.drawBatch.wouldOverflow(4) && G(e);
-	let i = z(e);
+function U(e, t, n, r) {
+	e.batchState !== void 0 && (!L(e, e.batchState, void 0, void 0, r) || Ve(e.batchState, t) < 0) && q(e), e.drawBatch.wouldOverflow(4) && q(e);
+	let i = V(e);
 	i.synthBold = r;
-	let a = Ue(i, t);
+	let a = Ve(i, t);
 	return a > i.textures.length && (i.textures.push({
 		kind: "atlas",
 		id: t,
@@ -525,36 +530,36 @@ function V(e, t, n, r) {
 		slot: a
 	};
 }
-function Ke(e, t, n, r) {
-	e.gradRamps.wouldReshape(t, n) && G(e), e.batchState !== void 0 && (!I(e, e.batchState) || He(e.batchState) < 0) && G(e), e.drawBatch.wouldOverflow(r) && G(e);
-	let i = z(e), a = He(i);
+function Ue(e, t, n, r) {
+	e.gradRamps.wouldReshape(t, n) && q(e), e.batchState !== void 0 && (!L(e, e.batchState) || Be(e.batchState) < 0) && q(e), e.drawBatch.wouldOverflow(r) && q(e);
+	let i = V(e), a = Be(i);
 	return a > i.textures.length && (i.textures.push({ kind: "ramps" }), a = i.textures.length), {
 		staged: i,
 		slot: a,
 		rowV: e.gradRamps.rowV(e.gradRamps.upload(t, n))
 	};
 }
-function qe(e, t, n) {
+function W(e, t, n) {
 	return (n ?? 1) * (t.foldsAlpha ? e.state.alpha : 1);
 }
-function Je(e, t, n) {
+function We(e, t, n) {
 	let [r, i, o, s] = a(n.color);
 	return [
 		r,
 		i,
 		o,
-		s * qe(e, t, n.opacity)
+		s * W(e, t, n.opacity)
 	];
 }
-function Ye(e, t, n) {
-	let [r, i, a, o] = Je(e, R(e, 4), n);
-	e.drawBatch.pushRect(t.x, t.y, t.width, t.height, e.state.transform, r, i, a, o) || N(e, t, n, Ye);
+function Ge(e, t, n) {
+	let [r, i, a, o] = We(e, B(e, 4), n);
+	e.drawBatch.pushRect(t.x, t.y, t.width, t.height, e.state.transform, r, i, a, o) || P(e, t, n, Ge);
 }
-function Xe(e, t, n) {
-	let [r, i, a, o] = Je(e, R(e, t.vertices.length >> 1), n);
-	e.drawBatch.pushMesh(t, e.state.transform, r, i, a, o) || N(e, t, n, Xe);
+function Ke(e, t, n) {
+	let [r, i, a, o] = We(e, B(e, t.vertices.length >> 1), n);
+	e.drawBatch.pushMesh(t, e.state.transform, r, i, a, o) || P(e, t, n, Ke);
 }
-function H(e, t, a) {
+function G(e, t, a) {
 	if (a) return;
 	let o = t.fill ?? "solid";
 	if (o === "solid") {
@@ -566,10 +571,10 @@ function H(e, t, a) {
 		};
 	}
 	if (o !== "linear-gradient" && o !== "radial-gradient" && o !== "conic-gradient") return;
-	let s = t, c = Ze(e, s.units);
-	return c ? s.fill === "linear-gradient" ? U(s, r, Qe(c, s)) : s.fill === "radial-gradient" ? U(s, i, $e(c, s)) : U(s, n, et(c, s)) : null;
+	let s = t, c = Je(e, s.units);
+	return c ? s.fill === "linear-gradient" ? qe(s, r, Ye(c, s)) : s.fill === "radial-gradient" ? qe(s, i, Xe(c, s)) : qe(s, n, Ze(c, s)) : null;
 }
-function U(e, t, n) {
+function qe(e, t, n) {
 	return {
 		kind: "ramp",
 		stops: e.stops,
@@ -579,11 +584,11 @@ function U(e, t, n) {
 		uv: n
 	};
 }
-function Ze(e, t) {
+function Je(e, t) {
 	let n = X(e, t);
 	return n && o.multiply(n, e.state.transform);
 }
-function Qe(e, t) {
+function Ye(e, t) {
 	let n = t.to.x - t.from.x, r = t.to.y - t.from.y, i = Math.hypot(n, r) || 1, a = 1 / (i * i);
 	return {
 		ux: (e[0] * n + e[1] * r) * a,
@@ -594,7 +599,7 @@ function Qe(e, t) {
 		v0: 0
 	};
 }
-function $e(e, t) {
+function Xe(e, t) {
 	let n = 1 / Math.max(t.radius, 1e-4);
 	return {
 		ux: e[0] * n,
@@ -605,7 +610,7 @@ function $e(e, t) {
 		v0: (e[7] - t.center.y) * n
 	};
 }
-function et(e, t) {
+function Ze(e, t) {
 	let n = Math.cos(t.angle), r = Math.sin(t.angle), i = e[6] - t.center.x, a = e[7] - t.center.y;
 	return {
 		ux: n * e[0] + r * e[1],
@@ -616,7 +621,7 @@ function et(e, t) {
 		v0: n * a - r * i
 	};
 }
-function tt(e, t) {
+function Qe(e, t) {
 	return e.mode === r ? {
 		uv: {
 			...e.uv,
@@ -628,18 +633,18 @@ function tt(e, t) {
 		post: t
 	};
 }
-function nt(e, t, n) {
-	let { staged: r, slot: i, rowV: a } = Ke(e, n.stops, n.space, 4), { uv: o, post: s } = tt(n, a);
-	e.drawBatch.pushGradientRect(t.x, t.y, t.width, t.height, e.state.transform, o, s, i, n.mode, 1, 1, 1, qe(e, r, n.opacity)) || N(e, t, n, nt);
+function $e(e, t, n) {
+	let { staged: r, slot: i, rowV: a } = Ue(e, n.stops, n.space, 4), { uv: o, post: s } = Qe(n, a);
+	e.drawBatch.pushGradientRect(t.x, t.y, t.width, t.height, e.state.transform, o, s, i, n.mode, 1, 1, 1, W(e, r, n.opacity)) || P(e, t, n, $e);
 }
-function rt(e, t, n) {
-	let { staged: r, slot: i, rowV: a } = Ke(e, n.stops, n.space, t.vertices.length >> 1), { uv: o, post: s } = tt(n, a);
-	e.drawBatch.pushGradientMesh(t, e.state.transform, o, s, i, n.mode, 1, 1, 1, qe(e, r, n.opacity)) || N(e, t, n, rt);
+function et(e, t, n) {
+	let { staged: r, slot: i, rowV: a } = Ue(e, n.stops, n.space, t.vertices.length >> 1), { uv: o, post: s } = Qe(n, a);
+	e.drawBatch.pushGradientMesh(t, e.state.transform, o, s, i, n.mode, 1, 1, 1, W(e, r, n.opacity)) || P(e, t, n, et);
 }
-function W(e, t, n) {
-	return n !== void 0 && Ge(t) ? (n.kind === "ramp" ? rt(e, t, n) : Xe(e, t, n), !0) : (P(e), !1);
+function K(e, t, n) {
+	return n !== void 0 && He(e, t) ? (n.kind === "ramp" ? et(e, t, n) : Ke(e, t, n), !0) : (F(e), !1);
 }
-function G(e) {
+function q(e) {
 	let t = e.drawBatch, n = e.batchState;
 	if (t.length === 0 || n === void 0) {
 		e.batchState = void 0;
@@ -648,11 +653,11 @@ function G(e) {
 	let r = e.gl, i = e.batchFill;
 	r.useProgram(i.handle);
 	let a = t.uploadAndBind();
-	q(e, i, O), me(e, i, 1, 1, 1, 1), D(e, i, n.alpha), r.uniform1f(i.uniform("u_synthBold"), n.synthBold), A(e, i, n.colorMatrix), r.activeTexture(r.TEXTURE0), r.bindTexture(r.TEXTURE_2D, e.whiteTexture);
+	J(e, i, D), me(e, i, 1, 1, 1, 1), E(e, i, n.alpha), r.uniform1f(i.uniform("u_synthBold"), n.synthBold), k(e, i, n.colorMatrix), r.activeTexture(r.TEXTURE0), r.bindTexture(r.TEXTURE_2D, e.whiteTexture);
 	for (let t = 0; t < n.textures.length; t++) {
 		let i = n.textures[t];
 		if (i.kind === "atlas") {
-			e.textureCache.bind(i.id, t + 1), F[2 * (t + 1)] = i.fieldScale[0], F[2 * (t + 1) + 1] = i.fieldScale[1];
+			e.textureCache.bind(i.id, t + 1), I[2 * (t + 1)] = i.fieldScale[0], I[2 * (t + 1) + 1] = i.fieldScale[1];
 			continue;
 		}
 		if (i.kind === "ramps") {
@@ -661,9 +666,9 @@ function G(e) {
 		}
 		e.imageCache.bind(i.image, t + 1), e.imageCache.setMagFilter(i.image, i.sampling === "nearest" ? r.NEAREST : r.LINEAR);
 	}
-	r.uniform1iv(i.uniform("u_samplers"), ze), r.uniform2fv(i.uniform("u_fieldScale"), F), Z(e, n.clipDepth), w(e, a, e.gl.UNSIGNED_INT), r.activeTexture(r.TEXTURE0), r.bindVertexArray(null), t.reset(), e.batchState = void 0;
+	r.uniform1iv(i.uniform("u_samplers"), Le), r.uniform2fv(i.uniform("u_fieldScale"), I), Z(e, n.clipDepth), C(e, a, e.gl.UNSIGNED_INT), r.activeTexture(r.TEXTURE0), r.bindVertexArray(null), t.reset(), e.batchState = void 0;
 }
-function K(e, t) {
+function tt(e, t) {
 	let n = t.anchorA, r = t.anchorB, i = t.anchorT;
 	if (!n || !r || !i) return new Float32Array(e);
 	let a = n.length, o = new Float32Array(a * 4);
@@ -673,33 +678,33 @@ function K(e, t) {
 	}
 	return o;
 }
-function it(e, t, n, r) {
+function nt(e, t, n, r) {
 	let i = e.gl, a = e.pathFillVColor;
-	i.useProgram(a.handle), i.bindVertexArray(r.vao), q(e, a), J(e, a, n.color, n.opacity), A(e, a);
-	let o = K(t.vertexColors, r), s = i.createBuffer();
+	i.useProgram(a.handle), i.bindVertexArray(r.vao), J(e, a), Y(e, a, n.color, n.opacity), k(e, a);
+	let o = tt(t.vertexColors, r), s = i.createBuffer();
 	if (!s) throw Error("drawPathFillVColor: createBuffer (color VBO) returned null");
 	i.bindBuffer(i.ARRAY_BUFFER, s), i.bufferData(i.ARRAY_BUFFER, o, i.DYNAMIC_DRAW);
 	let c = a.attribute("a_vertexColor");
-	c !== void 0 && (i.enableVertexAttribArray(c), i.vertexAttribPointer(c, 4, i.FLOAT, !1, 0, 0)), Z(e), w(e, r.indexCount, e.gl.UNSIGNED_INT), i.bindVertexArray(null), i.deleteBuffer(s);
+	c !== void 0 && (i.enableVertexAttribArray(c), i.vertexAttribPointer(c, 4, i.FLOAT, !1, 0, 0)), Z(e), C(e, r.indexCount, e.gl.UNSIGNED_INT), i.bindVertexArray(null), i.deleteBuffer(s);
 }
-function q(e, t, n = e.state.transform, r = he(e)) {
-	let i = e.gl, a = T(e, t);
-	E(a.proj, r) || (i.uniformMatrix3fv(t.uniform("u_proj"), !1, r), a.proj = Float32Array.from(r)), E(a.model, n) || (i.uniformMatrix3fv(t.uniform("u_model"), !1, n), a.model = Float32Array.from(n));
+function J(e, t, n = e.state.transform, r = he(e)) {
+	let i = e.gl, a = w(e, t);
+	T(a.proj, r) || (i.uniformMatrix3fv(t.uniform("u_proj"), !1, r), a.proj = Float32Array.from(r)), T(a.model, n) || (i.uniformMatrix3fv(t.uniform("u_model"), !1, n), a.model = Float32Array.from(n));
 }
-function J(e, t, n, r) {
+function Y(e, t, n, r) {
 	let [i, o, s, c] = a(n);
-	me(e, t, i, o, s, c * (r ?? 1)), D(e, t, e.state.alpha);
+	me(e, t, i, o, s, c * (r ?? 1)), E(e, t, e.state.alpha);
 }
-function Y(e, t) {
+function rt(e, t) {
 	let n = t.fill ?? "solid";
-	if (n === "solid") return ut(e, t);
-	if (n === "pattern") return dt(e, t);
-	if (n === "linear-gradient" || n === "radial-gradient" || n === "conic-gradient") return ht(e, t);
+	if (n === "solid") return lt(e, t);
+	if (n === "pattern") return ut(e, t);
+	if (n === "linear-gradient" || n === "radial-gradient" || n === "conic-gradient") return mt(e, t);
 	let r = l(n)?.bind;
-	return r ? r(at(e), t) : null;
+	return r ? r(it(e), t) : null;
 }
-function at(e) {
-	let t = ot.get(e);
+function it(e) {
+	let t = at.get(e);
 	if (t) return t;
 	let n = {
 		gl: e.gl,
@@ -707,38 +712,38 @@ function at(e) {
 			return e.state.alpha;
 		},
 		program: (t) => e.ensureProgram?.(t) ?? e.programRegistry.get(t) ?? null,
-		setProjAndModel: (t) => q(e, t),
+		setProjAndModel: (t) => J(e, t),
 		spaceInverse: (t) => X(e, t),
-		spaceToDevice: (t) => mt(e, t),
+		spaceToDevice: (t) => pt(e, t),
 		get maxTextureSize() {
 			return e.imageCache.maxTextureSide;
 		},
-		resources: e.paintResources ?? ct(e.gl),
+		resources: e.paintResources ?? st(e.gl),
 		bindRamp: (t, n, r) => {
 			let i = e.gradRamps.upload(t, r);
 			return e.gradRamps.bind(n), e.gradRamps.rowV(i);
 		}
 	};
-	return ot.set(e, n), n;
+	return at.set(e, n), n;
 }
-var ot = /* @__PURE__ */ new WeakMap(), st = /* @__PURE__ */ new WeakMap();
-function ct(t) {
-	let n = st.get(t);
-	return n || (n = e(), st.set(t, n)), n;
+var at = /* @__PURE__ */ new WeakMap(), ot = /* @__PURE__ */ new WeakMap();
+function st(t) {
+	let n = ot.get(t);
+	return n || (n = e(), ot.set(t, n)), n;
 }
-function lt(e, t, n) {
-	if (!Y(e, t)) return;
+function ct(e, t, n) {
+	if (!rt(e, t)) return;
 	let r = e.gl;
-	r.bindVertexArray(n.vao), Z(e), w(e, n.indexCount, e.gl.UNSIGNED_INT), r.bindVertexArray(null);
+	r.bindVertexArray(n.vao), Z(e), C(e, n.indexCount, e.gl.UNSIGNED_INT), r.bindVertexArray(null);
 }
-function ut(e, t) {
+function lt(e, t) {
 	let n = e.pathFill;
-	return e.gl.useProgram(n.handle), q(e, n), J(e, n, t.color, t.opacity), A(e, n), n;
+	return e.gl.useProgram(n.handle), J(e, n), Y(e, n, t.color, t.opacity), k(e, n), n;
 }
-function dt(e, t) {
-	return ft(e, e.patternFill, t, e.state.transform);
+function ut(e, t) {
+	return dt(e, e.patternFill, t, e.state.transform);
 }
-function ft(e, t, n, r) {
+function dt(e, t, n, r) {
 	let i = n.pattern, a = c(i.id);
 	if (!a) return (typeof process > "u" || process.env.NODE_ENV !== "production") && console.warn(`weasel: pattern TextureHandle "${i.id}" not registered`), null;
 	let o = X(e, n.units);
@@ -750,31 +755,31 @@ function ft(e, t, n, r) {
 	if (!s) return null;
 	e.textureCache.upload(i.id, a.source, "repeat");
 	let l = e.gl;
-	l.useProgram(t.handle), q(e, t, r), A(e, t), l.uniformMatrix3fv(t.uniform("u_worldInv"), !1, s);
-	let [u, f] = pt(a.source);
-	return l.uniform2f(t.uniform("u_tileSize"), u, f), e.textureCache.bind(i.id, 0), l.uniform1i(t.uniform("u_sampler"), 0), l.uniform1f(t.uniform("u_opacity"), n.opacity ?? 1), D(e, t, e.state.alpha), t;
+	l.useProgram(t.handle), J(e, t, r), k(e, t), l.uniformMatrix3fv(t.uniform("u_worldInv"), !1, s);
+	let [u, f] = ft(a.source);
+	return l.uniform2f(t.uniform("u_tileSize"), u, f), e.textureCache.bind(i.id, 0), l.uniform1i(t.uniform("u_sampler"), 0), l.uniform1f(t.uniform("u_opacity"), n.opacity ?? 1), E(e, t, e.state.alpha), t;
 }
-function pt(e) {
+function ft(e) {
 	let t = "naturalWidth" in e ? e.naturalWidth : e.width, n = "naturalHeight" in e ? e.naturalHeight : e.height;
 	return [t || 1, n || 1];
 }
 function X(e, t) {
 	return t === "local" ? o.invert(e.state.transform) : t === "world" && e.viewMatrix ? o.invert(e.viewMatrix) : o.identity();
 }
-function mt(e, t) {
+function pt(e, t) {
 	let n = X(e, t), r = n && o.invert(n);
 	if (!r) return null;
 	let i = e.deviceWidth && e.widthCss > 0 ? e.deviceWidth / e.widthCss : 1;
 	return o.multiply(o.scaled(o.identity(), i, i), r);
 }
-function ht(e, t) {
-	return gt(e, e.gradFill, t, e.state.transform);
+function mt(e, t) {
+	return ht(e, e.gradFill, t, e.state.transform);
 }
-function gt(e, t, n, r) {
+function ht(e, t, n, r) {
 	let i = X(e, n.units);
 	if (!i) return null;
 	let a = e.gl, o = e.gradRamps.upload(n.stops, n.interpolate ?? "rgb");
-	if (a.useProgram(t.handle), q(e, t, r), a.uniformMatrix3fv(t.uniform("u_worldInv"), !1, i), A(e, t), e.gradRamps.bind(0), a.uniform1i(t.uniform("u_ramp"), 0), a.uniform1f(t.uniform("u_rampV"), e.gradRamps.rowV(o)), D(e, t, e.state.alpha), a.uniform1f(t.uniform("u_opacity"), n.opacity ?? 1), n.fill === "linear-gradient") {
+	if (a.useProgram(t.handle), J(e, t, r), a.uniformMatrix3fv(t.uniform("u_worldInv"), !1, i), k(e, t), e.gradRamps.bind(0), a.uniform1i(t.uniform("u_ramp"), 0), a.uniform1f(t.uniform("u_rampV"), e.gradRamps.rowV(o)), E(e, t, e.state.alpha), a.uniform1f(t.uniform("u_opacity"), n.opacity ?? 1), n.fill === "linear-gradient") {
 		a.uniform1i(t.uniform("u_gradKind"), 0);
 		let e = n.to.x - n.from.x, r = n.to.y - n.from.y, i = Math.hypot(e, r) || 1;
 		a.uniform2f(t.uniform("u_gradP0"), n.from.x, n.from.y), a.uniform2f(t.uniform("u_gradDir"), e / i, r / i), a.uniform1f(t.uniform("u_gradLen"), i), a.uniform1f(t.uniform("u_gradRadius"), 0), a.uniform1f(t.uniform("u_gradAngle"), 0);
@@ -793,115 +798,97 @@ function Z(e, t = e.clipDepth) {
 function Q(e) {
 	return e === 0 ? 0 : (1 << e + 1) - 1 & 254;
 }
-function _t(e, t, n) {
+function gt(e, t, n) {
 	let r = e.gl, i = ve(e, t);
-	r.useProgram(e.pathFill.handle), r.bindVertexArray(i.vao), q(e, e.pathFill, n), w(e, i.indexCount, e.gl.UNSIGNED_INT), r.bindVertexArray(null);
+	r.useProgram(e.pathFill.handle), r.bindVertexArray(i.vao), J(e, e.pathFill, n), C(e, i.indexCount, e.gl.UNSIGNED_INT), r.bindVertexArray(null);
 }
-function vt(e, t, n, r = e.state.transform) {
-	G(e);
+function _t(e, t, n, r = e.state.transform) {
+	q(e);
 	let i = e.gl, a = Q(n - 1), o = 1 << n, s = a | o;
-	i.enable(i.STENCIL_TEST), i.colorMask(!1, !1, !1, !1), i.stencilMask(o), i.stencilFunc(i.EQUAL, s, a), i.stencilOp(i.KEEP, i.KEEP, i.REPLACE), _t(e, t, r), i.colorMask(!0, !0, !0, !0), i.stencilMask(255);
+	i.enable(i.STENCIL_TEST), i.colorMask(!1, !1, !1, !1), i.stencilMask(o), i.stencilFunc(i.EQUAL, s, a), i.stencilOp(i.KEEP, i.KEEP, i.REPLACE), gt(e, t, r), i.colorMask(!0, !0, !0, !0), i.stencilMask(255);
 }
-function yt(e, t, n, r = e.state.transform) {
-	e.batchState !== void 0 && e.batchState.clipDepth > n && G(e);
+function vt(e, t, n, r = e.state.transform) {
+	e.batchState !== void 0 && e.batchState.clipDepth > n && q(e);
 	let i = e.gl;
 	i.enable(i.STENCIL_TEST);
 	let a = 1 << n + 1, o = Q(n) | a;
-	i.colorMask(!1, !1, !1, !1), i.stencilMask(a), i.stencilFunc(i.EQUAL, o, o), i.stencilOp(i.KEEP, i.KEEP, i.ZERO), _t(e, t, r), i.colorMask(!0, !0, !0, !0), i.stencilMask(255);
+	i.colorMask(!1, !1, !1, !1), i.stencilMask(a), i.stencilFunc(i.EQUAL, o, o), i.stencilOp(i.KEEP, i.KEEP, i.ZERO), gt(e, t, r), i.colorMask(!0, !0, !0, !0), i.stencilMask(255);
 }
-function bt(e, t, n) {
+function yt(e, t, n) {
 	let r = e.gl;
-	r.useProgram(e.pathFill.handle), r.bindVertexArray(n.vao), q(e, e.pathFill), r.enable(r.STENCIL_TEST), r.colorMask(!1, !1, !1, !1), r.stencilMask(1), r.stencilFunc(r.ALWAYS, 0, 1), r.stencilOp(r.KEEP, r.KEEP, r.INVERT), w(e, n.indexCount, e.gl.UNSIGNED_INT);
+	r.useProgram(e.pathFill.handle), r.bindVertexArray(n.vao), J(e, e.pathFill), r.enable(r.STENCIL_TEST), r.colorMask(!1, !1, !1, !1), r.stencilMask(1), r.stencilFunc(r.ALWAYS, 0, 1), r.stencilOp(r.KEEP, r.KEEP, r.INVERT), C(e, n.indexCount, e.gl.UNSIGNED_INT);
 	let i = Q(e.clipDepth);
-	r.colorMask(!0, !0, !0, !0), r.stencilFunc(r.EQUAL, i | 1, i | 1), r.stencilOp(r.KEEP, r.KEEP, r.KEEP), Y(e, t) && w(e, n.indexCount, e.gl.UNSIGNED_INT), r.stencilMask(1), r.clear(r.STENCIL_BUFFER_BIT), r.disable(r.STENCIL_TEST), r.bindVertexArray(null);
-}
-function xt(e, t) {
-	let n = t.stroke, { markerStart: r, markerMid: i, markerEnd: a } = n;
-	if (typeof n.width != "object" && !$(r) && !$(i) && !$(a)) return t;
-	let s = o.meanScaleOf(e.state.transform), c = { ...n };
-	return typeof n.width == "object" && (c.width = p(n.width, v(n.width.px, s))), $(r) && (c.markerStart = St(r, s)), $(i) && (c.markerMid = St(i, s)), $(a) && (c.markerEnd = St(a, s)), {
-		...t,
-		stroke: c
-	};
-}
-function $(e) {
-	return typeof e == "object" && typeof e.size == "object";
-}
-function St(e, t) {
-	return {
-		...e,
-		size: _(e, 0, v(e.size.px, t))
-	};
-}
-function Ct(e, t) {
-	let n = xt(e, t), r = n.stroke, i = r.align ?? "center";
-	n.path.kind === "polygon" && i !== "center" ? (P(e), Dt(e, n, i)) : wt(e, n);
-	let a = p(r.width ?? 1, 1);
-	for (let i of b(n.path, t.stroke, r, a, e.flattenTolerance)) Le(e, i);
-}
-function wt(e, t) {
-	let n = t.stroke, r = n.paint, i = r.fill === void 0 || r.fill === "solid", a = r, o = y(t.path, n, e.flattenTolerance);
-	if (o.indices.length === 0) return;
-	let s = !!(n.vertexColors && n.vertexColors.length > 0), c = H(e, r, s);
-	if (c === null || W(e, o, c)) return;
-	let l = s ? e.meshCache.uploadTransient(o) : e.meshCache.uploadRecurring(o);
-	if (!i && !s) {
-		lt(e, r, l);
+	r.colorMask(!0, !0, !0, !0), r.stencilFunc(r.EQUAL, i | 1, i | 1), r.stencilOp(r.KEEP, r.KEEP, r.KEEP), rt(e, t) && C(e, n.indexCount, e.gl.UNSIGNED_INT), r.stencilMask(1), r.clear(r.STENCIL_BUFFER_BIT), r.disable(r.STENCIL_TEST), r.bindVertexArray(null);
+}
+function bt(e, t) {
+	let { cmd: n, spaces: r } = y(e.state.transform, t), i = n.stroke, a = i.align ?? "center", o = r.ribbon?.metric;
+	(n.path.kind === "polygon" || o !== void 0 && !p(o)) && a !== "center" ? (F(e), wt(e, n, a, r)) : xt(e, n, r);
+	let s = m(i.width ?? 1, 1), c = b(n.path, t.stroke, i, s, e.flattenTolerance, r);
+	for (let t of c) Fe(e, t);
+}
+function xt(e, t, n) {
+	let r = t.stroke, i = r.paint, a = i.fill === void 0 || i.fill === "solid", o = i, s = h(t.path, r, e.flattenTolerance, n);
+	if (s.indices.length === 0) return;
+	let c = !!(r.vertexColors && r.vertexColors.length > 0), l = G(e, i, c);
+	if (l === null || K(e, s, l)) return;
+	let u = c ? e.meshCache.uploadTransient(s) : e.meshCache.uploadRecurring(s);
+	if (!a && !c) {
+		ct(e, i, u);
 		return;
 	}
-	let u = e.gl;
-	if (s) {
+	let d = e.gl;
+	if (c) {
 		let t = e.pathFillVColor;
-		u.useProgram(t.handle), u.bindVertexArray(l.vao), q(e, t), J(e, t, i ? a.color : "#ffffff", r.opacity), A(e, t);
-		let o = K(n.vertexColors, l), s = u.createBuffer();
+		d.useProgram(t.handle), d.bindVertexArray(u.vao), J(e, t), Y(e, t, a ? o.color : "#ffffff", i.opacity), k(e, t);
+		let n = tt(r.vertexColors, u), s = d.createBuffer();
 		if (!s) throw Error("drawPathStrokeUnclipped: createBuffer (color VBO) returned null");
-		u.bindBuffer(u.ARRAY_BUFFER, s), u.bufferData(u.ARRAY_BUFFER, o, u.DYNAMIC_DRAW);
+		d.bindBuffer(d.ARRAY_BUFFER, s), d.bufferData(d.ARRAY_BUFFER, n, d.DYNAMIC_DRAW);
 		let c = t.attribute("a_vertexColor");
-		c !== void 0 && (u.enableVertexAttribArray(c), u.vertexAttribPointer(c, 4, u.FLOAT, !1, 0, 0)), Z(e), w(e, l.indexCount, e.gl.UNSIGNED_INT), u.bindVertexArray(null), u.deleteBuffer(s);
+		c !== void 0 && (d.enableVertexAttribArray(c), d.vertexAttribPointer(c, 4, d.FLOAT, !1, 0, 0)), Z(e), C(e, u.indexCount, e.gl.UNSIGNED_INT), d.bindVertexArray(null), d.deleteBuffer(s);
 		return;
 	}
-	u.useProgram(e.pathFill.handle), u.bindVertexArray(l.vao), q(e, e.pathFill), J(e, e.pathFill, a.color, a.opacity), A(e, e.pathFill), Z(e), w(e, l.indexCount, e.gl.UNSIGNED_INT), u.bindVertexArray(null);
-}
-var Tt = /* @__PURE__ */ new WeakMap();
-function Et(e) {
-	let t = Tt.get(e);
-	return t === void 0 && (t = e.map((e) => e * 2), Tt.set(e, t)), t;
-}
-function Dt(e, t, n) {
-	let r = t.stroke, i = r.paint, a = i.fill === void 0 || i.fill === "solid", o = i, s = {
-		...r,
-		width: p(r.width ?? 1, 1) * 2,
-		...r.vertexWidths ? { vertexWidths: Et(r.vertexWidths) } : {},
+	d.useProgram(e.pathFill.handle), d.bindVertexArray(u.vao), J(e, e.pathFill), Y(e, e.pathFill, o.color, o.opacity), k(e, e.pathFill), Z(e), C(e, u.indexCount, e.gl.UNSIGNED_INT), d.bindVertexArray(null);
+}
+var St = /* @__PURE__ */ new WeakMap();
+function Ct(e) {
+	let t = St.get(e);
+	return t === void 0 && (t = e.map((e) => e * 2), St.set(e, t)), t;
+}
+function wt(e, t, n, r) {
+	let i = t.stroke, a = i.paint, o = a.fill === void 0 || a.fill === "solid", s = a, c = {
+		...i,
+		width: m(i.width ?? 1, 1) * 2,
+		...i.vertexWidths ? { vertexWidths: Ct(i.vertexWidths) } : {},
 		align: "center"
-	}, c = !!(r.vertexColors && r.vertexColors.length > 0), l = ve(e, t.path), u = y(t.path, s, e.flattenTolerance);
-	if (u.indices.length === 0) return;
-	let d = c ? e.meshCache.uploadTransient(u) : e.meshCache.uploadRecurring(u), f = e.gl, m = c ? e.pathFillVColor : e.pathFill;
-	f.useProgram(m.handle), q(e, m), f.enable(f.STENCIL_TEST), f.colorMask(!1, !1, !1, !1), f.stencilMask(1), f.stencilFunc(f.ALWAYS, 1, 1), f.stencilOp(f.KEEP, f.KEEP, f.REPLACE), f.bindVertexArray(l.vao), w(e, l.indexCount, e.gl.UNSIGNED_INT);
-	let h = Q(e.clipDepth);
-	f.colorMask(!0, !0, !0, !0), n === "inner" ? f.stencilFunc(f.EQUAL, h | 1, h | 1) : f.stencilFunc(f.EQUAL, h, h | 1), f.stencilOp(f.KEEP, f.KEEP, f.KEEP);
-	let g = m;
-	if (c ? (J(e, m, a ? o.color : "#ffffff", i.opacity), A(e, m)) : g = Y(e, i), !g) {
-		f.stencilMask(1), f.clear(f.STENCIL_BUFFER_BIT), f.disable(f.STENCIL_TEST), f.bindVertexArray(null);
+	}, l = !!(i.vertexColors && i.vertexColors.length > 0), u = ve(e, t.path), d = h(t.path, c, e.flattenTolerance, r);
+	if (d.indices.length === 0) return;
+	let f = l ? e.meshCache.uploadTransient(d) : e.meshCache.uploadRecurring(d), p = e.gl, g = l ? e.pathFillVColor : e.pathFill;
+	p.useProgram(g.handle), J(e, g), p.enable(p.STENCIL_TEST), p.colorMask(!1, !1, !1, !1), p.stencilMask(1), p.stencilFunc(p.ALWAYS, 1, 1), p.stencilOp(p.KEEP, p.KEEP, p.REPLACE), p.bindVertexArray(u.vao), C(e, u.indexCount, e.gl.UNSIGNED_INT);
+	let _ = Q(e.clipDepth);
+	p.colorMask(!0, !0, !0, !0), n === "inner" ? p.stencilFunc(p.EQUAL, _ | 1, _ | 1) : p.stencilFunc(p.EQUAL, _, _ | 1), p.stencilOp(p.KEEP, p.KEEP, p.KEEP);
+	let v = g;
+	if (l ? (Y(e, g, o ? s.color : "#ffffff", a.opacity), k(e, g)) : v = rt(e, a), !v) {
+		p.stencilMask(1), p.clear(p.STENCIL_BUFFER_BIT), p.disable(p.STENCIL_TEST), p.bindVertexArray(null);
 		return;
 	}
-	f.bindVertexArray(d.vao);
-	let _ = null;
-	if (c) {
-		let e = K(r.vertexColors, d);
-		if (_ = f.createBuffer(), !_) throw Error("drawPathStrokeStenciled: createBuffer (color VBO) returned null");
-		f.bindBuffer(f.ARRAY_BUFFER, _), f.bufferData(f.ARRAY_BUFFER, e, f.DYNAMIC_DRAW);
-		let t = g.attribute("a_vertexColor");
-		t !== void 0 && (f.enableVertexAttribArray(t), f.vertexAttribPointer(t, 4, f.FLOAT, !1, 0, 0));
+	p.bindVertexArray(f.vao);
+	let y = null;
+	if (l) {
+		let e = tt(i.vertexColors, f);
+		if (y = p.createBuffer(), !y) throw Error("drawPathStrokeStenciled: createBuffer (color VBO) returned null");
+		p.bindBuffer(p.ARRAY_BUFFER, y), p.bufferData(p.ARRAY_BUFFER, e, p.DYNAMIC_DRAW);
+		let t = v.attribute("a_vertexColor");
+		t !== void 0 && (p.enableVertexAttribArray(t), p.vertexAttribPointer(t, 4, p.FLOAT, !1, 0, 0));
 	}
-	w(e, d.indexCount, e.gl.UNSIGNED_INT), f.stencilMask(1), f.clear(f.STENCIL_BUFFER_BIT), f.disable(f.STENCIL_TEST), f.bindVertexArray(null), _ && f.deleteBuffer(_);
+	C(e, f.indexCount, e.gl.UNSIGNED_INT), p.stencilMask(1), p.clear(p.STENCIL_BUFFER_BIT), p.disable(p.STENCIL_TEST), p.bindVertexArray(null), y && p.deleteBuffer(y);
 }
-var Ot = 48;
-function kt(e) {
+var Tt = 48;
+function Et(e) {
 	let t = Math.hypot(e[0], e[1]), n = Math.hypot(e[3], e[4]);
 	return Math.sqrt(t * n) || 1;
 }
-function At(e, t) {
-	let n = le(t.style), r = n.lineHeight, i = t.align ?? n.align, a = t.maxWidth ?? Infinity, o = e.textOutlineMinScreenSize ?? Ot, s = Number.isFinite(o) ? o / kt(e.state.transform) : void 0, c = ce(t.runs, {
+function Dt(e, t) {
+	let n = le(t.style), r = n.lineHeight, i = t.align ?? n.align, a = t.maxWidth ?? Infinity, o = e.textOutlineMinScreenSize ?? Tt, s = Number.isFinite(o) ? o / Et(e.state.transform) : void 0, c = ce(t.runs, {
 		maxWidth: a,
 		alignWidth: t.width,
 		lineHeight: r,
@@ -911,62 +898,28 @@ function At(e, t) {
 	});
 	if (c.groups.length === 0 && c.decorations.length === 0) return;
 	let l = t.x, u = t.y + ue(t.verticalAlign, t.height, c.bounds.height);
-	for (let t of c.groups) t.source === "outline" ? jt(e, t, l, u) : zt(e, t, l, u);
-	It(e, c.decorations, l, u);
+	for (let t of c.groups) t.source === "outline" ? Ot(e, t, l, u) : Nt(e, t, l, u);
+	At(e, c.decorations, l, u);
 }
-function jt(e, t, n, r) {
+function Ot(e, t, n, r) {
 	let i = t.fill;
 	if (i !== null) {
-		let a = Nt(t, n, r);
-		a && Mt(e, i, a);
+		let a = _(t, n, r);
+		a && kt(e, i, a);
 	}
 	let a = t.stroke?.paint;
 	if (!a) return;
-	let s = Pt(t, n, r, o.meanScaleOf(e.state.transform));
-	s && Mt(e, a, s);
+	let o = v(t, n, r, e.state.transform);
+	o && kt(e, a, o);
 }
-function Mt(e, t, n) {
-	let r = H(e, t, !1);
-	r !== null && (W(e, n, r) || lt(e, t, e.meshCache.uploadTransient(n)));
-}
-function Nt(e, t, n) {
-	return Ft(e, t, n, (e) => m(e.key, e.d));
-}
-function Pt(e, t, n, r) {
-	let i = e.stroke;
-	if (!i) return null;
-	let a = p(i.width ?? 1, r);
-	return a > 0 ? Ft(e, t, n, (e) => e.scale > 0 ? h(e.key, e.d, g(a / e.scale), i) : null) : null;
-}
-function Ft(e, t, n, r) {
-	let i = [], a = 0, o = 0;
-	for (let t of e.glyphs) {
-		let e = r(t);
-		e && e.indices.length !== 0 && (i.push({
-			mesh: e,
-			glyph: t
-		}), a += e.vertices.length, o += e.indices.length);
-	}
-	if (i.length === 0) return null;
-	let s = e.synthetic.italic ? Math.tan(te) : 0, c = new Float32Array(a), l = new Uint32Array(o), u = 0, d = 0, f = 0;
-	for (let { mesh: e, glyph: r } of i) {
-		let { x: i, baselineY: a, scale: o } = r;
-		for (let r = 0; r < e.vertices.length; r += 2) {
-			let l = e.vertices[r], d = e.vertices[r + 1];
-			c[u++] = i + t + (l - d * s) * o, c[u++] = a + n + d * o;
-		}
-		for (let t = 0; t < e.indices.length; t++) l[d++] = f + e.indices[t];
-		f += e.vertices.length / 2;
-	}
-	return {
-		vertices: c,
-		indices: l
-	};
+function kt(e, t, n) {
+	let r = G(e, t, !1);
+	r !== null && (K(e, n, r) || ct(e, t, e.meshCache.uploadTransient(n)));
 }
-function It(e, t, n, r) {
+function At(e, t, n, r) {
 	for (let i of t) {
-		if (Bt(i.fill) !== null) {
-			Mt(e, i.fill, Lt(i.x0 + n, i.y0 + r, i.x1 + n, i.y1 + r));
+		if (Pt(i.fill) !== null) {
+			kt(e, i.fill, jt(i.x0 + n, i.y0 + r, i.x1 + n, i.y1 + r));
 			continue;
 		}
 		let [t, o, s, c] = "color" in i.fill ? a(i.fill.color) : [
@@ -976,14 +929,14 @@ function It(e, t, n, r) {
 			1
 		], l;
 		for (;;) {
-			let a = R(e, 4);
+			let a = B(e, 4);
 			if (e.drawBatch.pushRect(i.x0 + n, i.y0 + r, i.x1 - i.x0, i.y1 - i.y0, e.state.transform, t, o, s, c * (a.foldsAlpha ? e.state.alpha : 1))) break;
-			l = j(e);
+			l = M(e);
 		}
-		l !== void 0 && M(e, l);
+		l !== void 0 && N(e, l);
 	}
 }
-function Lt(e, t, n, r) {
+function jt(e, t, n, r) {
 	return {
 		vertices: new Float32Array([
 			e,
@@ -1005,17 +958,17 @@ function Lt(e, t, n, r) {
 		])
 	};
 }
-var Rt = .08;
-function zt(e, t, n, r) {
+var Mt = .08;
+function Nt(e, t, n, r) {
 	if (t.source === "canvas") {
 		if (!oe(e.textureCache, t.page)) return;
 	} else if (!ie(t.family, t.weight, t.style, e.textureCache)) return;
 	if (t.quads.length === 0) return;
-	let i = t.source === "canvas" ? re(t.page) : se(t.family, t.weight, t.style), o = t.source === "canvas" ? ne : C, s = ae(t.source === "canvas" ? "canvas" : "atlas", t.family, t.weight, t.style);
+	let i = t.source === "canvas" ? re(t.page) : se(t.family, t.weight, t.style), o = t.source === "canvas" ? ne : te, s = ae(t.source === "canvas" ? "canvas" : "atlas", t.family, t.weight, t.style);
 	if (!s) return;
-	let c = t.synthetic.bold ? Rt : 0, l = t.synthetic.italic ? Math.tan(te) : 0, u = Bt(t.fill);
+	let c = t.synthetic.bold ? Mt : 0, l = t.synthetic.italic ? Math.tan(g) : 0, u = Pt(t.fill);
 	if (u !== null) {
-		Ht(e, t, n, r, u, i, o, c, l, s);
+		Ft(e, t, n, r, u, i, o, c, l, s);
 		return;
 	}
 	let d = t.fill !== null && "color" in t.fill ? a(t.fill.color) : [
@@ -1023,43 +976,43 @@ function zt(e, t, n, r) {
 		0,
 		0,
 		1
-	], f = e.drawBatch, p = e.state.transform, { staged: m, slot: h } = V(e, i, s, c), g = d[3] * (m.foldsAlpha ? e.state.alpha : 1);
+	], f = e.drawBatch, p = e.state.transform, { staged: m, slot: h } = U(e, i, s, c), _ = d[3] * (m.foldsAlpha ? e.state.alpha : 1);
 	for (let a of t.quads) {
-		f.wouldOverflow(4) && (G(e), {staged: m, slot: h} = V(e, i, s, c), g = d[3] * (m.foldsAlpha ? e.state.alpha : 1));
+		f.wouldOverflow(4) && (q(e), {staged: m, slot: h} = U(e, i, s, c), _ = d[3] * (m.foldsAlpha ? e.state.alpha : 1));
 		let t;
-		for (; !f.pushGlyph(a.x0 + n, a.y0 + r, a.x1 + n, a.y1 + r, a.baselineY + r, l, p, a.u0, a.v0, a.u1, a.v1, d[0], d[1], d[2], g, h, o);) t = j(e), {staged: m, slot: h} = V(e, i, s, c), g = d[3] * (m.foldsAlpha ? e.state.alpha : 1);
-		t !== void 0 && (M(e, t), {staged: m, slot: h} = V(e, i, s, c), g = d[3] * (m.foldsAlpha ? e.state.alpha : 1));
+		for (; !f.pushGlyph(a.x0 + n, a.y0 + r, a.x1 + n, a.y1 + r, a.baselineY + r, l, p, a.u0, a.v0, a.u1, a.v1, d[0], d[1], d[2], _, h, o);) t = M(e), {staged: m, slot: h} = U(e, i, s, c), _ = d[3] * (m.foldsAlpha ? e.state.alpha : 1);
+		t !== void 0 && (N(e, t), {staged: m, slot: h} = U(e, i, s, c), _ = d[3] * (m.foldsAlpha ? e.state.alpha : 1));
 	}
 }
-function Bt(e) {
+function Pt(e) {
 	let t = e?.fill ?? "solid";
 	return t === "pattern" ? "pattern" : t === "linear-gradient" || t === "radial-gradient" || t === "conic-gradient" ? "gradient" : t === "solid" ? null : "texture";
 }
-var Vt = 1;
-function Ht(e, t, n, r, i, a, o, s, c, l) {
+var $ = 1;
+function Ft(e, t, n, r, i, a, o, s, c, l) {
 	let u = e.glyphPaintProgram?.(i);
 	if (!u) return;
-	P(e);
+	F(e);
 	let d = t.fill, f = e.state.transform, p;
-	if (i === "pattern") p = ft(e, u, d, O);
-	else if (i === "gradient") p = gt(e, u, d, O);
+	if (i === "pattern") p = dt(e, u, d, D);
+	else if (i === "gradient") p = ht(e, u, d, D);
 	else {
-		let i = Kt(e, d, Wt(t, n, r, c, f));
-		p = i && qt(e, u, i);
+		let i = zt(e, d, Lt(t, n, r, c, f));
+		p = i && Bt(e, u, i);
 	}
 	if (!p) return;
 	let m = e.gl;
-	e.textureCache.bind(a, Vt), m.uniform1i(u.uniform("u_atlas"), Vt), m.uniform1f(u.uniform("u_synthBold"), s), m.uniform2f(u.uniform("u_fieldScale"), l[0], l[1]), Z(e);
+	e.textureCache.bind(a, $), m.uniform1i(u.uniform("u_atlas"), $), m.uniform1f(u.uniform("u_synthBold"), s), m.uniform2f(u.uniform("u_fieldScale"), l[0], l[1]), Z(e);
 	let h = e.drawBatch, g = h.clip;
 	h.clip = null;
-	for (let i of t.quads) h.wouldOverflow(4) && Ut(e), h.pushGlyph(i.x0 + n, i.y0 + r, i.x1 + n, i.y1 + r, i.baselineY + r, c, f, i.u0, i.v0, i.u1, i.v1, 1, 1, 1, 1, Vt, o);
-	Ut(e), h.clip = g, m.activeTexture(m.TEXTURE0), m.bindVertexArray(null);
+	for (let i of t.quads) h.wouldOverflow(4) && It(e), h.pushGlyph(i.x0 + n, i.y0 + r, i.x1 + n, i.y1 + r, i.baselineY + r, c, f, i.u0, i.v0, i.u1, i.v1, 1, 1, 1, 1, $, o);
+	It(e), h.clip = g, m.activeTexture(m.TEXTURE0), m.bindVertexArray(null);
 }
-function Ut(e) {
+function It(e) {
 	let t = e.drawBatch;
-	t.length !== 0 && (w(e, t.uploadAndBind(), e.gl.UNSIGNED_INT), t.reset());
+	t.length !== 0 && (C(e, t.uploadAndBind(), e.gl.UNSIGNED_INT), t.reset());
 }
-function Wt(e, t, n, r, i) {
+function Lt(e, t, n, r, i) {
 	let a = {
 		x0: Infinity,
 		y0: Infinity,
@@ -1075,7 +1028,7 @@ function Wt(e, t, n, r, i) {
 	}
 	return a;
 }
-var Gt = {
+var Rt = {
 	vertices: new Float32Array([
 		0,
 		0,
@@ -1095,7 +1048,7 @@ var Gt = {
 		3
 	])
 };
-function Kt(e, t, n) {
+function zt(e, t, n) {
 	let r = e.paintScratch, i = l(t.fill)?.bind;
 	if (!r || !i) return null;
 	let a = e.deviceWidth && e.widthCss > 0 ? e.deviceWidth / e.widthCss : 1, o = e.deviceWidth ?? Math.round(e.widthCss), s = e.deviceHeight ?? Math.round(e.heightCss), c = Math.max(0, Math.floor(n.x0 * a)), u = Math.max(0, Math.floor(n.y0 * a)), d = e.imageCache.maxTextureSide, f = Math.min(d, Math.min(o, Math.ceil(n.x1 * a)) - c), p = Math.min(d, Math.min(s, Math.ceil(n.y1 * a)) - u);
@@ -1120,15 +1073,15 @@ function Kt(e, t, n) {
 		-1 - 2 * m / g,
 		-1 - 2 * h / _,
 		1
-	]), b = at(e), ee = {
+	]), b = it(e), ee = {
 		...b,
 		alpha: e.state.alpha,
 		maxTextureSize: b.maxTextureSize,
-		setProjAndModel: (t) => q(e, t, v, y)
+		setProjAndModel: (t) => J(e, t, v, y)
 	}, x = e.gl, S = r.acquire(f, p), te = x.isEnabled(x.SCISSOR_TEST);
 	x.activeTexture(x.TEXTURE0), x.bindTexture(x.TEXTURE_2D, null), x.bindFramebuffer(x.FRAMEBUFFER, S.fbo), x.viewport(0, 0, f, p), x.disable(x.SCISSOR_TEST), x.disable(x.STENCIL_TEST), x.clear(x.COLOR_BUFFER_BIT), x.disable(x.BLEND);
-	let C = i(ee, t);
-	return C && (x.bindVertexArray(e.meshCache.uploadRecurring(Gt).vao), w(e, Gt.indices.length, x.UNSIGNED_INT), x.bindVertexArray(null)), x.enable(x.BLEND), ke(e, o, s, te), C ? {
+	let ne = i(ee, t);
+	return ne && (x.bindVertexArray(e.meshCache.uploadRecurring(Rt).vao), C(e, Rt.indices.length, x.UNSIGNED_INT), x.bindVertexArray(null)), x.enable(x.BLEND), Oe(e, o, s, te), ne ? {
 		texture: S.texture,
 		uvFromScreen: new Float32Array([
 			a / S.width,
@@ -1143,13 +1096,13 @@ function Kt(e, t, n) {
 		])
 	} : null;
 }
-function qt(e, t, n) {
+function Bt(e, t, n) {
 	let r = e.gl;
-	return r.useProgram(t.handle), q(e, t, O), r.uniformMatrix3fv(t.uniform("u_worldInv"), !1, n.uvFromScreen), r.activeTexture(r.TEXTURE0), r.bindTexture(r.TEXTURE_2D, n.texture), r.uniform1i(t.uniform("u_sampler"), 0), t;
+	return r.useProgram(t.handle), J(e, t, D), r.uniformMatrix3fv(t.uniform("u_worldInv"), !1, n.uvFromScreen), r.activeTexture(r.TEXTURE0), r.bindTexture(r.TEXTURE_2D, n.texture), r.uniform1i(t.uniform("u_sampler"), 0), t;
 }
-function Jt(e, t) {
+function Vt(e, t) {
 	e.imageCache.upload(t.image, t.image);
-	let { staged: n, slot: r } = B(e, t.image, t.sampling ?? "linear"), i = t.source, a = 0, o = 0, s = 1, c = 1;
+	let { staged: n, slot: r } = H(e, t.image, t.sampling ?? "linear"), i = t.source, a = 0, o = 0, s = 1, c = 1;
 	if (i) {
 		let e = t.image.width, n = t.image.height;
 		a = i.x / e, s = (i.x + i.w) / e, o = i.y / n, c = (i.y + i.h) / n;
@@ -1162,21 +1115,21 @@ function Jt(e, t) {
 		let e = o;
 		o = c, c = e;
 	}
-	e.drawBatch.pushQuad(t.x, t.y, t.w, t.h, e.state.transform, a, o, s, c, (t.opacity ?? 1) * (n.foldsAlpha ? e.state.alpha : 1), r) || N(e, t, void 0, Jt);
+	e.drawBatch.pushQuad(t.x, t.y, t.w, t.h, e.state.transform, a, o, s, c, (t.opacity ?? 1) * (n.foldsAlpha ? e.state.alpha : 1), r) || P(e, t, void 0, Vt);
 }
-function Yt(e, t) {
+function Ht(e, t) {
 	let n = t.sprites, r = Math.floor(n.length / u);
 	if (r === 0) return;
 	e.imageCache.upload(t.image, t.image);
-	let i = t.sampling ?? "linear", { staged: a, slot: o } = B(e, t.image, i), s = e.drawBatch, c = e.state.transform, l = a.foldsAlpha ? e.state.alpha : 1, d = t.image.width, f = t.image.height;
+	let i = t.sampling ?? "linear", { staged: a, slot: o } = H(e, t.image, i), s = e.drawBatch, c = e.state.transform, l = a.foldsAlpha ? e.state.alpha : 1, d = t.image.width, f = t.image.height;
 	for (let p = 0, m = 0; p < r; p++, m += u) {
-		s.wouldOverflow(4) && (G(e), {staged: a, slot: o} = B(e, t.image, i), l = a.foldsAlpha ? e.state.alpha : 1);
+		s.wouldOverflow(4) && (q(e), {staged: a, slot: o} = H(e, t.image, i), l = a.foldsAlpha ? e.state.alpha : 1);
 		let r = n[m + 4], u = n[m + 5], p = n[m + 6], h = n[m + 7], g;
-		for (; !s.pushQuad(n[m], n[m + 1], n[m + 2], n[m + 3], c, r / d, u / f, (r + p) / d, (u + h) / f, n[m + 8] * l, o);) g = j(e), {staged: a, slot: o} = B(e, t.image, i), l = a.foldsAlpha ? e.state.alpha : 1;
-		g !== void 0 && (M(e, g), {staged: a, slot: o} = B(e, t.image, i), l = a.foldsAlpha ? e.state.alpha : 1);
+		for (; !s.pushQuad(n[m], n[m + 1], n[m + 2], n[m + 3], c, r / d, u / f, (r + p) / d, (u + h) / f, n[m + 8] * l, o);) g = M(e), {staged: a, slot: o} = H(e, t.image, i), l = a.foldsAlpha ? e.state.alpha : 1;
+		g !== void 0 && (N(e, g), {staged: a, slot: o} = H(e, t.image, i), l = a.foldsAlpha ? e.state.alpha : 1);
 	}
 }
 //#endregion
-export { Ot as OUTLINE_MIN_SCREEN_PX, ye as dispatch, je as drawGroup, G as flushBatch, f as getMesh, o as mat3, yt as popClip, vt as pushClip, Se as setUniform, W as tryStageFill };
+export { Tt as OUTLINE_MIN_SCREEN_PX, A as dispatch, Ae as drawGroup, q as flushBatch, f as getMesh, o as mat3, z as meshBatching, vt as popClip, _t as pushClip, xe as setUniform, K as tryStageFill };
 
 //# sourceMappingURL=draw.js.map