modern-canvas 0.24.7 → 0.24.9

package/dist/core/renderers/gl/shader/GlProgramData.d.ts

@@ -1,3 +1,4 @@
+import type { GlUniform } from './GlProgram';
 export declare class GlProgramData {
     native: WebGLProgram;
     /**
@@ -6,5 +7,16 @@ export declare class GlProgramData {
      * group's data is (re)uploaded to this program.
      */
     uniformDirtyGroups: Record<number, number>;
+    /**
+     * Per-context uniform metadata: introspected name/type/size plus the lazily
+     * resolved {@link GlUniform.location} and the shadow copy of the last uploaded
+     * value. Both `location` and `value` are specific to THIS linked program in
+     * THIS GL context, so they must live here — not on the shared {@link GlProgram},
+     * which a module-level (static) Material reuses across multiple renderers/contexts.
+     * Storing them on the shared program would let one context clobber another's
+     * locations/shadows (e.g. a sampler `uniform1i` silently dropped → the sampler
+     * falls back to texture unit 0).
+     */
+    uniforms: Record<string, GlUniform>;
     constructor(native: WebGLProgram);
 }

package/dist/core/renderers/gl/shader/GlShaderSystem.d.ts

@@ -36,7 +36,7 @@ export declare class GlShaderSystem extends GlSystem {
      * the group has not changed since it was last synced to this program.
      */
     updateUniformGroup(group: UniformGroup, glProgram: GlProgram): void;
-    protected _uploadUniforms(glProgram: GlProgram, glProgramData: GlProgramData, uniforms: Record<string, any>): void;
+    protected _uploadUniforms(glProgramData: GlProgramData, uniforms: Record<string, any>): void;
     reset(): void;
     destroy(): void;
 }

package/dist/index.js

@@ -1525,6 +1525,7 @@ function Yt(e) {
 var Xt = class {
 	native;
 	uniformDirtyGroups = Object.create(null);
+	uniforms = Object.create(null);
 	constructor(e) {
 		this.native = e;
 	}
@@ -1677,7 +1678,7 @@ var nn = class extends M {
 				value: void 0
 			};
 		}
-		return e.uniforms = c, t.deleteShader(r), t.deleteShader(i), n;
+		return n.uniforms = c, t.deleteShader(r), t.deleteShader(i), n;
 	}
 	_createGlShader(e, t) {
 		let n = this._gl, r = n.createShader(t);
@@ -1688,72 +1689,72 @@ var nn = class extends M {
 	updateUniforms(e) {
 		this.bind(e);
 		let { glProgram: t, uniforms: n = {} } = e;
-		this._uploadUniforms(t, this.getGlProgramData(t), n);
+		this._uploadUniforms(this.getGlProgramData(t), n);
 	}
 	updateUniformGroup(e, t) {
 		let n = this.getGlProgramData(t);
-		e.isStatic && n.uniformDirtyGroups[e.uid] === e._dirtyId || (n.uniformDirtyGroups[e.uid] = e._dirtyId, this.useProgram(t), this._uploadUniforms(t, n, e.uniforms));
+		e.isStatic && n.uniformDirtyGroups[e.uid] === e._dirtyId || (n.uniformDirtyGroups[e.uid] = e._dirtyId, this.useProgram(t), this._uploadUniforms(n, e.uniforms));
 	}
-	_uploadUniforms(e, t, n) {
-		let r = this._gl, { uniforms: i } = e;
-		for (let e in n) {
-			let a = n[e], o = i[e];
+	_uploadUniforms(e, t) {
+		let n = this._gl, { uniforms: r } = e;
+		for (let i in t) {
+			let a = t[i], o = r[i];
 			if (!o) continue;
 			let { type: s, isArray: c, name: l } = o;
-			o.location === void 0 && (o.location = r.getUniformLocation(t.native, l));
+			o.location === void 0 && (o.location = n.getUniformLocation(e.native, l));
 			let u = o.location;
 			if (rn(o.value, a)) switch (o.value = an(o.value, a), s) {
 				case "float":
-					c ? r.uniform1fv(u, a) : r.uniform1f(u, a);
+					c ? n.uniform1fv(u, a) : n.uniform1f(u, a);
 					break;
 				case "uint":
-					c ? r.uniform1uiv(u, a) : r.uniform1ui(u, a);
+					c ? n.uniform1uiv(u, a) : n.uniform1ui(u, a);
 					break;
 				case "bool":
 				case "int":
 				case "sampler2D":
 				case "samplerCube":
 				case "sampler2DArray":
-					c ? r.uniform1iv(u, a) : r.uniform1i(u, a);
+					c ? n.uniform1iv(u, a) : n.uniform1i(u, a);
 					break;
 				case "bvec2":
 				case "ivec2":
-					r.uniform2iv(u, a);
+					n.uniform2iv(u, a);
 					break;
 				case "uvec2":
-					r.uniform2uiv(u, a);
+					n.uniform2uiv(u, a);
 					break;
 				case "vec2":
-					r.uniform2fv(u, a);
+					n.uniform2fv(u, a);
 					break;
 				case "bvec3":
 				case "ivec3":
-					r.uniform3iv(u, a);
+					n.uniform3iv(u, a);
 					break;
 				case "uvec3":
-					r.uniform3uiv(u, a);
+					n.uniform3uiv(u, a);
 					break;
 				case "vec3":
-					r.uniform3fv(u, a);
+					n.uniform3fv(u, a);
 					break;
 				case "bvec4":
 				case "ivec4":
-					r.uniform4iv(u, a);
+					n.uniform4iv(u, a);
 					break;
 				case "uvec4":
-					r.uniform4uiv(u, a);
+					n.uniform4uiv(u, a);
 					break;
 				case "vec4":
-					r.uniform4fv(u, a);
+					n.uniform4fv(u, a);
 					break;
 				case "mat2":
-					r.uniformMatrix2fv(u, !1, a);
+					n.uniformMatrix2fv(u, !1, a);
 					break;
 				case "mat3":
-					r.uniformMatrix3fv(u, !1, a);
+					n.uniformMatrix3fv(u, !1, a);
 					break;
 				case "mat4":
-					r.uniformMatrix4fv(u, !1, a);
+					n.uniformMatrix4fv(u, !1, a);
 					break;
 			}
 		}
@@ -4757,7 +4758,7 @@ var U = class extends V {
 		this.width = e, this.height = t;
 	}
 	activate(e, t) {
-		return this.valid ? (this.flush(e), this.renderTarget.activate(e, t), e.shader.uniforms.viewMatrix = this.canvasTransform.toArray(!0), e.shader.markGlobalUniformsDirty(), this._tree?.setCurrentViewport(this), !0) : !1;
+		return this.valid ? (this.flush(e), e.shader.uniforms.viewMatrix = this.canvasTransform.toArray(!0), e.shader.markGlobalUniformsDirty(), this.renderTarget.activate(e, t), this._tree?.setCurrentViewport(this), !0) : !1;
 	}
 	redraw(e, t) {
 		if (this.valid) {
@@ -5042,12 +5043,15 @@ var br = class {
 		let t = this.createCall(e);
 		return (this.currentCall?.calls ?? this.calls).push(t), t;
 	}
+	reset() {
+		this.calls = [], this.currentCall = void 0;
+	}
 	render(e) {
 		this.calls.forEach(function t(n) {
 			n.fn(e, () => {
 				n.calls.forEach(t);
 			});
-		}), this.calls = [];
+		}), this.reset();
 	}
 }, xr, Sr = xr = class extends V {
 	currentTime = 0;
@@ -5195,7 +5199,7 @@ var wr = class extends Et {
 		this.debug && console.log(`[modern-canvas][${performance.now().toFixed(4)}ms]`, ...e);
 	}
 	_process(e = 0) {
-		this.timeline.emit("process", e), this.emit("processing"), this.root.emit("process", e), this.emit("processed");
+		this.renderStack.reset(), this.timeline.emit("process", e), this.emit("processing"), this.root.emit("process", e), this.emit("processed");
 	}
 	_render(e) {
 		this.emit("rendering"), _r(), this.renderStack.render(e), this._renderScreen(e), this.emit("rendered");

package/dist/scene/main/RenderStack.d.ts

@@ -14,5 +14,16 @@ export declare class RenderStack {
     calls: RenderCall[];
     createCall(renderable: Renderable): RenderCall;
     push(renderable: Renderable): RenderCall;
+    /**
+     * Discard any queued calls without rendering them. The stack is a per-process
+     * transient: it must start empty on every `_process` pass. Without this, a
+     * `_process` that is not followed by a `render` (e.g. the export pipeline's
+     * `waitUntilProcessed`, which processes then only awaits a tick) leaves its
+     * calls behind; the next `_process` appends to them, the scene ends up queued
+     * twice, and stateful effects (which flip `needsRender`/ping-pong viewports
+     * during the first pass) render the second pass wrong — e.g. a masked element
+     * drawn unmasked on export.
+     */
+    reset(): void;
     render(renderer: WebGLRenderer): void;
 }

package/package.json

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