fix tests

rendajs · Aug 22, 2024 · a1dc6fc · a1dc6fc
1 parent 4ccd817
commit a1dc6fc
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/test/unit/src/rendering/renderers/shared/sceneUtil.js b/test/unit/src/rendering/renderers/shared/sceneUtil.js
@@ -19,6 +19,7 @@ export function createVertexState() {
 						componentCount: 3,
 						format: Mesh.AttributeFormat.FLOAT32,
 						unsigned: false,
+						shaderLocation: 0,
 					},
 				],
 			},
@@ -31,6 +32,7 @@ export function createVertexState() {
 						componentCount: 4,
 						format: Mesh.AttributeFormat.FLOAT32,
 						unsigned: false,
+						shaderLocation: 1,
 					},
 				],
 			},

diff --git a/test/unit/src/rendering/renderers/webGl/WebGlRenderer.test.js b/test/unit/src/rendering/renderers/webGl/WebGlRenderer.test.js
@@ -15,22 +15,24 @@ async function basicRendererSetup() {
 	const scene = new Entity();
 	scene.add(cam);
 
-	const { commandLog, canvas } = assertHasSingleContext();
+	const context = assertHasSingleContext();
 
-	return { renderer, domTarget, camComponent, scene, commandLog, canvas };
+	return { renderer, domTarget, camComponent, scene, ...context };
 }
 
 /**
  * @param {object} options
  * @param {import("../../../../../../src/mod.js").MaterialMapMappedValues} [options.mappedValues]
+ * @param {string} [options.vertexShader]
  */
 function createMaterial({
 	mappedValues = {},
+	vertexShader = "",
 } = {}) {
 	const material = new Material();
 	const materialMapType = new WebGlMaterialMapType();
 	const materialConfig = new WebGlMaterialConfig();
-	materialConfig.vertexShader = new ShaderSource("");
+	materialConfig.vertexShader = new ShaderSource(vertexShader);
 	materialConfig.fragmentShader = new ShaderSource("");
 	materialMapType.materialConfig = materialConfig;
 	const materialMap = new MaterialMap({
@@ -168,7 +170,7 @@ Deno.test({
 	name: "Mesh with single buffer and two attributes",
 	async fn() {
 		await runWithWebGlMocksAsync(async () => {
-			const { scene, domTarget, camComponent, commandLog } = await basicRendererSetup();
+			const { scene, domTarget, camComponent, commandLog, setAttributeLocations } = await basicRendererSetup();
 
 			const vertexState = new VertexState({
 				buffers: [
@@ -181,19 +183,33 @@ Deno.test({
 								componentCount: 3,
 								format: Mesh.AttributeFormat.FLOAT32,
 								unsigned: false,
+								shaderLocation: 0,
 							},
 							{
 								attributeType: Mesh.AttributeType.UV1,
 								componentCount: 2,
 								format: Mesh.AttributeFormat.FLOAT32,
 								unsigned: false,
+								shaderLocation: 1,
 							},
 						],
 					},
 				],
 			});
 
-			const { material } = createMaterial();
+			const { material } = createMaterial({
+				vertexShader: `
+					// @location(0)
+					attribute vec3 pos;
+					// @location(1)
+					attribute vec2 uv;
+				`
+			});
+
+			setAttributeLocations({
+				pos: 0,
+				uv: 1,
+			})
 
 			const { mesh } = createCubeEntity({ scene, vertexState, material });
 
@@ -478,6 +494,7 @@ Deno.test({
 								componentCount: 3,
 								format: Mesh.AttributeFormat.FLOAT32,
 								unsigned: false,
+								shaderLocation: 0,
 							},
 						],
 					},

diff --git a/test/unit/src/rendering/renderers/webGl/shared/WebGlRenderingContext.js b/test/unit/src/rendering/renderers/webGl/shared/WebGlRenderingContext.js
@@ -5,6 +5,9 @@ export class WebGlObject {}
 export function createWebGlRenderingContext() {
 	const commandLog = new WebGlCommandLog();
 
+	/** @type {Map<string, number>} */
+	let attributeLocations = new Map();
+
 	const proxy = new Proxy({}, {
 		get(target, prop, receiver) {
 			if (typeof prop != "string") {
@@ -13,6 +16,13 @@ export function createWebGlRenderingContext() {
 			if (prop.toUpperCase() == prop) {
 				return "GL_" + prop;
 			}
+			if (prop == "getAttribLocation") {
+				/** @type {WebGLRenderingContext["getAttribLocation"]} */
+				const fn = (program, name) => {
+					return attributeLocations.get(name) ?? -1;
+				}
+				return fn;
+			}
 
 			/**
 			 * @param  {...unknown[]} args
@@ -29,5 +39,11 @@ export function createWebGlRenderingContext() {
 	return {
 		context: /** @type {WebGLRenderingContext} */ (proxy),
 		commandLog,
+		/**
+		 * @param {Object.<string, number>} locations
+		 */
+		setAttributeLocations(locations) {
+			attributeLocations = new Map(Object.entries(locations));
+		}
 	};
 }
diff --git a/test/unit/src/rendering/renderers/webGl/shared/webGlMocks.js b/test/unit/src/rendering/renderers/webGl/shared/webGlMocks.js
@@ -4,7 +4,7 @@ import { createWebGlRenderingContext } from "./WebGlRenderingContext.js";
 const oldDocument = globalThis.document;
 let installed = false;
 
-/** @type {{canvas: HTMLCanvasElement, context: WebGLRenderingContext, commandLog: import("./WebGlCommandLog.js").WebGlCommandLog}[]} */
+/** @type {({canvas: HTMLCanvasElement} & ReturnType<typeof createWebGlRenderingContext>)[]} */
 let createdContexts = [];
 
 export function installWebGlMocks() {
@@ -34,9 +34,9 @@ export function installWebGlMocks() {
 					contextRequested = true;
 					if (contextId == "webgl") {
 						if (!webGlContextSupported) return null;
-						const { context, commandLog } = createWebGlRenderingContext();
-						createdContexts.push({ canvas, context, commandLog });
-						return context;
+						const context = createWebGlRenderingContext();
+						createdContexts.push({ canvas, ...context });
+						return context.context;
 					} else if (contextId == "2d") {
 						if (!context2dSupported) return null;
 						return create2dRenderingContext(canvas);