From 3e8202550ca47eea4252ca9decf0bf82aff803c3 Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Wed, 10 Apr 2024 19:32:00 -0400 Subject: [PATCH] fixed animation loop & uploading of render. --- app/pages/PageEnigma/js/editor.ts | 5 ++++- app/pages/PageEnigma/js/timeline.ts | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 132d13f346..a1e62fc4cb 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -839,6 +839,9 @@ class Editor { if (this.generating_preview) { return; } + + this.rendering = false; + this.generating_preview = true; const ffmpeg = createFFmpeg({ log: true }); await ffmpeg.load(); @@ -1013,7 +1016,7 @@ class Editor { // This initializes the generation of a video render scene is where the core work happens generateVideo() { - console.log("Generating video..."); + console.log("Generating video...", this.frame_buffer); if (this.rendering || this.generating_preview) { return; } diff --git a/app/pages/PageEnigma/js/timeline.ts b/app/pages/PageEnigma/js/timeline.ts index 31cff75a32..240d60337e 100644 --- a/app/pages/PageEnigma/js/timeline.ts +++ b/app/pages/PageEnigma/js/timeline.ts @@ -538,10 +538,10 @@ export class TimeLine { await this.animation_engine.clips[ object.uuid + element.media_id ].play(object); - let fps = 120; - if (isRendering) { - fps = 60; - } + let fps = 60; + //if (isRendering) { + // fps = 60; + //} this.animation_engine.clips[object.uuid + element.media_id].step( this.scrubber_frame_position / fps, // Double FPS for best result. );