q5 2.4.5 → 2.5.0

package/src/q5-2d-text.js

@@ -1,9 +1,22 @@
 Q5.renderers.q2d.text = ($, q) => {
-	$._textFont = 'sans-serif';
+	$._textAlign = 'left';
+	$._textBaseline = 'alphabetic';
 	$._textSize = 12;
-	$._textLeading = 15;
-	$._textLeadDiff = 3;
-	$._textStyle = 'normal';
+
+	let font = 'sans-serif',
+		leadingSet = false,
+		leading = 15,
+		leadDiff = 3,
+		emphasis = 'normal',
+		fontMod = false,
+		styleHash = 0,
+		styleHashes = [],
+		useCache = false,
+		genTextImage = false,
+		cacheSize = 0,
+		cacheMax = 12000;
+
+	let cache = ($._textCache = {});
 
 	$.loadFont = (url, cb) => {
 		q._preloadCount++;
@@ -16,156 +29,160 @@ Q5.renderers.q2d.text = ($, q) => {
 		});
 		return name;
 	};
-	$.textFont = (x) => ($._textFont = x);
+
+	$.textFont = (x) => {
+		font = x;
+		fontMod = true;
+		styleHash = -1;
+	};
 	$.textSize = (x) => {
 		if (x === undefined) return $._textSize;
 		if ($._da) x *= $._da;
 		$._textSize = x;
-		if (!$._leadingSet) {
-			$._textLeading = x * 1.25;
-			$._textLeadDiff = $._textLeading - x;
+		fontMod = true;
+		styleHash = -1;
+		if (!leadingSet) {
+			leading = x * 1.25;
+			leadDiff = leading - x;
 		}
 	};
+	$.textStyle = (x) => {
+		emphasis = x;
+		fontMod = true;
+		styleHash = -1;
+	};
 	$.textLeading = (x) => {
-		if (x === undefined) return $._textLeading;
+		if (x === undefined) return leading;
 		if ($._da) x *= $._da;
-		$._textLeading = x;
-		$._textLeadDiff = x - $._textSize;
-		$._leadingSet = true;
+		leading = x;
+		leadDiff = x - $._textSize;
+		leadingSet = true;
+		styleHash = -1;
 	};
-	$.textStyle = (x) => ($._textStyle = x);
 	$.textAlign = (horiz, vert) => {
-		$.ctx.textAlign = horiz;
+		$.ctx.textAlign = $._textAlign = horiz;
 		if (vert) {
-			$.ctx.textBaseline = vert == $.CENTER ? 'middle' : vert;
+			$.ctx.textBaseline = $._textBaseline = vert == $.CENTER ? 'middle' : vert;
 		}
 	};
-	$.textWidth = (str) => {
-		$.ctx.font = `${$._textStyle} ${$._textSize}px ${$._textFont}`;
-		return $.ctx.measureText(str).width;
-	};
-	$.textAscent = (str) => {
-		$.ctx.font = `${$._textStyle} ${$._textSize}px ${$._textFont}`;
-		return $.ctx.measureText(str).actualBoundingBoxAscent;
-	};
-	$.textDescent = (str) => {
-		$.ctx.font = `${$._textStyle} ${$._textSize}px ${$._textFont}`;
-		return $.ctx.measureText(str).actualBoundingBoxDescent;
-	};
+
+	$.textWidth = (str) => $.ctx.measureText(str).width;
+	$.textAscent = (str) => $.ctx.measureText(str).actualBoundingBoxAscent;
+	$.textDescent = (str) => $.ctx.measureText(str).actualBoundingBoxDescent;
+
 	$.textFill = $.fill;
 	$.textStroke = $.stroke;
 
-	$._textCache = !!Q5.Image;
-	$._TimedCache = class extends Map {
-		constructor() {
-			super();
-			this.maxSize = 50000;
-		}
-		set(k, v) {
-			v.lastAccessed = Date.now();
-			super.set(k, v);
-			if (this.size > this.maxSize) this.gc();
-		}
-		get(k) {
-			const v = super.get(k);
-			if (v) v.lastAccessed = Date.now();
-			return v;
-		}
-		gc() {
-			let t = Infinity;
-			let oldest;
-			let i = 0;
-			for (const [k, v] of this.entries()) {
-				if (v.lastAccessed < t) {
-					t = v.lastAccessed;
-					oldest = i;
-				}
-				i++;
-			}
-			i = oldest;
-			for (const k of this.keys()) {
-				if (i == 0) {
-					oldest = k;
-					break;
-				}
-				i--;
-			}
-			this.delete(oldest);
+	let updateStyleHash = () => {
+		let styleString = font + $._textSize + emphasis + leading;
+
+		let hash = 5381;
+		for (let i = 0; i < styleString.length; i++) {
+			hash = (hash * 33) ^ styleString.charCodeAt(i);
 		}
+		styleHash = hash >>> 0;
 	};
-	$._tic = new $._TimedCache();
-	$.textCache = (b, maxSize) => {
-		if (maxSize) $._tic.maxSize = maxSize;
-		if (b !== undefined) $._textCache = b;
-		return $._textCache;
-	};
-	$._genTextImageKey = (str, w, h) => {
-		return (
-			str.slice(0, 200) +
-			$._textStyle +
-			$._textSize +
-			$._textFont +
-			($._doFill ? $.ctx.fillStyle : '') +
-			'_' +
-			($._doStroke && $._strokeSet ? $.ctx.lineWidth + $.ctx.strokeStyle + '_' : '') +
-			(w || '') +
-			(h ? 'x' + h : '')
-		);
+
+	$.textCache = (enable, maxSize) => {
+		if (maxSize) cacheMax = maxSize;
+		if (enable !== undefined) useCache = enable;
+		return useCache;
 	};
 	$.createTextImage = (str, w, h) => {
-		let k = $._genTextImageKey(str, w, h);
-		if ($._tic.get(k)) return $._tic.get(k);
-
-		let og = $._textCache;
-		$._textCache = true;
-		$._genTextImage = true;
-		$.text(str, 0, 0, w, h);
-		$._genTextImage = false;
-		$._textCache = og;
-		return $._tic.get(k);
+		genTextImage = true;
+		img = $.text(str, 0, 0, w, h);
+		genTextImage = false;
+		return img;
 	};
+
+	let lines = [];
 	$.text = (str, x, y, w, h) => {
 		if (str === undefined || (!$._doFill && !$._doStroke)) return;
 		str = str.toString();
-		let lines = str.split('\n');
 		if ($._da) {
 			x *= $._da;
 			y *= $._da;
 		}
 		let ctx = $.ctx;
-		ctx.font = `${$._textStyle} ${$._textSize}px ${$._textFont}`;
+		let img, tX, tY;
 
-		let useCache, img, cacheKey, tX, tY, ascent, descent;
+		if (fontMod) {
+			ctx.font = `${emphasis} ${$._textSize}px ${font}`;
+			fontMod = false;
+		}
 
-		if (!(useCache = $._genTextImage) && $._textCache) {
-			let transform = $.ctx.getTransform();
-			useCache = transform.b != 0 || transform.c != 0;
+		if (useCache || genTextImage) {
+			if (styleHash == -1) updateStyleHash();
+
+			img = cache[str];
+			if (img) img = img[styleHash];
+
+			if (img) {
+				if (img._fill == $._fill && img._stroke == $._stroke && img._strokeWeight == $._strokeWeight) {
+					if (genTextImage) return img;
+					return $.textImage(img, x, y);
+				} else img.clear();
+			}
 		}
 
-		if (!useCache) {
+		if (str.indexOf('\n') == -1) lines[0] = str;
+		else lines = str.split('\n');
+
+		if (str.length > w) {
+			let wrapped = [];
+			for (let line of lines) {
+				let i = 0;
+
+				while (i < line.length) {
+					let max = i + w;
+					if (max >= line.length) {
+						wrapped.push(line.slice(i));
+						break;
+					}
+					let end = line.lastIndexOf(' ', max);
+					if (end === -1 || end < i) end = max;
+					wrapped.push(line.slice(i, end));
+					i = end + 1;
+				}
+			}
+			lines = wrapped;
+		}
+
+		if (!useCache && !genTextImage) {
 			tX = x;
 			tY = y;
 		} else {
-			cacheKey = $._genTextImageKey(str, w, h);
-			img = $._tic.get(cacheKey);
-			if (img && !$._genTextImage) return $.textImage(img, x, y);
-
 			tX = 0;
-			tY = $._textLeading * lines.length;
-			let measure = ctx.measureText(' ');
-			ascent = measure.fontBoundingBoxAscent;
-			descent = measure.fontBoundingBoxDescent;
-			h ??= tY + descent;
+			tY = leading * lines.length;
+
+			if (!img) {
+				let measure = ctx.measureText(' ');
+				let ascent = measure.fontBoundingBoxAscent;
+				let descent = measure.fontBoundingBoxDescent;
+				h ??= tY + descent;
 
-			img = $.createImage.call($, Math.ceil(ctx.measureText(str).width), Math.ceil(h), {
-				pixelDensity: $._pixelDensity
-			});
+				img = $.createImage.call($, Math.ceil(ctx.measureText(str).width), Math.ceil(h), {
+					pixelDensity: $._pixelDensity
+				});
+
+				img._ascent = ascent;
+				img._descent = descent;
+				img._top = descent + leadDiff;
+				img._middle = img._top + ascent * 0.5;
+				img._bottom = img._top + ascent;
+				img._leading = leading;
+			}
+
+			img._fill = $._fill;
+			img._stroke = $._stroke;
+			img._strokeWeight = $._strokeWeight;
+			img.modified = true;
 
 			ctx = img.ctx;
 
 			ctx.font = $.ctx.font;
-			ctx.fillStyle = $.ctx.fillStyle;
-			ctx.strokeStyle = $.ctx.strokeStyle;
+			ctx.fillStyle = $._fill;
+			ctx.strokeStyle = $._stroke;
 			ctx.lineWidth = $.ctx.lineWidth;
 		}
 
@@ -175,31 +192,49 @@ Q5.renderers.q2d.text = ($, q) => {
 			ctx.fillStyle = 'black';
 		}
 
-		for (let i = 0; i < lines.length; i++) {
-			if ($._doStroke && $._strokeSet) ctx.strokeText(lines[i], tX, tY);
-			if ($._doFill) ctx.fillText(lines[i], tX, tY);
-			tY += $._textLeading;
+		for (let line of lines) {
+			if ($._doStroke && $._strokeSet) ctx.strokeText(line, tX, tY);
+			if ($._doFill) ctx.fillText(line, tX, tY);
+			tY += leading;
 			if (tY > h) break;
 		}
+		lines.length = 0;
 
 		if (!$._fillSet) ctx.fillStyle = ogFill;
 
-		if (useCache) {
-			img._ascent = ascent;
-			img._descent = descent;
-			$._tic.set(cacheKey, img);
-			if (!$._genTextImage) $.textImage(img, x, y);
+		if (useCache || genTextImage) {
+			styleHashes.push(styleHash);
+			(cache[str] ??= {})[styleHash] = img;
+
+			cacheSize++;
+			if (cacheSize > cacheMax) {
+				let half = Math.ceil(cacheSize / 2);
+				let hashes = styleHashes.splice(0, half);
+				for (let s in cache) {
+					s = cache[s];
+					for (let h of hashes) delete s[h];
+				}
+				cacheSize -= half;
+			}
+
+			if (genTextImage) return img;
+			$.textImage(img, x, y);
 		}
 	};
 	$.textImage = (img, x, y) => {
 		let og = $._imageMode;
 		$._imageMode = 'corner';
-		if ($.ctx.textAlign == 'center') x -= img.width * 0.5;
-		else if ($.ctx.textAlign == 'right') x -= img.width;
-		if ($.ctx.textBaseline == 'alphabetic') y -= $._textLeading;
-		if ($.ctx.textBaseline == 'middle') y -= img._descent + img._ascent * 0.5 + $._textLeadDiff;
-		else if ($.ctx.textBaseline == 'bottom') y -= img._ascent + img._descent + $._textLeadDiff;
-		else if ($.ctx.textBaseline == 'top') y -= img._descent + $._textLeadDiff;
+
+		let ta = $._textAlign;
+		if (ta == 'center') x -= img.canvas.hw;
+		else if (ta == 'right') x -= img.width;
+
+		let bl = $._textBaseline;
+		if (bl == 'alphabetic') y -= img._leading;
+		else if (bl == 'middle') y -= img._middle;
+		else if (bl == 'bottom') y -= img._bottom;
+		else if (bl == 'top') y -= img._top;
+
 		$.image(img, x, y);
 		$._imageMode = og;
 	};

package/src/q5-canvas.js

@@ -201,7 +201,7 @@ Q5.modules.canvas = ($, q) => {
 
 			function parentResized() {
 				if ($.frameCount > 1) {
-					$._shouldResize = true;
+					$._didResize = true;
 					$._adjustDisplay();
 				}
 			}
@@ -261,14 +261,9 @@ Q5.modules.canvas = ($, q) => {
 		'_imageMode',
 		'_rectMode',
 		'_ellipseMode',
-		'_textFont',
-		'_textLeading',
-		'_leadingSet',
 		'_textSize',
 		'_textAlign',
-		'_textBaseline',
-		'_textStyle',
-		'_textWrap'
+		'_textBaseline'
 	];
 	$._styles = [];
 
@@ -281,6 +276,15 @@ Q5.modules.canvas = ($, q) => {
 		let styles = $._styles.pop();
 		for (let s of $._styleNames) $[s] = styles[s];
 	};
+
+	if (window && $._scope != 'graphics') {
+		window.addEventListener('resize', () => {
+			$._didResize = true;
+			q.windowWidth = window.innerWidth;
+			q.windowHeight = window.innerHeight;
+			q.deviceOrientation = window.screen?.orientation?.type;
+		});
+	}
 };
 
 Q5.canvasOptions = {

package/src/q5-core.js

@@ -70,9 +70,9 @@ function Q5(scope, parent, renderer) {
 		let ts = timestamp || performance.now();
 		$._lastFrameTime ??= ts - $._targetFrameDuration;
 
-		if ($._shouldResize) {
+		if ($._didResize) {
 			$.windowResized();
-			$._shouldResize = false;
+			$._didResize = false;
 		}
 
 		if ($._loop) looper = raf($._draw);

package/src/q5-util.js

@@ -5,10 +5,11 @@ Q5.modules.util = ($, q) => {
 		fetch(path)
 			.then((r) => {
 				if (type == 'json') return r.json();
-				if (type == 'text') return r.text();
+				return r.text();
 			})
 			.then((r) => {
 				q._preloadCount--;
+				if (type == 'csv') r = $.CSV.parse(r);
 				Object.assign(ret, r);
 				if (cb) cb(r);
 			});
@@ -17,6 +18,21 @@ Q5.modules.util = ($, q) => {
 
 	$.loadStrings = (path, cb) => $._loadFile(path, cb, 'text');
 	$.loadJSON = (path, cb) => $._loadFile(path, cb, 'json');
+	$.loadCSV = (path, cb) => $._loadFile(path, cb, 'csv');
+
+	$.CSV = {};
+	$.CSV.parse = (csv, sep = ',', lineSep = '\n') => {
+		let a = [],
+			lns = csv.split(lineSep),
+			headers = lns[0].split(sep);
+		for (let i = 1; i < lns.length; i++) {
+			let o = {},
+				ln = lns[i].split(sep);
+			headers.forEach((h, i) => (o[h] = JSON.parse(ln[i])));
+			a.push(o);
+		}
+		return a;
+	};
 
 	if (typeof localStorage == 'object') {
 		$.storeItem = localStorage.setItem;