From d06a4c7b71185ecd39f4aadfd54e7fb707b83fd8 Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Sat, 6 Apr 2024 04:07:21 -0400 Subject: [PATCH] moved some code arround to locations they make sense. --- app/pages/PageEnigma/js/editor.ts | 134 ++++++++++-------------------- 1 file changed, 44 insertions(+), 90 deletions(-) diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 0b8490345d..70044bf758 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -292,7 +292,22 @@ class Editor { window.addEventListener("mousemove", this.onMouseMove.bind(this), false); window.addEventListener("click", this.onMouseClick.bind(this), false); // Base control and debug stuff remove debug in prod. - this._initializeControl(); + if (this.control == undefined) { + return; + } + this.control.addEventListener("change", this.renderScene.bind(this)); + this.control.addEventListener("dragging-changed", (event: any) => { + if (this.orbitControls == undefined) { + return; + } + this.orbitControls.enabled = !event.value; + this.updateSelectedUI(); + // this.update_properties() + }); + this.control.setSize(0.5); // Good default value for visuals. + this.raycaster = new THREE.Raycaster(); + this.mouse = new THREE.Vector2(); + this.activeScene.scene.add(this.control); // Resets canvas size. this.onWindowResize(); // Creates the main update loop. @@ -312,32 +327,11 @@ class Editor { this.onMouseUp.bind(this), false, ); - this.renderer.domElement.addEventListener( - "onContextMenu", - this.onContextMenu.bind(this), - false, - ); // saving state of the scene this.current_scene_media_token = null; this.current_scene_glb_media_token = null; - this.renderer.domElement.addEventListener( - "mousedown", - this.onMouseDown.bind(this), - false, - ); - this.renderer.domElement.addEventListener( - "mouseup", - this.onMouseUp.bind(this), - false, - ); - this.renderer.domElement.addEventListener( - "onContextMenu", - this.onContextMenu.bind(this), - false, - ); - this.cam_obj = this.activeScene.get_object_by_name("::CAM::"); this.dispatchAppUiState({ @@ -365,21 +359,6 @@ class Editor { public async testTestTimelineEvents() { } - public async testStylizeRequest() { - const result = await this.api_manager - .stylizeVideo( - "mu_6wy1570a0c3c0tpkkncf4tsvb5234", - this.art_style, - this.positive_prompt, - this.negative_prompt, - Visibility.Public, - ) - .catch((error) => { - console.log(error); - }); - console.log(result); - } - public async loadScene(scene_media_token: string) { this.dispatchAppUiState({ type: APPUI_ACTION_TYPES.SHOW_EDITOR_LOADER, @@ -453,7 +432,6 @@ class Editor { } } - public async saveScene(name: string) { // remove controls when saving scene. this.removeTransformControls(); @@ -716,6 +694,34 @@ class Editor { this.activeScene.renderMode(this.rendering); } + // Render the scene to the camera, this is called in the update. + renderScene() { + if (this.composer != null && !this.rendering && this.rawRenderer) { + this.composer.render(); + this.rawRenderer.render(this.activeScene.scene, this.render_camera); + } else if (this.renderer && this.render_camera) { + this.renderer.setSize(this.render_width, this.render_height); + this.renderer.render(this.activeScene.scene, this.render_camera); + } else { + console.error("Could not render to canvas no render or composer!"); + } + + if (this.rendering && this.renderer && this.clock) { + this.frames += 1; + this.playback_location++; + const imgData = this.renderer.domElement.toDataURL(); + this.frame_buffer.push(imgData); + this.render_timer += this.clock.getDelta(); + if (this.timeline.is_playing == false) { + this.stopPlayback(); + this.playback_location = 0; + this.rendering = false; + this.switchCameraView(); + this.onWindowResize(); + } + } + } + // Basicly Unity 3D's update loop. async updateLoop(time: number) { if (this.cam_obj == undefined) { @@ -1043,54 +1049,6 @@ class Editor { } } - // Initializes transform x y z changes. - _initializeControl() { - if (this.control == undefined) { - return; - } - this.control.addEventListener("change", this.renderScene.bind(this)); - this.control.addEventListener("dragging-changed", (event: any) => { - if (this.orbitControls == undefined) { - return; - } - this.orbitControls.enabled = !event.value; - this.updateSelectedUI(); - // this.update_properties() - }); - this.control.setSize(0.5); // Good default value for visuals. - this.raycaster = new THREE.Raycaster(); - this.mouse = new THREE.Vector2(); - this.activeScene.scene.add(this.control); - } - - // Render the scene to the camera, this is called in the update. - renderScene() { - if (this.composer != null && !this.rendering && this.rawRenderer) { - this.composer.render(); - this.rawRenderer.render(this.activeScene.scene, this.render_camera); - } else if (this.renderer && this.render_camera) { - this.renderer.setSize(this.render_width, this.render_height); - this.renderer.render(this.activeScene.scene, this.render_camera); - } else { - console.error("Could not render to canvas no render or composer!"); - } - - if (this.rendering && this.renderer && this.clock) { - this.frames += 1; - this.playback_location++; - const imgData = this.renderer.domElement.toDataURL(); - this.frame_buffer.push(imgData); - this.render_timer += this.clock.getDelta(); - if (this.timeline.is_playing == false) { - this.stopPlayback(); - this.playback_location = 0; - this.rendering = false; - this.switchCameraView(); - this.onWindowResize(); - } - } - } - updateSelectedUI() { if (this.selected == undefined) { @@ -1161,10 +1119,6 @@ class Editor { this.render_camera.updateProjectionMatrix(); } - onContextMenu(event: any) { - return false; - } - onMouseDown(event: any) { if (event.button === 1 && this.camera_person_mode) { this.lockControls?.lock();