From 8e56db67ee3d47e7eb913cddb69314831965911c Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Fri, 29 Mar 2024 22:18:54 -0400 Subject: [PATCH] Added single frame render. --- .../ControlsTopButtons/ControlsTopButtons.tsx | 6 +- app/pages/PageEnigma/js/editor.ts | 60 +++++++++++++++---- 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx b/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx index 02a95bc58d..8ff33c03c0 100644 --- a/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx +++ b/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx @@ -99,6 +99,10 @@ export const ControlsTopButtons = () => { const handleButtonLoad = () => {}; + const handleButtonSingleFrame = () => { + editorEngine?.generateFrame(); + }; + return (
@@ -165,7 +169,7 @@ export const ControlsTopButtons = () => {
- + {/* diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 8fa8909de4..6da92302a9 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -821,7 +821,7 @@ class Editor { new_video) } - async stopPlayback() { + async stopPlayback(compile_audio: boolean = true) { this.renderMode(); let ffmpeg = createFFmpeg({ log: true }); await ffmpeg.load(); @@ -855,12 +855,14 @@ class Editor { let itteration = 0; - for (const clip of this.timeline.timeline_items) { - if (clip.type == "lipsync" || clip.type == "audio") { - await this.convertAudioClip(itteration, ffmpeg, clip); - itteration += 1; - } - }; + if (compile_audio) { + for (const clip of this.timeline.timeline_items) { + if (clip.type == "lipsync" || clip.type == "audio") { + await this.convertAudioClip(itteration, ffmpeg, clip); + itteration += 1; + } + }; + } let output = await ffmpeg.FS("readFile", itteration + "tmp.mp4"); // Create a Blob from the output file for downloading @@ -882,6 +884,44 @@ class Editor { } + async generateFrame() { + if (this.renderer) { + this.activeScene.renderMode(true); + if (this.activeScene.hot_items) { + this.activeScene.hot_items.forEach(element => { + element.visible = false; + }); + } + + if (this.render_camera && this.cam_obj) { + this.render_camera.position.copy(this.cam_obj.position); + this.render_camera.rotation.copy(this.cam_obj.rotation); + } + + this.renderer.setSize(this.render_width, this.render_height); + this.renderer.render(this.activeScene.scene, this.render_camera); + let imgData = this.renderer.domElement.toDataURL(); + this.activeScene.renderMode(false); + this.onWindowResize(); + + let ffmpeg = createFFmpeg({ log: false }); + await ffmpeg.load(); + await ffmpeg.FS( + "writeFile", + `render.png`, + await fetchFile(imgData), + ); + await ffmpeg.run('-i', `render.png`, 'render.mp4'); + let output = await ffmpeg.FS("readFile", 'render.mp4'); + const blob = new Blob([output.buffer], { type: "video/mp4" }); + let data = await this.api_manager.uploadMedia(blob, "render.wav"); + + return new Promise((resolve, reject) => { + resolve(data); + }); + } + } + generateVideo() { console.log("Generating video..."); if (this.rendering) { return; } @@ -952,11 +992,11 @@ class Editor { } updateSelectedUI() { - if(this.selected == undefined) { return; } + if (this.selected == undefined) { return; } let pos = this.selected.position; let rot = this.selected.rotation; let scale = this.selected.scale; - + this.dispatchAppUiState({ type: APPUI_ACTION_TYPES.SHOW_CONTROLPANELS_SCENEOBJECT, payload: { @@ -970,7 +1010,7 @@ class Editor { } }); } - + // Automaticly resize scene. onWindowResize() {