Skip to content

Visualize Your Ideas With Code

fix: correctly await re-renders (#918)

Jacob873a9a3eed26
diff --git a/packages/core/src/app/Player.ts b/packages/core/src/app/Player.ts
index 2e577328..caff71a7 100644
--- a/packages/core/src/app/Player.ts
+++ b/packages/core/src/app/Player.ts
@@ -96,6 +96,7 @@ export class Player {
private requestId: number | null = null;
private renderTime = 0;
private requestedSeek = -1;
+ private requestedRender = false;
private requestedRecalculation = true;
private size: Vector2;
private resolutionScale: number;
@@ -241,6 +242,10 @@ export class Player {
this.requestedSeek = 0;
}
+ public requestRender(): void {
+ this.requestedRender = true;
+ }
+
public toggleLoop(value = !this.playerState.current.loop) {
if (value !== this.playerState.current.loop) {
this.playerState.current = {
@@ -347,12 +352,16 @@ export class Player {
this.request();
}
- private async prepare(): Promise<PlayerState & {seek: number}> {
+ private async prepare(): Promise<
+ PlayerState & {seek: number; render: boolean}
+ > {
const state = {
...this.playerState.current,
seek: this.requestedSeek,
+ render: this.requestedRender,
};
this.requestedSeek = -1;
+ this.requestedRender = false;
// Recalculate the project if necessary
if (this.requestedRecalculation) {
@@ -428,7 +437,10 @@ export class Player {
this.audio.isInRange(this.status.time) &&
this.audio.getTime() < this.status.time)
) {
- if (state.paused && previousState !== PlaybackState.Paused) {
+ if (
+ state.render ||
+ (state.paused && previousState !== PlaybackState.Paused)
+ ) {
await this.render.dispatch();
}
diff --git a/packages/ui/src/components/viewport/PreviewStage.tsx b/packages/ui/src/components/viewport/PreviewStage.tsx
index 5e8e3e4c..2c9c9c59 100644
--- a/packages/ui/src/components/viewport/PreviewStage.tsx
+++ b/packages/ui/src/components/viewport/PreviewStage.tsx
@@ -28,8 +28,8 @@ export function PreviewStage(props: JSX.HTMLAttributes<HTMLDivElement>) {
useEffect(() => {
stage.configure({resolutionScale, size, background});
- stage.render(player.playback.currentScene, player.playback.previousScene);
- }, [resolutionScale, size, background]);
+ player.requestRender();
+ }, [resolutionScale, size, background, player]);
return <StageView stage={stage} {...props} />;
}