From 40927904c384497d37e0e98e8eca855674c8f48c Mon Sep 17 00:00:00 2001 From: taconi Date: Sun, 5 Jan 2025 21:11:50 -0300 Subject: [PATCH] Fixing py5 random functions --- packages/web/src/lib/py5-wrapper.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/web/src/lib/py5-wrapper.ts b/packages/web/src/lib/py5-wrapper.ts index 5e7a199c..1b7b26db 100644 --- a/packages/web/src/lib/py5-wrapper.ts +++ b/packages/web/src/lib/py5-wrapper.ts @@ -806,12 +806,12 @@ def random(*args): return np_random.uniform() elif len(args) == 1: high = args[0] - if isinstance(high, (builtins.int, np.integer, float)): + if isinstance(high, (builtins.int, np.integer, builtins.float)): return np_random.uniform(0, high) elif len(args) == 2: low, high = args - if isinstance(low, (builtins.int, np.integer, float)) and isinstance( - high, (builtins.int, np.integer, float) + if isinstance(low, (builtins.int, np.integer, builtins.float)) and isinstance( + high, (builtins.int, np.integer, builtins.float) ): return np_random.uniform(low, high) @@ -862,8 +862,8 @@ def random_gaussian(*args): return np_random.normal(loc) elif len(args) == 2: loc, scale = args - if isinstance(loc, (builtins.int, np.integer, float)) and isinstance( - scale, (builtins.int, np.integer, float) + if isinstance(loc, (builtins.int, np.integer, builtins.float)) and isinstance( + scale, (builtins.int, np.integer, builtins.float) ): return np_random.normal(loc, scale) @@ -1920,12 +1920,16 @@ export class Py5Wrapper { `); this.initialized = true; - // console.log("Py5 initialized"); this._onWarning("Py5 initialized"); + await this.tryEval(""); } async tryEval(userCode: string) { - if (!this.initialized) await this.initialize(); + if (!this.initialized) { + this._onWarning("Engine still loading"); + this.initialize(); + return; + } if (window._p5_instance) { window._p5_instance.remove();