2.11.7

q5js · Nov 29, 2024 · 5220c5a · 5220c5a
1 parent a1be464
commit 5220c5a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
 	"name": "@q5/q5",
-	"version": "2.11.6",
+	"version": "2.11.7",
 	"license": "LGPL-3.0",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "q5",
-	"version": "2.11.6",
+	"version": "2.11.7",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",
 	"contributors": [

diff --git a/q5.d.ts b/q5.d.ts
@@ -1314,8 +1314,8 @@ function setup() {
 
 	/** 🌆
 	 * Creates a new image.
-	 * @param {number} w - width
-	 * @param {number} h - height
+	 * @param {number} [w] - character limit per line
+	 * @param {number} [h] - line limit
 	 * @param {any} [opt] - optional settings for the image
 	 * @returns {Image}
 	 */
@@ -1345,7 +1345,7 @@ textSize(20);
 
 let info = "q5.js is a JavaScript library for creative coding. It's a sequel to p5.js that's optimized for interactive art.";
 
-text(info, 12, 30, 20, 5);
+text(info, 12, 30, 20, 6);
 	 */
 	function text(str: string, x: number, y: number, w?: number, h?: number): void;
 

diff --git a/q5.js b/q5.js
@@ -1966,7 +1966,7 @@ Q5.renderers.q2d.text = ($, q) => {
 			if ($._doFill) ctx.fillText(line, tX, tY);
 			tY += leading;
 			lineAmount++;
-			if (lineAmount > h) break;
+			if (lineAmount >= h) break;
 		}
 		lines.length = 0;
 
@@ -5274,7 +5274,7 @@ fn fragmentMain(input : VertexOutput) -> @location(0) vec4f {
 		if (str.length > w) {
 			let wrapped = [];
 			let i = 0;
-			while (i < str.length) {
+			while (i < str.length && wrapped.length < h) {
 				let max = i + w;
 				if (max >= str.length) {
 					wrapped.push(str.slice(i));

diff --git a/q5.min.js b/q5.min.js
diff --git a/src/q5-2d-text.js b/src/q5-2d-text.js
@@ -221,7 +221,7 @@ Q5.renderers.q2d.text = ($, q) => {
 			if ($._doFill) ctx.fillText(line, tX, tY);
 			tY += leading;
 			lineAmount++;
-			if (lineAmount > h) break;
+			if (lineAmount >= h) break;
 		}
 		lines.length = 0;
 

diff --git a/src/q5-webgpu-text.js b/src/q5-webgpu-text.js
@@ -389,7 +389,7 @@ fn fragmentMain(input : VertexOutput) -> @location(0) vec4f {
 		if (str.length > w) {
 			let wrapped = [];
 			let i = 0;
-			while (i < str.length) {
+			while (i < str.length && wrapped.length < h) {
 				let max = i + w;
 				if (max >= str.length) {
 					wrapped.push(str.slice(i));