Visualize Your Ideas With Code
fix: support multiple async players (#450)
Jacobd7ec469e747e
diff --git a/packages/2d/src/scenes/Scene2D.ts b/packages/2d/src/scenes/Scene2D.tsindex 7085d5f5..2e6f57c0 100644--- a/packages/2d/src/scenes/Scene2D.ts+++ b/packages/2d/src/scenes/Scene2D.ts@@ -58,10 +58,9 @@ export class Scene2D extends GeneratorScene<View2D> implements Inspectable {}public inspectPosition(x: number, y: number): InspectedElement | null {- startScene(this);- const node = this.getView().hit(new Vector2(x, y))?.key ?? null;- endScene(this);- return node;+ return this.execute(+ () => this.getView().hit(new Vector2(x, y))?.key ?? null,+ );}public validateInspection(@@ -115,12 +114,12 @@ export class Scene2D extends GeneratorScene<View2D> implements Inspectable {}protected recreateView() {- startScene(this);- const size = this.getSize();- this.view = new View2D({- position: size.scale(0.5),- size,+ this.execute(() => {+ const size = this.getSize();+ this.view = new View2D({+ position: size.scale(0.5),+ size,+ });});- endScene(this);}}diff --git a/packages/core/src/scenes/GeneratorScene.ts b/packages/core/src/scenes/GeneratorScene.tsindex 746ef960..1ed5f5e7 100644--- a/packages/core/src/scenes/GeneratorScene.ts+++ b/packages/core/src/scenes/GeneratorScene.ts@@ -141,19 +141,17 @@ export abstract class GeneratorScene<T>public async render(context: CanvasRenderingContext2D): Promise<void> {let promises = DependencyContext.consumePromises();let iterations = 0;- startScene(this);do {iterations++;await Promise.all(promises.map(handle => handle.promise));context.save();const box = BBox.fromSizeCentered(this.getSize());context.clearRect(box.x, box.y, box.width, box.height);- this.draw(context);+ this.execute(() => this.draw(context));context.restore();promises = DependencyContext.consumePromises();} while (promises.length > 0 && iterations < 10);- endScene(this);if (iterations > 1) {this.logger.debug(`render iterations: ${iterations}`);@@ -222,30 +220,23 @@ export abstract class GeneratorScene<T>return;}- startScene(this);- startPlayback(this.playback);- let done = false;- try {- let result = this.runner.next();- this.update();- while (result.value) {- if (isPromisable(result.value)) {- result = this.runner.next(await result.value.toPromise());- } else if (isPromise(result.value)) {- result = this.runner.next(await result.value);- } else {- this.logger.warn({- message: 'Invalid value yielded by the scene.',- object: result.value,- });- result = this.runner.next(result.value);- }- this.update();+ let result = this.execute(() => this.runner!.next());+ this.update();+ while (result.value) {+ if (isPromisable(result.value)) {+ const value = await result.value.toPromise();+ result = this.execute(() => this.runner!.next(value));+ } else if (isPromise(result.value)) {+ const value = await result.value;+ result = this.execute(() => this.runner!.next(value));+ } else {+ this.logger.warn({+ message: 'Invalid value yielded by the scene.',+ object: result.value,+ });+ result = this.execute(() => this.runner!.next(result.value));}- done = !!result.done;- } finally {- endPlayback(this.playback);- endScene(this);+ this.update();}const promises = DependencyContext.consumePromises();@@ -260,7 +251,7 @@ export abstract class GeneratorScene<T>});}- if (done) {+ if (result.done) {this.state = SceneState.Finished;}}@@ -341,4 +332,27 @@ export abstract class GeneratorScene<T>public isCached() {return this.cached;}++ /**+ * Invoke the given callback in the context of this scene.+ *+ * @remarks+ * This method makes sure that the context of this scene is globally available+ * during the execution of the callback.+ *+ * @param callback - The callback to invoke.+ */+ protected execute<T>(callback: () => T): T {+ let result: T;+ startScene(this);+ startPlayback(this.playback);+ try {+ result = callback();+ } finally {+ endPlayback(this.playback);+ endScene(this);+ }++ return result;+ }}