q5 4.5.4 → 4.6.0

package/README.md

@@ -17,13 +17,13 @@ circle(0, 0, 80);
 
 ## Documentation
 
-The [q5 learn pages](https://q5js.org/learn) are organized into sections with interactive mini-examples.
+The [q5 learn pages](https://q5js.org/learn) have interactive mini-examples.
 
 See the [wiki](https://github.com/q5js/q5.js/wiki) for extended documentation.
 
 ## Support q5 💙
 
-q5 is open source and anyone can use it for free under the terms of the LGPL. 🎉
+q5 is open source. Anyone can use it for free under the terms of the LGPL. 🎉
 
 We need your support though! If you enjoy using q5, please donate via [GitHub Sponsors](https://github.com/sponsors/quinton-ashley), [ko-fi](https://ko-fi.com/q5play), or [Patreon](https://www.patreon.com/q5play).
 

package/deno.json

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

package/package.json

@@ -1,15 +1,8 @@
 {
 	"name": "q5",
-	"version": "4.5.4",
+	"version": "4.6.0",
 	"description": "Beginner friendly graphics powered by WebGPU, optimized for interactive art!",
 	"author": "quinton-ashley",
-	"contributors": [
-		"evanalulu",
-		"Tezumie",
-		"ormaq",
-		"Dukemz",
-		"LingDong-"
-	],
 	"license": "LGPL-3.0-only",
 	"homepage": "https://q5js.org/home",
 	"types": "q5.d.ts",

package/q5.js

@@ -2,7 +2,7 @@
  * q5.js
  * @version 4.5
  * @author quinton-ashley
- * @contributors evanalulu, Tezumie, ormaq, Dukemz, LingDong-
+ * @contributors evanalulu, Tezumie, keturn, ormaq, bertubi, RedWilly, Dukemz, LingDong-
  * @license LGPL-3.0
  * @class Q5
  */
@@ -9611,25 +9611,7 @@ const runPython = async function () {
 async def __run(q):
 	${code}
 
-	_state_vars = ["mouseX", "mouseY", "pmouseX", "pmouseY", "width", "height", "frameCount", "deltaTime", "mouseIsPressed", "mouseButton", "keyIsPressed", "key", "keyCode", "touches", "movedX", "movedY"]
-
-	_usr_fns = ["update", "draw", "postProcess", "mousePressed", "mouseReleased", "mouseMoved", "mouseDragged", "mouseClicked", "doubleClicked", "mouseWheel", "keyPressed", "keyReleased", "keyTyped", "touchStarted", "touchMoved", "touchEnded", "windowResized"]
-
-	def _sync_and_call(fn):
-		def _wrapper(*args):
-			try:
-				for var in _state_vars:
-					if hasattr(q, var):
-						ns[var] = getattr(q, var)
-				return fn(*args)
-			except Exception as e:
-				window._pyErr(_err())
-				if not window.Q5.errorTolerant: noLoop()
-		return _wrapper
-
-	for fn_name in _usr_fns:
-		if fn_name in locals():
-			setattr(window, fn_name, _sync_and_call(locals()[fn_name]))
+	_wrap_fns(q, locals(), ns)
 `;
 
 	window._pyErr = (err, lineNum) => {
@@ -9676,11 +9658,35 @@ from browser import window, aio
 import traceback
 import io
 
+_state_vars = ["frameCount", "deltaTime", "width", "height", "halfWidth", "halfHeight", "windowWidth", "windowHeight", "mouseX", "mouseY", "pmouseX", "pmouseY", "movedX", "movedY", "mouseIsPressed", "mouseButton", "keyIsPressed", "key", "keyCode", "touches", "recording"]
+
+_usr_fns = ["update", "draw", "postProcess", "mousePressed", "mouseReleased", "mouseMoved", "mouseDragged", "mouseClicked", "doubleClicked", "mouseWheel", "keyPressed", "keyReleased", "keyTyped", "touchStarted", "touchMoved", "touchEnded", "windowResized"]
+
 def _err():
 	f = io.StringIO()
 	traceback.print_exc(file=f)
 	return f.getvalue()
 
+def _sync_state(q, ns):
+	for var in _state_vars:
+		if hasattr(q, var):
+			ns[var] = getattr(q, var)
+
+def _sync_and_call(q, fn, ns):
+	def _wrapper(*args):
+		try:
+			_sync_state(q, ns)
+			return fn(*args)
+		except Exception as e:
+			window._pyErr(_err(), None, q)
+			if not window.Q5.errorTolerant: q.noLoop()
+	return _wrapper
+
+def _wrap_fns(q, locs, ns):
+	for fn_name in _usr_fns:
+		if fn_name in locs:
+			setattr(q, fn_name, _sync_and_call(q, locs[fn_name], ns))
+
 async def _run_py(q, code):
 	ns = globals().copy()
 	ns['ns'] = ns
@@ -9693,17 +9699,24 @@ async def _run_py(q, code):
 			except Exception:
 				pass
 
+	_orig_Canvas = ns['Canvas']
+	async def _canvas_wrapper(*args):
+		result = await _orig_Canvas(*args)
+		_sync_state(q, ns)
+		return result
+	ns['Canvas'] = ns['createCanvas'] = _canvas_wrapper
+
 	try:
 		exec(code, ns)
 	except SyntaxError as e:
-		return window._pyErr(_err(), e.lineno)
+		return window._pyErr(_err(), e.lineno, q)
 	except Exception as e:
-		return window._pyErr(_err())
-	
+		return window._pyErr(_err(), 0, q)
+
 	try:
 		await ns["__run"](q)
 	except Exception as e:
-		window._pyErr(_err())
+		window._pyErr(_err(), 0, q)
 
 window._runPy = _run_py
 `);