From da127909081e9214a787d8b8a041960e869ba09e Mon Sep 17 00:00:00 2001 From: ArEnSc <6252325+ArEnSc@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:23:25 -0400 Subject: [PATCH] Feature/expressions fix to (#579) QOL Panel Changes The style name is shown when rendering a movie, missing title due to issues with the API. The progress bar moves to 0 to 40 then 100, but this is still fake. Added Animation Type to the Characters so they would not show expressions unless they had it. ROKO and Storygirl need their metadata updated for this. TEAM TESTING ONLY Will have this metadata. Changed Expression to Facial Expression. Changed Lip Sync to Vocals / Speech Changed Copy to reflect Timeline Track Changes. I removed the Mannequins since they do not work well with the scenes. --- .../comps/GenerateModals/CompletedCard.tsx | 2 +- .../comps/GenerateModals/InProgressCard.tsx | 22 +++++++++--- .../SidePanelTabs/itemTabs/CharactersTab.tsx | 2 ++ .../SidePanelTabs/itemTabs/ExpressionTab.tsx | 27 +++++++++++--- .../comps/SidePanelTabs/tabList.tsx | 2 +- .../PageEnigma/comps/Timeline/Character.tsx | 21 +++++++---- .../Timeline/RowHeaders/GlobalAudioHeader.tsx | 7 ++-- .../Timeline/RowHeaders/LipSyncSubHeader.tsx | 2 +- .../comps/Timeline/RowHeaders/RowHeaders.tsx | 9 +++-- .../PageEnigma/comps/Timeline/TrackClips.tsx | 35 +++++++++++-------- .../datastructures/clips/clip_ui.ts | 5 ++- app/pages/PageEnigma/models/assets.ts | 1 + app/pages/PageEnigma/models/movies.ts | 1 + app/pages/PageEnigma/models/track.ts | 1 + .../signals/characterGroups/addCharacter.ts | 1 + .../characterGroups/loadCharacterData.ts | 1 + app/pages/PageEnigma/signals/media.ts | 34 +++++++++--------- 17 files changed, 115 insertions(+), 58 deletions(-) diff --git a/app/pages/PageEnigma/comps/GenerateModals/CompletedCard.tsx b/app/pages/PageEnigma/comps/GenerateModals/CompletedCard.tsx index f18a55ba31..91a14a6ac9 100644 --- a/app/pages/PageEnigma/comps/GenerateModals/CompletedCard.tsx +++ b/app/pages/PageEnigma/comps/GenerateModals/CompletedCard.tsx @@ -9,7 +9,7 @@ import { useSignals } from "@preact/signals-react/runtime"; import { downloadFile } from "~/pages/PageEnigma/comps/GenerateModals/utils/downloadFile"; import { styleList } from "~/pages/PageEnigma/styleList"; -function getStyleName(typeInput: string) { +export function getStyleName(typeInput: string) { const foundStyle = styleList.find((style) => { return style.type === typeInput; }); diff --git a/app/pages/PageEnigma/comps/GenerateModals/InProgressCard.tsx b/app/pages/PageEnigma/comps/GenerateModals/InProgressCard.tsx index 7b9f7f0d69..1e66d61f4e 100644 --- a/app/pages/PageEnigma/comps/GenerateModals/InProgressCard.tsx +++ b/app/pages/PageEnigma/comps/GenerateModals/InProgressCard.tsx @@ -15,26 +15,34 @@ import { ActiveJob } from "~/pages/PageEnigma/models"; import { Tooltip } from "~/components"; import { JobsApi } from "~/Classes/ApiManager"; import { PollRecentJobs } from "~/hooks/useActiveJobs/utilities"; - +import { getStyleName } from "~/pages/PageEnigma/comps/GenerateModals/CompletedCard"; interface Props { movie: ActiveJob; } function getPercent(status: JobState) { - if (status === JobState.STARTED) { - return 20; - } if ( [ JobState.PENDING, JobState.COMPLETE_FAILURE, JobState.ATTEMPT_FAILED, + JobState.DEAD, ].includes(status) ) { return 0; } - return 100; + if (status === JobState.PENDING) { + return 20; + } + + if (status === JobState.STARTED) { + return 40; + } + + if (status === JobState.COMPLETE_SUCCESS) { + return 100; + } } export function InProgressCard({ movie }: Props) { @@ -56,6 +64,7 @@ export function InProgressCard({ movie }: Props) { response.errorMessage || "Error deleting the file.", ); }, []); + console.log(movie); return (
@@ -74,6 +83,9 @@ export function InProgressCard({ movie }: Props) {
{movie.request.maybe_model_title || "Untitled"}
+
+ {getStyleName(movie.request.maybe_style_name) || "Untitled"} +
{ name: item.maybe_title ?? "Unknown", type: AssetType.CHARACTER, media_type: item.media_type, + maybe_animation_type: item.maybe_animation_type, version: 1, ...(item.cover_image.maybe_cover_image_public_bucket_path ? { @@ -129,6 +130,7 @@ export const CharactersTab = () => { featuredObjectsFetch: FetchStatus.SUCCESS, })); const newCharacters = responseMapping(response.data); + setFeaturedCharacters(newCharacters); return; } diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/ExpressionTab.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/ExpressionTab.tsx index ec9f547b9f..81d9b2d2f9 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/ExpressionTab.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/ExpressionTab.tsx @@ -112,8 +112,7 @@ export const ExpressionTab = () => { return ( <> - - + { @@ -121,7 +120,6 @@ export const ExpressionTab = () => { setCurrentPage(0); }} /> -
+ {/* Video Tutorial: Creating your own expressions} + > + + */}
, }, diff --git a/app/pages/PageEnigma/comps/Timeline/Character.tsx b/app/pages/PageEnigma/comps/Timeline/Character.tsx index 9814778ba5..c61deb86cd 100644 --- a/app/pages/PageEnigma/comps/Timeline/Character.tsx +++ b/app/pages/PageEnigma/comps/Timeline/Character.tsx @@ -83,6 +83,11 @@ export const Character = ({ character }: Props) => { minimized, } = character; + let hasExpression = false; + if (character.maybe_animation_type != null) { + hasExpression = true; + } + if (minimized) { return (
{ updateKeyframe={updateClipPosition} group={ClipGroup.CHARACTER} /> - + {hasExpression && ( + + )} {editorEngine && editorEngine.isObjectLipsync(character.object_uuid) && ( + fill="none" + > - Global Audio + Music - ) + ); } diff --git a/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx b/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx index ac49f8ab51..2221bbe8be 100644 --- a/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx +++ b/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx @@ -15,7 +15,7 @@ export const LipSyncSubHeader = ({ return (
- Lip Sync + Vocal / Speech
); } + return (
{
Position
-
- Expression -
+ {character.maybe_animation_type != null && ( +
+ Facial Expression +
+ )}
); diff --git a/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx b/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx index 7d7cbf81e9..6568d88364 100644 --- a/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx +++ b/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx @@ -21,14 +21,6 @@ interface Props { updateClip: (options: { id: string; length: number; offset: number }) => void; } -const CLIP_TITLES: Record = { - [ClipType.ANIMATION]: "animation", - [ClipType.AUDIO]: "lip sync", - [ClipType.EXPRESSION]: "expression", - [ClipType.TRANSFORM]: "", - [ClipType.FAKE]: "", -}; - function getCanDrop({ dragType, type, @@ -43,16 +35,19 @@ function getCanDrop({ return true; } if (type === ClipType.AUDIO) { - DndAsset.notDropText = "Cannot drag animation onto audio track"; + DndAsset.notDropText = + "Cannot drag character animation onto vocals and speech track"; } if (type === ClipType.EXPRESSION) { - DndAsset.notDropText = "Cannot drag animation onto expression track"; + DndAsset.notDropText = + "Cannot drag character animation onto facial expression track"; } if (group === ClipGroup.GLOBAL_AUDIO) { - DndAsset.notDropText = "Cannot drag animation onto global audio track"; + DndAsset.notDropText = "Cannot drag character animation onto music track"; } if (group === ClipGroup.CAMERA) { - DndAsset.notDropText = "Cannot drag animation onto camera track"; + DndAsset.notDropText = + "Cannot drag character animation onto camera track"; } } if (dragType === AssetType.EXPRESSION) { @@ -76,10 +71,10 @@ function getCanDrop({ DndAsset.notDropText = "Cannot drag audio onto camera track"; } if (type === ClipType.ANIMATION) { - DndAsset.notDropText = "Cannot drag audio onto animation track"; + DndAsset.notDropText = "Cannot drag audio onto character animation track"; } if (type === ClipType.EXPRESSION) { - DndAsset.notDropText = "Cannot drag audio onto expression track"; + DndAsset.notDropText = "Cannot drag audio onto facial expression track"; } } return false; @@ -189,7 +184,17 @@ export const TrackClips = ({ id, clips, updateClip, group, type }: Props) => {
- Drag and drop {CLIP_TITLES[type!] ?? "audio"} clip here + {type === ClipType.TRANSFORM + ? "Drag and Drop TRANSFORM clip here" // This should not show + : type === ClipType.AUDIO + ? "Drag and drop character speech or vocal audio clips here" + : type === ClipType.ANIMATION + ? "Drag and drop character animation clips here" + : type === ClipType.EXPRESSION + ? "Drag and drop facial expression animation clips here" + : type === ClipType.FAKE + ? "Drag and Drop FAKE clip here" // this should not show. + : "Drag and drop uploaded music clips or sound effects from the audio tab here"}
)} diff --git a/app/pages/PageEnigma/datastructures/clips/clip_ui.ts b/app/pages/PageEnigma/datastructures/clips/clip_ui.ts index da4db72ccd..d3ab4ef4b6 100644 --- a/app/pages/PageEnigma/datastructures/clips/clip_ui.ts +++ b/app/pages/PageEnigma/datastructures/clips/clip_ui.ts @@ -7,6 +7,7 @@ export class ClipUI { type: ClipType; group: ClipGroup; name: string; + maybe_animation_type: string; media_id: string; object_uuid: string; object_name: string; @@ -21,6 +22,7 @@ export class ClipUI { type: ClipType, group: ClipGroup, name: string, + maybe_animation_type: string, media_id: string, clip_uuid: string, object_uuid: string, @@ -31,7 +33,7 @@ export class ClipUI { ) { this.version = version; this.group = group; // Only needed for UI - + this.maybe_animation_type = maybe_animation_type; // only characters. : not used by engine. this.clip_uuid = clip_uuid; this.name = name; // UI @@ -55,6 +57,7 @@ export class ClipUI { clip_uuid: this.clip_uuid, object_uuid: this.object_uuid, object_name: this.object_name, + maybe_animation_type: this.maybe_animation_type, media_id: this.media_id, start_offset: this.offset, ending_offset: this.length, diff --git a/app/pages/PageEnigma/models/assets.ts b/app/pages/PageEnigma/models/assets.ts index fe46a93910..e79a285306 100644 --- a/app/pages/PageEnigma/models/assets.ts +++ b/app/pages/PageEnigma/models/assets.ts @@ -3,6 +3,7 @@ import { AssetType } from "~/enums"; export interface MediaItem { version: number; type: AssetType; + maybe_animation_type: string | null; media_type?: string; media_id: string; object_uuid?: string; diff --git a/app/pages/PageEnigma/models/movies.ts b/app/pages/PageEnigma/models/movies.ts index 3db8b6e74a..f3b9d373be 100644 --- a/app/pages/PageEnigma/models/movies.ts +++ b/app/pages/PageEnigma/models/movies.ts @@ -12,6 +12,7 @@ export interface MediaInfo { token: string; media_type: MediaFileType; media_class: MediaFileClass | null; + maybe_animation_type: string | null; maybe_media_subtype: MediaFileSubtype | null; maybe_engine_extension: string | null; maybe_batch_token: string; diff --git a/app/pages/PageEnigma/models/track.ts b/app/pages/PageEnigma/models/track.ts index 2f53166b30..16ba645abb 100644 --- a/app/pages/PageEnigma/models/track.ts +++ b/app/pages/PageEnigma/models/track.ts @@ -34,6 +34,7 @@ export interface CharacterGroup { export interface CharacterTrack { object_uuid: string; media_id: string; + maybe_animation_type: string | null; name: string; muted: boolean; minimized: boolean; diff --git a/app/pages/PageEnigma/signals/characterGroups/addCharacter.ts b/app/pages/PageEnigma/signals/characterGroups/addCharacter.ts index 28bba93c68..5555cdd8b7 100644 --- a/app/pages/PageEnigma/signals/characterGroups/addCharacter.ts +++ b/app/pages/PageEnigma/signals/characterGroups/addCharacter.ts @@ -22,6 +22,7 @@ export function addNewCharacter(data: MediaItem) { object_uuid: data.object_uuid, name: data.name, media_id: data.media_id, + maybe_animation_type: data.maybe_animation_type, muted: false, minimized: false, animationClips: [], diff --git a/app/pages/PageEnigma/signals/characterGroups/loadCharacterData.ts b/app/pages/PageEnigma/signals/characterGroups/loadCharacterData.ts index dfa41e3fe3..91a38f56d2 100644 --- a/app/pages/PageEnigma/signals/characterGroups/loadCharacterData.ts +++ b/app/pages/PageEnigma/signals/characterGroups/loadCharacterData.ts @@ -16,6 +16,7 @@ function getAddCharacter(item: ClipUI) { object_uuid: item.object_uuid, name: item.object_name, media_id: item.media_id, + maybe_animation_type: item.maybe_animation_type, muted: false, minimized: false, animationClips: [], diff --git a/app/pages/PageEnigma/signals/media.ts b/app/pages/PageEnigma/signals/media.ts index ddacf5cc1b..3e584b0eb4 100644 --- a/app/pages/PageEnigma/signals/media.ts +++ b/app/pages/PageEnigma/signals/media.ts @@ -529,23 +529,7 @@ export const cameraItems = signal([ export const characterItems = signal([ { version: 1, - media_id: "m_r7w1tmkx2jg8nznr3hyzj4k6zhfh7d ", - type: AssetType.CHARACTER, - name: "Female Doll", - thumbnail: "/resources/characters/img03.png", - media_type: "glb", - }, - { - version: 1, - media_id: "m_9sqg0evpr23587jnr8z3zsvav1x077 ", - type: AssetType.CHARACTER, - name: "Male Doll", - thumbnail: "/resources/characters/img07.png", - media_type: "glb", - }, - { - version: 1, - media_id: "m_pwtk45wsfr5z2bavmwxh2efnwvh4rr ", + media_id: "m_gff67btr810vg3ng9szj85zskztcgy", type: AssetType.CHARACTER, name: "Story Girl", thumbnail: "/resources/characters/img13.png", @@ -563,6 +547,22 @@ export const characterItems = signal([ // TODO: CHANGE TO THIS FOR DEV MODE: export const devCharacterItems = signal([ + { + version: 1, + media_id: "m_r7w1tmkx2jg8nznr3hyzj4k6zhfh7d ", + type: AssetType.CHARACTER, + name: "Female Doll", + thumbnail: "/resources/characters/img03.png", + media_type: "glb", + }, + { + version: 1, + media_id: "m_9sqg0evpr23587jnr8z3zsvav1x077 ", + type: AssetType.CHARACTER, + name: "Male Doll", + thumbnail: "/resources/characters/img07.png", + media_type: "glb", + }, { version: 1, media_id: "m_fmxy8wjnep1hdaz7qdg4n7y15d2bsp",