From d4e8acbf312ef34d7a947ab14807987f5b9001df Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Tue, 16 Apr 2024 15:50:35 -0400 Subject: [PATCH 1/3] Fixing mouse mouse and previews --- app/pages/PageEnigma/js/editor.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index e3aac79d54..1ca4035ee0 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -364,6 +364,11 @@ class Editor { this.loadScene(sceneToken); } + document.addEventListener('mouseover', (event) => { + console.log(event.target?.tagName); + }); + + loadingBarData.value = { ...loadingBarData.value, progress: 100, @@ -654,7 +659,7 @@ class Editor { deleteObject(uuid: string) { const obj = this.activeScene.get_object_by_uuid(uuid); - if(obj?.name === "::CAM::") { return; } + if (obj?.name === "::CAM::") { return; } if (obj) { this.activeScene.scene.remove(obj); } @@ -734,7 +739,7 @@ class Editor { } getselectedSum() { - if(this.selected === undefined) { return 0; } + if (this.selected === undefined) { return 0; } let posCombo = this.selected.position.x + this.selected.position.y + this.selected.position.z; let rotCombo = this.selected.rotation.x + this.selected.rotation.y + this.selected.rotation.z; let sclCombo = this.selected.scale.x + this.selected.scale.y + this.selected.scale.z; @@ -797,7 +802,7 @@ class Editor { if (changeView) { this.switchCameraView(); } - } + } else if (this.last_scrub === this.timeline.scrubber_frame_position && this.getselectedSum() !== this.last_selected_sum) { this.updateSelectedUI(); } @@ -1041,8 +1046,8 @@ class Editor { async generateFrame() { if (this.renderer && !this.generating_preview) { - this.removeTransformControls(); this.generating_preview = true; + this.removeTransformControls(); this.activeScene.renderMode(true); if (this.activeScene.hot_items) { this.activeScene.hot_items.forEach((element) => { @@ -1108,7 +1113,7 @@ class Editor { // This initializes the generation of a video render scene is where the core work happens generateVideo() { console.log("Generating video...", this.frame_buffer); - if (this.rendering) { + if (this.rendering || this.generating_preview) { return; } From a01d725b2ac40f083b8cf196760377f63bd617c3 Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Tue, 16 Apr 2024 15:51:47 -0400 Subject: [PATCH 2/3] basic check. --- app/pages/PageEnigma/js/editor.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 1ca4035ee0..a95b5d1e25 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -365,7 +365,8 @@ class Editor { } document.addEventListener('mouseover', (event) => { - console.log(event.target?.tagName); + if(event.target instanceof HTMLCanvasElement) + console.log(event.target instanceof HTMLCanvasElement); }); From e3db328f4ddee53274d5b7119a16d419b03894ec Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Tue, 16 Apr 2024 16:03:26 -0400 Subject: [PATCH 3/3] Fixed editor focus so when interacting with UI it does not trigger movement in the editor. --- app/pages/PageEnigma/js/editor.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index a95b5d1e25..fd025c2d26 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -365,8 +365,22 @@ class Editor { } document.addEventListener('mouseover', (event) => { - if(event.target instanceof HTMLCanvasElement) - console.log(event.target instanceof HTMLCanvasElement); + if (this.orbitControls && this.cameraViewControls) { + if (event.target instanceof HTMLCanvasElement) { + if (this.camera_person_mode) { + this.orbitControls.enabled = false; + this.cameraViewControls.enabled = true; + } + else { + this.orbitControls.enabled = true; + this.cameraViewControls.enabled = false; + } + } + else { + this.orbitControls.enabled = false; + this.cameraViewControls.enabled = false; + } + } });