q5 4.6.0 → 4.6.2

package/deno.json

@@ -1,6 +1,6 @@
 {
 	"name": "@q5/q5",
-	"version": "4.6.0",
+	"version": "4.6.1",
 	"license": "LGPL-3.0-only",
 	"description": "Beginner friendly graphics powered by WebGPU, optimized for interactive art!",
 	"author": "quinton-ashley",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "q5",
-	"version": "4.6.0",
+	"version": "4.6.2",
 	"description": "Beginner friendly graphics powered by WebGPU, optimized for interactive art!",
 	"author": "quinton-ashley",
 	"license": "LGPL-3.0-only",

package/q5.js

@@ -1,6 +1,6 @@
 /**
  * q5.js
- * @version 4.5
+ * @version 4.6
  * @author quinton-ashley
  * @contributors evanalulu, Tezumie, keturn, ormaq, bertubi, RedWilly, Dukemz, LingDong-
  * @license LGPL-3.0
@@ -496,7 +496,7 @@ if (typeof window == 'object') {
 	window.addEventListener('pagehide', cleanup);
 } else global.window = 0;
 
-Q5.version = Q5.VERSION = '4.5';
+Q5.version = Q5.VERSION = '4.6';
 
 if (typeof document == 'object') {
 	document.addEventListener('DOMContentLoaded', () => {
@@ -6309,13 +6309,6 @@ fn fragMain(f: FragParams ) -> @location(0) vec4f {
 			}
 
 			Q5.device.queue.writeBuffer(imgVertBuff, 0, imgVertStack.subarray(0, imgVertIdx));
-
-			$._pass.setVertexBuffer(1, imgVertBuff);
-
-			if (vidFrames) {
-				$._pass.setPipeline($._pipelines[3]); // video pipeline
-				$._pass.setVertexBuffer(1, imgVertBuff);
-			}
 		}
 
 		// prepare to render text
@@ -6415,6 +6408,12 @@ fn fragMain(f: FragParams ) -> @location(0) vec4f {
 				curPipelineIndex = drawStack[i];
 				pass.setPipeline($._pipelines[curPipelineIndex]);
 
+				if (curPipelineIndex == 2 || curPipelineIndex == 3 || curPipelineIndex >= 2000) {
+					pass.setVertexBuffer(0, imgVertBuff);
+				} else if (curPipelineIndex == 1 || (curPipelineIndex >= 1000 && curPipelineIndex < 2000)) {
+					pass.setVertexBuffer(0, shapesVertBuff);
+				}
+
 				if (curPipelineIndex == 5) {
 					pass.setIndexBuffer(rectIndexBuffer, 'uint16');
 					pass.setBindGroup(1, rectBindGroup);
@@ -7790,7 +7789,7 @@ fn fragMain(f: FragParams) -> @location(0) vec4f {
 		vertex: {
 			module: imageShader,
 			entryPoint: 'vertexMain',
-			buffers: [{ arrayStride: 0, attributes: [] }, imgVertBuffLayout]
+			buffers: [imgVertBuffLayout]
 		},
 		fragment: {
 			module: imageShader,
@@ -7809,7 +7808,7 @@ fn fragMain(f: FragParams) -> @location(0) vec4f {
 		vertex: {
 			module: videoShader,
 			entryPoint: 'vertexMain',
-			buffers: [{ arrayStride: 0, attributes: [] }, imgVertBuffLayout]
+			buffers: [imgVertBuffLayout]
 		},
 		fragment: {
 			module: videoShader,
@@ -9437,6 +9436,10 @@ const parseLangs = function (data, lang) {
 	return map;
 };
 
+const unaccent = function (s) {
+	return s.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+};
+
 Object.defineProperty(Q5, 'lang', {
 	get: () => Q5._lang,
 	set: (val) => {
@@ -9502,6 +9505,40 @@ for (let l of supportedLangs) {
 	}
 }
 
+Q5.applyLang = function (q, libs, classes) {
+	let val = Q5._lang;
+	if (val == 'en') return;
+
+	let map = parseLangs(libs, val);
+	for (let name in map) {
+		let translatedName = map[name];
+		q[translatedName] = q[name];
+		if (val == 'es') {
+			let unaccentedName = unaccent(translatedName);
+			if (unaccentedName != translatedName) q[unaccentedName] = q[name];
+		}
+	}
+
+	if (!classes) return;
+
+	for (let className in classes) {
+		let target = q[className].prototype;
+		let map = parseLangs(classes[className], val);
+		for (let name in map) {
+			let translatedName = map[name];
+			if (target.hasOwnProperty(translatedName)) continue;
+			Object.defineProperty(target, translatedName, {
+				get: function () {
+					return this[name];
+				},
+				set: function (v) {
+					this[name] = v;
+				}
+			});
+		}
+	}
+};
+
 Q5.modules.lang = ($) => {
 	let userFnsMap = Q5._userFnsMap;
 
@@ -9526,7 +9563,7 @@ Q5.addHook('init', (q) => {
 		q[translatedName] = q[name];
 
 		if (Q5._lang == 'es') {
-			let unaccentedName = translatedName.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+			let unaccentedName = unaccent(translatedName);
 			if (unaccentedName != translatedName) {
 				q[unaccentedName] = q[name];
 			}
@@ -9560,7 +9597,7 @@ Q5.addHook('predraw', (q) => {
 		if (!m[p]) continue;
 		q[m[p]] = q[p];
 		if (Q5._lang == 'es') {
-			let unaccentedName = m[p].normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+			let unaccentedName = unaccent(m[p]);
 			if (unaccentedName != m[p]) {
 				q[unaccentedName] = q[p];
 			}