2.7.3

q5js · Oct 20, 2024 · b12d802 · b12d802
1 parent 85bf3cd
commit b12d802
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "q5",
-	"version": "2.7.2",
+	"version": "2.7.3",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",
 	"contributors": [

diff --git a/q5.js b/q5.js
@@ -12,6 +12,7 @@ function Q5(scope, parent, renderer) {
 	$._renderer = renderer || 'q2d';
 	$._preloadCount = 0;
 
+	let autoLoaded = scope == 'auto';
 	scope ??= 'global';
 	if (scope == 'auto') {
 		if (!(window.setup || window.draw)) return;
@@ -201,7 +202,7 @@ 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;
@@ -239,9 +240,9 @@ function Q5(scope, parent, renderer) {
 		}
 	}
 
-	async function _start() {
+	async function _setup() {
 		$._startDone = true;
-		if ($._preloadCount > 0) return raf(_start);
+		if ($._preloadCount > 0) return raf(_setup);
 		millisStart = performance.now();
 		await $.setup();
 		$._setupDone = true;
@@ -251,21 +252,18 @@ function Q5(scope, parent, renderer) {
 		raf($._draw);
 	}
 
-	function _preStart() {
+	function _start() {
 		try {
 			$.preload();
-			if (!$._startDone) _start();
+			if (!$._startDone) _setup();
 		} catch (e) {
 			if ($._askAI) $._askAI(e);
 			throw e;
 		}
 	}
 
-	if (preloadDefined || $._isGlobal) {
-		_preStart();
-	} else {
-		setTimeout(_preStart, 32);
-	}
+	if (autoLoaded) _start();
+	else setTimeout(_start, 32);
 }
 
 Q5.renderers = {};

diff --git a/q5.min.js b/q5.min.js
diff --git a/src/q5-core.js b/src/q5-core.js
@@ -12,6 +12,7 @@ function Q5(scope, parent, renderer) {
 	$._renderer = renderer || 'q2d';
 	$._preloadCount = 0;
 
+	let autoLoaded = scope == 'auto';
 	scope ??= 'global';
 	if (scope == 'auto') {
 		if (!(window.setup || window.draw)) return;
@@ -201,7 +202,7 @@ 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;
@@ -239,9 +240,9 @@ function Q5(scope, parent, renderer) {
 		}
 	}
 
-	async function _start() {
+	async function _setup() {
 		$._startDone = true;
-		if ($._preloadCount > 0) return raf(_start);
+		if ($._preloadCount > 0) return raf(_setup);
 		millisStart = performance.now();
 		await $.setup();
 		$._setupDone = true;
@@ -251,21 +252,18 @@ function Q5(scope, parent, renderer) {
 		raf($._draw);
 	}
 
-	function _preStart() {
+	function _start() {
 		try {
 			$.preload();
-			if (!$._startDone) _start();
+			if (!$._startDone) _setup();
 		} catch (e) {
 			if ($._askAI) $._askAI(e);
 			throw e;
 		}
 	}
 
-	if (preloadDefined || $._isGlobal) {
-		_preStart();
-	} else {
-		setTimeout(_preStart, 32);
-	}
+	if (autoLoaded) _start();
+	else setTimeout(_start, 32);
 }
 
 Q5.renderers = {};