q5 2.12.12 → 2.13.2

package/src/q5-webgpu-canvas.js

@@ -11,11 +11,13 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 	c.width = $.width = 500;
 	c.height = $.height = 500;
 
+	// q2d graphics context
+	$._g = $.createGraphics(1, 1);
+
 	if ($.colorMode) $.colorMode('rgb', 1);
 
 	let pass,
 		mainView,
-		colorsLayout,
 		colorIndex = 1,
 		colorStackIndex = 8;
 
@@ -27,7 +29,6 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 	let drawStack = ($.drawStack = []);
 
 	// colors used for each draw call
-
 	let colorStack = ($.colorStack = new Float32Array(1e6));
 
 	// prettier-ignore
@@ -36,43 +37,28 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		1, 1, 1, 1 // white
 	]);
 
-	$._transformLayout = Q5.device.createBindGroupLayout({
-		label: 'transformLayout',
+	let mainLayout = Q5.device.createBindGroupLayout({
+		label: 'mainLayout',
 		entries: [
 			{
 				binding: 0,
 				visibility: GPUShaderStage.VERTEX,
-				buffer: {
-					type: 'uniform',
-					hasDynamicOffset: false
-				}
+				buffer: { type: 'uniform' }
 			},
 			{
 				binding: 1,
 				visibility: GPUShaderStage.VERTEX,
-				buffer: {
-					type: 'read-only-storage',
-					hasDynamicOffset: false
-				}
-			}
-		]
-	});
-
-	colorsLayout = Q5.device.createBindGroupLayout({
-		label: 'colorsLayout',
-		entries: [
+				buffer: { type: 'read-only-storage' }
+			},
 			{
-				binding: 0,
+				binding: 2,
 				visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT,
-				buffer: {
-					type: 'read-only-storage',
-					hasDynamicOffset: false
-				}
+				buffer: { type: 'read-only-storage' }
 			}
 		]
 	});
 
-	$.bindGroupLayouts = [$._transformLayout, colorsLayout];
+	$.bindGroupLayouts = [mainLayout];
 
 	let uniformBuffer = Q5.device.createBuffer({
 		size: 8, // Size of two floats
@@ -102,7 +88,6 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		Q5.device.queue.writeBuffer(uniformBuffer, 0, new Float32Array([$.canvas.hw, $.canvas.hh]));
 
 		createMainView();
-
 		return c;
 	};
 
@@ -146,7 +131,7 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 	};
 
 	$._stroke = 0;
-	$._fill = 1;
+	$._fill = $._tint = $._globalAlpha = 1;
 	$._doFill = $._doStroke = true;
 
 	$.fill = (r, g, b, a) => {
@@ -159,42 +144,53 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		$._doStroke = $._strokeSet = true;
 		$._stroke = colorIndex;
 	};
+	$.tint = (r, g, b, a) => {
+		addColor(r, g, b, a);
+		$._tint = colorIndex;
+	};
+	$.opacity = (a) => ($._globalAlpha = a);
 
 	$.noFill = () => ($._doFill = false);
 	$.noStroke = () => ($._doStroke = false);
+	$.noTint = () => ($._tint = 1);
 
 	$._strokeWeight = 1;
 	$.strokeWeight = (v) => ($._strokeWeight = Math.abs(v));
 
-	$.resetMatrix = () => {
-		// initialize the transformation matrix as 4x4 identity matrix
-
-		// prettier-ignore
-		$._matrix = [
-			1, 0, 0, 0,
-			0, 1, 0, 0,
-			0, 0, 1, 0,
-			0, 0, 0, 1
-		];
-		$._transformIndex = 0;
-	};
-	$.resetMatrix();
+	const MAX_TRANSFORMS = 1e7, // or whatever maximum you need
+		MATRIX_SIZE = 16, // 4x4 matrix
+		transforms = new Float32Array(MAX_TRANSFORMS * MATRIX_SIZE),
+		matrices = [],
+		matricesIndexStack = [];
+
+	let matrix;
 
 	// tracks if the matrix has been modified
 	$._matrixDirty = false;
 
-	// array to store transformation matrices for the render pass
-	let transformStates = [$._matrix.slice()];
+	// initialize with a 4x4 identity matrix
+	// prettier-ignore
+	matrices.push([
+		1, 0, 0, 0,
+		0, 1, 0, 0,
+		0, 0, 1, 0,
+		0, 0, 0, 1
+	]);
 
-	// stack to keep track of transformation matrix indexes
-	$._transformIndexStack = [];
+	transforms.set(matrices[0]);
+
+	$.resetMatrix = () => {
+		matrix = matrices[0].slice();
+		$._matrixIndex = 0;
+	};
+	$.resetMatrix();
 
 	$.translate = (x, y, z) => {
 		if (!x && !y && !z) return;
 		// update the translation values
-		$._matrix[12] += x;
-		$._matrix[13] -= y;
-		$._matrix[14] += z || 0;
+		matrix[12] += x;
+		matrix[13] -= y;
+		matrix[14] += z || 0;
 		$._matrixDirty = true;
 	};
 
@@ -202,12 +198,10 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		if (!a) return;
 		if ($._angleMode) a *= $._DEGTORAD;
 
-		let cosR = Math.cos(a);
-		let sinR = Math.sin(a);
-
-		let m = $._matrix;
-
-		let m0 = m[0],
+		let cosR = Math.cos(a),
+			sinR = Math.sin(a),
+			m = matrix,
+			m0 = m[0],
 			m1 = m[1],
 			m4 = m[4],
 			m5 = m[5];
@@ -232,7 +226,7 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 	$.scale = (x = 1, y, z = 1) => {
 		y ??= x;
 
-		let m = $._matrix;
+		let m = matrix;
 
 		m[0] *= x;
 		m[1] *= x;
@@ -254,15 +248,15 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		if (!ang) return;
 		if ($._angleMode) ang *= $._DEGTORAD;
 
-		let tanAng = Math.tan(ang);
-
-		let m0 = $._matrix[0],
-			m1 = $._matrix[1],
-			m4 = $._matrix[4],
-			m5 = $._matrix[5];
+		let tanAng = Math.tan(ang),
+			m = matrix,
+			m0 = m[0],
+			m1 = m[1],
+			m4 = m[4],
+			m5 = m[5];
 
-		$._matrix[0] = m0 + m4 * tanAng;
-		$._matrix[1] = m1 + m5 * tanAng;
+		m[0] = m0 + m4 * tanAng;
+		m[1] = m1 + m5 * tanAng;
 
 		$._matrixDirty = true;
 	};
@@ -271,15 +265,15 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		if (!ang) return;
 		if ($._angleMode) ang *= $._DEGTORAD;
 
-		let tanAng = Math.tan(ang);
-
-		let m0 = $._matrix[0],
-			m1 = $._matrix[1],
-			m4 = $._matrix[4],
-			m5 = $._matrix[5];
+		let tanAng = Math.tan(ang),
+			m = matrix,
+			m0 = m[0],
+			m1 = m[1],
+			m4 = m[4],
+			m5 = m[5];
 
-		$._matrix[4] = m4 + m0 * tanAng;
-		$._matrix[5] = m5 + m1 * tanAng;
+		m[4] = m4 + m0 * tanAng;
+		m[5] = m5 + m1 * tanAng;
 
 		$._matrixDirty = true;
 	};
@@ -297,31 +291,32 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		}
 
 		// overwrite the current transformation matrix
-		$._matrix = m.slice();
+		matrix = m.slice();
 		$._matrixDirty = true;
 	};
 
 	// function to save the current matrix state if dirty
 	$._saveMatrix = () => {
-		transformStates.push($._matrix.slice());
-		$._transformIndex = transformStates.length - 1;
+		transforms.set(matrix, matrices.length * MATRIX_SIZE);
+		$._matrixIndex = matrices.length;
+		matrices.push(matrix.slice());
 		$._matrixDirty = false;
 	};
 
 	// push the current matrix index onto the stack
 	$.pushMatrix = () => {
 		if ($._matrixDirty) $._saveMatrix();
-		$._transformIndexStack.push($._transformIndex);
+		matricesIndexStack.push($._matrixIndex);
 	};
 
 	$.popMatrix = () => {
-		if (!$._transformIndexStack.length) {
+		if (!matricesIndexStack.length) {
 			return console.warn('Matrix index stack is empty!');
 		}
 		// pop the last matrix index and set it as the current matrix index
-		let idx = $._transformIndexStack.pop();
-		$._matrix = transformStates[idx].slice();
-		$._transformIndex = idx;
+		let idx = matricesIndexStack.pop();
+		matrix = matrices[idx].slice();
+		$._matrixIndex = idx;
 		$._matrixDirty = false;
 	};
 
@@ -446,26 +441,14 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 	};
 
 	$._render = () => {
-		if (transformStates.length > 1 || !$._transformBindGroup) {
-			let transformBuffer = Q5.device.createBuffer({
-				size: transformStates.length * 64, // 64 is the size of 16 floats
-				usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
-				mappedAtCreation: true
-			});
-
-			new Float32Array(transformBuffer.getMappedRange()).set(transformStates.flat());
-			transformBuffer.unmap();
-
-			$._transformBindGroup = Q5.device.createBindGroup({
-				layout: $._transformLayout,
-				entries: [
-					{ binding: 0, resource: { buffer: uniformBuffer } },
-					{ binding: 1, resource: { buffer: transformBuffer } }
-				]
-			});
-		}
+		let transformBuffer = Q5.device.createBuffer({
+			size: matrices.length * MATRIX_SIZE * 4, // 4 bytes per float
+			usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+			mappedAtCreation: true
+		});
 
-		pass.setBindGroup(0, $._transformBindGroup);
+		new Float32Array(transformBuffer.getMappedRange()).set(transforms.slice(0, matrices.length * MATRIX_SIZE));
+		transformBuffer.unmap();
 
 		let colorsBuffer = Q5.device.createBuffer({
 			size: colorStackIndex * 4,
@@ -476,12 +459,16 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		new Float32Array(colorsBuffer.getMappedRange()).set(colorStack.slice(0, colorStackIndex));
 		colorsBuffer.unmap();
 
-		$._colorsBindGroup = Q5.device.createBindGroup({
-			layout: colorsLayout,
-			entries: [{ binding: 0, resource: { buffer: colorsBuffer } }]
+		mainBindGroup = Q5.device.createBindGroup({
+			layout: mainLayout,
+			entries: [
+				{ binding: 0, resource: { buffer: uniformBuffer } },
+				{ binding: 1, resource: { buffer: transformBuffer } },
+				{ binding: 2, resource: { buffer: colorsBuffer } }
+			]
 		});
 
-		$.pass.setBindGroup(1, $._colorsBindGroup);
+		pass.setBindGroup(0, mainBindGroup);
 
 		for (let m of $._hooks.preRender) m();
 
@@ -505,18 +492,20 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 				pass.draw(v, 1, drawVertOffset);
 				drawVertOffset += v;
 			} else if (curPipelineIndex == 1) {
+				// let instanceCount = drawStack[i + 2];
 				// draw images
 				if (curTextureIndex != v) {
 					// v is the texture index
-					pass.setBindGroup(2, $._textureBindGroups[v]);
+					pass.setBindGroup(1, $._textureBindGroups[v]);
 				}
 				pass.draw(4, 1, imageVertOffset);
 				imageVertOffset += 4;
+				// i++;
 			} else if (curPipelineIndex == 2) {
 				// draw text
 				let o = drawStack[i + 2];
-				pass.setBindGroup(2, $._fonts[o].bindGroup);
-				pass.setBindGroup(3, $._textBindGroup);
+				pass.setBindGroup(1, $._fonts[o].bindGroup);
+				pass.setBindGroup(2, $._textBindGroup);
 
 				// v is the number of characters in the text
 				pass.draw(4, v, 0, textCharOffset);
@@ -540,8 +529,9 @@ Q5.renderers.webgpu.canvas = ($, q) => {
 		colorIndex = 1;
 		colorStackIndex = 8;
 		rotation = 0;
-		transformStates.length = 1;
-		$._transformIndexStack.length = 0;
+		transforms.length = MATRIX_SIZE;
+		matrices.length = 1;
+		matricesIndexStack.length = 0;
 	};
 };
 
@@ -552,7 +542,10 @@ Q5.initWebGPU = async () => {
 	}
 	if (!Q5.device) {
 		let adapter = await navigator.gpu.requestAdapter();
-		if (!adapter) throw new Error('No appropriate GPUAdapter found.');
+		if (!adapter) {
+			console.warn('q5 WebGPU could not start! No appropriate GPUAdapter found, vulkan may need to be enabled.');
+			return false;
+		}
 		Q5.device = await adapter.requestDevice();
 	}
 	return true;

package/src/q5-webgpu-drawing.js

@@ -4,46 +4,40 @@ Q5.renderers.webgpu.drawing = ($, q) => {
 		vertexStack = new Float32Array(1e7),
 		vertIndex = 0;
 
-	let vertexShader = Q5.device.createShaderModule({
-		label: 'drawingVertexShader',
+	let drawingShader = Q5.device.createShaderModule({
+		label: 'drawingShader',
 		code: `
-struct VertexInput {
+struct Uniforms {
+	halfWidth: f32,
+	halfHeight: f32
+}
+struct VertexParams {
 	@location(0) pos: vec2f,
 	@location(1) colorIndex: f32,
-	@location(2) transformIndex: f32
+	@location(2) matrixIndex: f32
 }
-struct VertexOutput {
+struct FragmentParams {
 	@builtin(position) position: vec4f,
 	@location(0) color: vec4f
 }
-struct Uniforms {
-	halfWidth: f32,
-	halfHeight: f32
-}
 
 @group(0) @binding(0) var<uniform> uniforms: Uniforms;
 @group(0) @binding(1) var<storage> transforms: array<mat4x4<f32>>;
-
-@group(1) @binding(0) var<storage> colors : array<vec4f>;
+@group(0) @binding(2) var<storage> colors : array<vec4f>;
 
 @vertex
-fn vertexMain(input: VertexInput) -> VertexOutput {
-	var vert = vec4f(input.pos, 0.0, 1.0);
-	vert = transforms[i32(input.transformIndex)] * vert;
+fn vertexMain(v: VertexParams) -> FragmentParams {
+	var vert = vec4f(v.pos, 0.0, 1.0);
+	vert = transforms[i32(v.matrixIndex)] * vert;
 	vert.x /= uniforms.halfWidth;
 	vert.y /= uniforms.halfHeight;
 
-	var output: VertexOutput;
-	output.position = vert;
-	output.color = colors[i32(input.colorIndex)];
-	return output;
+	var f: FragmentParams;
+	f.position = vert;
+	f.color = colors[i32(v.colorIndex)];
+	return f;
 }
-`
-	});
 
-	let fragmentShader = Q5.device.createShaderModule({
-		label: 'drawingFragmentShader',
-		code: `
 @fragment
 fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 	return color;
@@ -56,7 +50,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 		attributes: [
 			{ format: 'float32x2', offset: 0, shaderLocation: 0 }, // position
 			{ format: 'float32', offset: 8, shaderLocation: 1 }, // colorIndex
-			{ format: 'float32', offset: 12, shaderLocation: 2 } // transformIndex
+			{ format: 'float32', offset: 12, shaderLocation: 2 } // matrixIndex
 		]
 	};
 
@@ -69,19 +63,17 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 		label: 'drawingPipeline',
 		layout: pipelineLayout,
 		vertex: {
-			module: vertexShader,
+			module: drawingShader,
 			entryPoint: 'vertexMain',
 			buffers: [vertexBufferLayout]
 		},
 		fragment: {
-			module: fragmentShader,
+			module: drawingShader,
 			entryPoint: 'fragmentMain',
 			targets: [{ format: 'bgra8unorm', blend: $.blendConfigs.normal }]
 		},
 		primitive: { topology: 'triangle-strip', stripIndexFormat: 'uint32' },
-		multisample: {
-			count: 4
-		}
+		multisample: { count: 4 }
 	};
 
 	$._pipelines[0] = Q5.device.createRenderPipeline($._pipelineConfigs[0]);
@@ -210,7 +202,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 		let [l, r, t, b] = $._calcBox(x, y, w, h, $._rectMode);
 		let ci, ti;
 		if ($._matrixDirty) $._saveMatrix();
-		ti = $._transformIndex;
+		ti = $._matrixIndex;
 
 		if ($._doFill) {
 			ci = $._fill;
@@ -284,7 +276,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 		let b = w == h ? a : Math.max(h, 1) / 2;
 
 		if ($._matrixDirty) $._saveMatrix();
-		let ti = $._transformIndex;
+		let ti = $._matrixIndex;
 
 		if ($._doFill) {
 			addEllipse(x, y, a, b, n, $._fill, ti);
@@ -300,7 +292,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 
 	$.point = (x, y) => {
 		if ($._matrixDirty) $._saveMatrix();
-		let ti = $._transformIndex,
+		let ti = $._matrixIndex,
 			ci = $._stroke,
 			sw = $._strokeWeight;
 
@@ -320,7 +312,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 
 	$.line = (x1, y1, x2, y2) => {
 		if ($._matrixDirty) $._saveMatrix();
-		let ti = $._transformIndex,
+		let ti = $._matrixIndex,
 			ci = $._stroke,
 			sw = $._strokeWeight,
 			hsw = sw / 2;
@@ -355,7 +347,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 
 	$.vertex = (x, y) => {
 		if ($._matrixDirty) $._saveMatrix();
-		sv.push(x, -y, $._fill, $._transformIndex);
+		sv.push(x, -y, $._fill, $._matrixIndex);
 		shapeVertCount++;
 	};
 
@@ -400,7 +392,7 @@ fn fragmentMain(@location(0) color: vec4f) -> @location(0) vec4f {
 							(2 * p0.y - 5 * p1.y + 4 * p2.y - p3.y) * t2 +
 							(-p0.y + 3 * p1.y - 3 * p2.y + p3.y) * t3);
 
-					sv.push(x, y, $._fill, $._transformIndex);
+					sv.push(x, y, $._fill, $._matrixIndex);
 					shapeVertCount++;
 				}
 			}