2.7.2

q5js · Oct 19, 2024 · 85bf3cd · 85bf3cd
1 parent 5e89618
commit 85bf3cd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "q5",
-	"version": "2.7.1",
+	"version": "2.7.2",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",
 	"contributors": [

diff --git a/q5.js b/q5.js
@@ -206,11 +206,11 @@ function Q5(scope, parent, renderer) {
 		$.preload = t.preload;
 		$.setup = t.setup;
 		$.draw = t.draw;
-	} else {
-		$.preload ??= () => {};
-		$.setup ??= () => {};
-		$.draw ??= () => {};
 	}
+	$.preload ??= () => {};
+	$.setup ??= () => {};
+	$.draw ??= () => {};
+
 	let userFns = [
 		'mouseMoved',
 		'mousePressed',
@@ -261,7 +261,7 @@ function Q5(scope, parent, renderer) {
 		}
 	}
 
-	if (preloadDefined || (arguments.length && scope != 'instance' && renderer != 'webgpu')) {
+	if (preloadDefined || $._isGlobal) {
 		_preStart();
 	} else {
 		setTimeout(_preStart, 32);
@@ -4152,7 +4152,8 @@ fn fragmentMain(@location(0) texCoord: vec2f) -> @location(0) vec4f {
 			entryPoint: 'fragmentMain',
 			targets: [{ format: 'bgra8unorm', blend: $.blendConfigs.normal }]
 		},
-		primitive: { topology: 'triangle-list' }
+		primitive: { topology: 'triangle-list' },
+		multisample: { count: 4 }
 	};
 
 	$._pipelines[1] = Q5.device.createRenderPipeline($._pipelineConfigs[1]);
@@ -4261,7 +4262,7 @@ fn fragmentMain(@location(0) texCoord: vec2f) -> @location(0) vec4f {
 			mappedAtCreation: true
 		});
 
-		new Float32Array(vertexBuffer.getMappedRange()).set(vertices);
+		new Float32Array(vertexBuffer.getMappedRange()).set(vertexStack);
 		vertexBuffer.unmap();
 
 		$.pass.setVertexBuffer(1, vertexBuffer);
@@ -4430,7 +4431,8 @@ fn fragmentMain(input : VertexOutput) -> @location(0) vec4f {
 			entryPoint: 'fragmentMain',
 			targets: [{ format: 'bgra8unorm', blend: $.blendConfigs.normal }]
 		},
-		primitive: { topology: 'triangle-strip', stripIndexFormat: 'uint32' }
+		primitive: { topology: 'triangle-strip', stripIndexFormat: 'uint32' },
+		multisample: { count: 4 }
 	};
 	$._pipelines[2] = Q5.device.createRenderPipeline($._pipelineConfigs[2]);
 

diff --git a/q5.min.js b/q5.min.js
diff --git a/src/q5-core.js b/src/q5-core.js
@@ -206,11 +206,11 @@ function Q5(scope, parent, renderer) {
 		$.preload = t.preload;
 		$.setup = t.setup;
 		$.draw = t.draw;
-	} else {
-		$.preload ??= () => {};
-		$.setup ??= () => {};
-		$.draw ??= () => {};
 	}
+	$.preload ??= () => {};
+	$.setup ??= () => {};
+	$.draw ??= () => {};
+
 	let userFns = [
 		'mouseMoved',
 		'mousePressed',
@@ -261,7 +261,7 @@ function Q5(scope, parent, renderer) {
 		}
 	}
 
-	if (preloadDefined || (arguments.length && scope != 'instance' && renderer != 'webgpu')) {
+	if (preloadDefined || $._isGlobal) {
 		_preStart();
 	} else {
 		setTimeout(_preStart, 32);

diff --git a/src/q5-webgpu-image.js b/src/q5-webgpu-image.js
@@ -89,7 +89,8 @@ fn fragmentMain(@location(0) texCoord: vec2f) -> @location(0) vec4f {
 			entryPoint: 'fragmentMain',
 			targets: [{ format: 'bgra8unorm', blend: $.blendConfigs.normal }]
 		},
-		primitive: { topology: 'triangle-list' }
+		primitive: { topology: 'triangle-list' },
+		multisample: { count: 4 }
 	};
 
 	$._pipelines[1] = Q5.device.createRenderPipeline($._pipelineConfigs[1]);
@@ -198,7 +199,7 @@ fn fragmentMain(@location(0) texCoord: vec2f) -> @location(0) vec4f {
 			mappedAtCreation: true
 		});
 
-		new Float32Array(vertexBuffer.getMappedRange()).set(vertices);
+		new Float32Array(vertexBuffer.getMappedRange()).set(vertexStack);
 		vertexBuffer.unmap();
 
 		$.pass.setVertexBuffer(1, vertexBuffer);

diff --git a/src/q5-webgpu-text.js b/src/q5-webgpu-text.js
@@ -148,7 +148,8 @@ fn fragmentMain(input : VertexOutput) -> @location(0) vec4f {
 			entryPoint: 'fragmentMain',
 			targets: [{ format: 'bgra8unorm', blend: $.blendConfigs.normal }]
 		},
-		primitive: { topology: 'triangle-strip', stripIndexFormat: 'uint32' }
+		primitive: { topology: 'triangle-strip', stripIndexFormat: 'uint32' },
+		multisample: { count: 4 }
 	};
 	$._pipelines[2] = Q5.device.createRenderPipeline($._pipelineConfigs[2]);