modern-canvas 0.23.4 → 0.23.6

package/dist/index.js

@@ -3644,19 +3644,29 @@ var $n = class extends w {
 		return u(e);
 	}
 	static linearGradient(e, t, n) {
-		t ||= 1, n ||= 1;
-		let r = S(t, n);
-		if (!r) throw Error("GradientTexture requires a canvas; call setCanvasFactory() in non-browser environments.");
-		let i = r.getContext("2d");
-		if (!i) throw Error("Failed to parse linear gradient, get canvas context is null.");
-		let { angle: a = 0, stops: o } = e, s = t, c = n, l = s / 2, u = c / 2, d = (a + 90) * Math.PI / 180, f = Math.sin(d), p = -Math.cos(d), m = Math.abs(s * Math.sin(d)) + Math.abs(c * Math.cos(d)), h = l - m / 2 * f, g = u - m / 2 * p, ee = l + m / 2 * f, te = u + m / 2 * p, ne = i.createLinearGradient(h, g, ee, te);
-		for (let e of o) ne.addColorStop(e.offset, e.color);
-		i.fillStyle = ne, i.fillRect(0, 0, s, c);
-		let re = i.getImageData(0, 0, r.width, r.height);
+		let r = Number.isFinite(t) && t > 0, i = Number.isFinite(n) && n > 0, a = Number.isFinite(e.angle);
+		t = r ? t : 1, n = i ? n : 1;
+		let o = S(t, n);
+		if (!o) throw Error("GradientTexture requires a canvas; call setCanvasFactory() in non-browser environments.");
+		let s = o.getContext("2d");
+		if (!s) throw Error("Failed to parse linear gradient, get canvas context is null.");
+		let { stops: c } = e, l = t, u = n;
+		if (!r || !i || !a) s.fillStyle = c?.find((e) => e?.color)?.color ?? "transparent", s.fillRect(0, 0, l, u);
+		else {
+			let t = e.angle, n = l / 2, r = u / 2, i = (t + 90) * Math.PI / 180, a = Math.sin(i), o = -Math.cos(i), d = Math.abs(l * Math.sin(i)) + Math.abs(u * Math.cos(i)), f = s.createLinearGradient(n - d / 2 * a, r - d / 2 * o, n + d / 2 * a, r + d / 2 * o);
+			for (let e of c) {
+				let t = Number.isFinite(e.offset) ? Math.min(1, Math.max(0, e.offset)) : 0;
+				try {
+					f.addColorStop(t, e.color);
+				} catch {}
+			}
+			s.fillStyle = f, s.fillRect(0, 0, l, u);
+		}
+		let d = s.getImageData(0, 0, o.width, o.height);
 		return {
-			width: re.width,
-			height: re.height,
-			source: new Uint8Array(re.data.buffer),
+			width: d.width,
+			height: d.height,
+			source: new Uint8Array(d.data.buffer),
 			uploadMethodId: "buffer"
 		};
 	}
@@ -6728,16 +6738,13 @@ var ki = class extends J {
 		});
 	}
 	async _resolveSourceCanvas() {
-		this._sourceImage !== this.image && (this._sourceCanvas = void 0, this._sourceImage = this.image);
-		let e = this.texture?.source;
-		if (e && e.width > 0 && e.height > 0) return this._sourceCanvas = this._snapshot(e);
-		if (this._sourceCanvas) return this._sourceCanvas;
+		if (this._sourceImage !== this.image && (this._sourceCanvas = void 0, this._sourceImage = this.image), this._sourceCanvas) return this._sourceCanvas;
 		if (d(this.image) || this.image === "viewport") return;
-		let t = this.image, n = await $.loadBy(`${t}#mc-foreground-source`, async () => {
-			let e = await $.fetchImageBitmap(t), n = this._snapshot(e);
-			return Ne && e instanceof ImageBitmap && e.close(), n;
+		let e = this.image, t = await $.loadBy(`${e}#mc-foreground-source`, async () => {
+			let t = await $.fetchImageBitmap(e), n = this._snapshot(t);
+			return Ne && t instanceof ImageBitmap && t.close(), n;
 		});
-		return this._sourceImage === t && (this._sourceCanvas = n), n;
+		return this._sourceImage === e && t && (this._sourceCanvas = t), t;
 	}
 	_snapshot(e) {
 		let t = Math.max(1, Math.round(e.width)), n = Math.max(1, Math.round(e.height)), r = S(t, n), i = r?.getContext("2d");

package/dist/scene/2d/element/Element2DForeground.d.ts

@@ -11,10 +11,11 @@ export declare class Element2DForeground extends Element2DFill implements Normal
     /**
      * 原图的 CPU 副本（HTMLCanvas），供烘焙 effects 使用。
      *
-     * 不能依赖 `this.texture.source`：那是张 ImageBitmap，经 GPU 上传 / 资源 GC 后
-     * 会被 `close()`（detached，width/height 归零），此时 drawImage 会抛
-     * `InvalidStateError`。实测纹理加载返回时 source 往往已是 detached，故这份副本
-     * 必须从图片自身独立解码（见 `_resolveSourceCanvas`），与 GPU 纹理生命周期解耦。
+     * 刻意不读 `this.texture.source`：那张 ImageBitmap 由纹理管线持有，会经 GPU
+     * 上传（premultiply）/ 资源 GC 而被消费或 `close()`，其内容与尺寸随运行环境
+     * （含 headless / 自定义 canvas factory）漂移——实测过空白、尺寸异常（如
+     * 3552×3552 全透明）。这份副本一律由 `_resolveSourceCanvas` 从 image 独立解码，
+     * 与 GPU 纹理生命周期彻底解耦。
      */
     protected _sourceCanvas?: HTMLCanvasElement;
     /** `_sourceCanvas` 对应的图片地址，image 变更时用于失效旧副本 */
@@ -22,12 +23,12 @@ export declare class Element2DForeground extends Element2DFill implements Normal
     setProperties(properties?: Foreground): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
     loadTexture(): Promise<void>;
-    /** 把原图 + effects 烘焙成一张运行时 canvas，包成 CanvasTexture（gif/无 effects 时跳过） */
+    /** 把原图 + effects 烘焙成一张运行时纹理（gif/无 effects 时跳过） */
     protected _applyEffects(): Promise<void>;
     /**
-     * 取得用于烘焙的 CPU 副本：
-     * 1) 若纹理 source 仍存活（width>0），直接快照（省一次解码）；
-     * 2) 否则从 image 重新解码一份（资源层按 url 缓存复用，避免重复烘焙时反复解码）。
+     * 取得用于烘焙的 CPU 副本：始终从 image 独立解码一份（createImageBitmap 保证解码
+     * 就绪），快照进 canvas，按 url 在资源层缓存复用。不读 `this.texture.source`——见
+     * `_sourceCanvas` 注释。只缓存真正拿到的副本，避免把空/未就绪结果钉死。
      */
     protected _resolveSourceCanvas(): Promise<HTMLCanvasElement | undefined>;
     /** 把一张存活的图源画进新 canvas（不会被 close，可反复用于烘焙） */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.23.4",
+  "version": "0.23.6",
   "packageManager": "pnpm@10.19.0",
   "description": "A JavaScript WebGL rendering engine. only the ESM.",
   "author": "wxm",