q5 2.6.1 → 2.7.1

package/src/q5-core.js

@@ -1,6 +1,6 @@
 /**
  * q5.js
- * @version 2.6
+ * @version 2.7
  * @author quinton-ashley, Tezumie, and LingDong-
  * @license LGPL-3.0
  * @class Q5
@@ -89,7 +89,13 @@ function Q5(scope, parent, renderer) {
 		$.resetMatrix();
 		if ($._beginRender) $._beginRender();
 		for (let m of Q5.methods.pre) m.call($);
-		$.draw();
+		try {
+			$.draw();
+		} catch (e) {
+			if (!Q5.disableFriendlyErrors && $._askAI) $._askAI(e);
+			if (!Q5.errorTolerant) $.noLoop();
+			throw e;
+		}
 		for (let m of Q5.methods.post) m.call($);
 		if ($._render) $._render();
 		if ($._finishRender) $._finishRender();
@@ -128,7 +134,7 @@ function Q5(scope, parent, renderer) {
 		}
 		return $._frameRate;
 	};
-	$.getTargetFrameRate = () => $._targetFrameRate;
+	$.getTargetFrameRate = () => $._targetFrameRate || 60;
 	$.getFPS = () => $._fps;
 
 	$.Element = function (a) {
@@ -196,10 +202,16 @@ function Q5(scope, parent, renderer) {
 	let t = globalScope || $;
 	$._isTouchAware = t.touchStarted || t.touchMoved || t.mouseReleased;
 	let preloadDefined = t.preload;
+	if ($._isGlobal) {
+		$.preload = t.preload;
+		$.setup = t.setup;
+		$.draw = t.draw;
+	} else {
+		$.preload ??= () => {};
+		$.setup ??= () => {};
+		$.draw ??= () => {};
+	}
 	let userFns = [
-		'setup',
-		'draw',
-		'preload',
 		'mouseMoved',
 		'mousePressed',
 		'mouseReleased',
@@ -220,15 +232,13 @@ function Q5(scope, parent, renderer) {
 				try {
 					return t[k]();
 				} catch (e) {
-					if ($._aiErrorAssistance) $._aiErrorAssistance(e);
+					if ($._askAI) $._askAI(e);
 					throw e;
 				}
 			};
 		}
 	}
 
-	if (!($.setup || $.draw)) return;
-
 	async function _start() {
 		$._startDone = true;
 		if ($._preloadCount > 0) return raf(_start);
@@ -236,19 +246,25 @@ function Q5(scope, parent, renderer) {
 		await $.setup();
 		$._setupDone = true;
 		if ($.frameCount) return;
-		if ($.ctx === null) $.createCanvas(100, 100);
+		if ($.ctx === null) $.createCanvas(200, 200);
 		if ($.ctx) $.resetMatrix();
 		raf($._draw);
 	}
 
-	if ((arguments.length && scope != 'namespace' && renderer != 'webgpu') || preloadDefined) {
-		$.preload();
-		_start();
-	} else {
-		t.preload = $.preload = () => {
+	function _preStart() {
+		try {
+			$.preload();
 			if (!$._startDone) _start();
-		};
-		setTimeout($.preload, 32);
+		} catch (e) {
+			if ($._askAI) $._askAI(e);
+			throw e;
+		}
+	}
+
+	if (preloadDefined || (arguments.length && scope != 'instance' && renderer != 'webgpu')) {
+		_preStart();
+	} else {
+		setTimeout(_preStart, 32);
 	}
 }
 
@@ -259,7 +275,7 @@ Q5._nodejs = typeof process == 'object';
 
 Q5._instanceCount = 0;
 Q5._friendlyError = (msg, func) => {
-	console.error(func + ': ' + msg);
+	if (!Q5.disableFriendlyErrors) console.error(func + ': ' + msg);
 };
 Q5._validateParameters = () => true;
 

package/src/q5-input.js

@@ -6,11 +6,11 @@ Q5.modules.input = ($, q) => {
 	$.pmouseX = 0;
 	$.pmouseY = 0;
 	$.touches = [];
-	$.mouseButton = null;
+	$.mouseButton = '';
 	$.keyIsPressed = false;
 	$.mouseIsPressed = false;
-	$.key = null;
-	$.keyCode = null;
+	$.key = '';
+	$.keyCode = 0;
 
 	$.UP_ARROW = 38;
 	$.DOWN_ARROW = 40;