daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-04 01:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from origin

Browse Source
This commit is contained in:
Christopher Oliphant committed 2024-04-24 09:12:44 -04:00
2 parents 077b07b3a9 82e18fca7d
commit 009e25db89
2 files changed
+4 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/pages/PageEnigma/comps/SidePanelTabs/AudioTabComponent/AudioTabComponent.tsx
-1
View File
@@ -7,7 +7,6 @@ import { audioItemsFromServer } from "~/pages/PageEnigma/store/mediaFromServer";
import { ListAudioByUser } from "./utilities";
import { inferenceJobs } from "~/pages/PageEnigma/store/inferenceJobs";
import { JobState } from "~/hooks/useInferenceJobManager/useInferenceJobManager";
import { TabTitle } from "~/pages/PageEnigma/comps/SidePanelTabs/comps/TabTitle";
import { PageLibrary } from "./pageLibrary";
import { PageTTS } from "./pageTTS";
app/pages/PageEnigma/js/editor.ts
+4 -9
View File
@@ -727,9 +727,6 @@ class Editor {
if (obj?.name === "::CAM::") {
return;
}
if (obj?.name === "::CAM::") {
return;
}
if (obj) {
this.activeScene.scene.remove(obj);
}
@@ -888,10 +885,6 @@ class Editor {
if (changeView) {
this.switchCameraView();
}
} else if (
this.last_scrub === this.timeline.scrubber_frame_position &&
this.getselectedSum() !== this.last_selected_sum
) {
} else if (
this.last_scrub === this.timeline.scrubber_frame_position &&
this.getselectedSum() !== this.last_selected_sum
@@ -1105,8 +1098,10 @@ class Editor {
const stylePreview: HTMLVideoElement | null = document.getElementById(
"styled-preview",
) as HTMLVideoElement;
this.rawRenderer.setSize(stylePreview.width, stylePreview.height);
this.render_camera.aspect = stylePreview.width / stylePreview.height;
if (stylePreview != null) {
this.rawRenderer.setSize(stylePreview.width, stylePreview.height);
this.render_camera.aspect = stylePreview.width / stylePreview.height;
}
}
}