From 45ae2999aefc43222685030f3d07f2b984d72407 Mon Sep 17 00:00:00 2001 From: FromTheLOLAshes Date: Mon, 25 Mar 2024 22:21:41 +0700 Subject: [PATCH] Working towards adding icons --- app/contexts/TrackContext/TrackContext.tsx | 4 ++++ app/contexts/TrackContext/TrackProvider.tsx | 9 +++++++-- app/contexts/TrackContext/utils/useUpdateCharacters.ts | 4 ++-- app/pages/PageEnigma/comps/Timeline/Character.tsx | 6 ++++++ app/pages/PageEnigma/comps/Timeline/Objects.tsx | 2 +- app/pages/PageEnigma/comps/Timeline/TrackClip.tsx | 1 - 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/contexts/TrackContext/TrackContext.tsx b/app/contexts/TrackContext/TrackContext.tsx index 1ccddc1f0a..ccdfe7fa81 100644 --- a/app/contexts/TrackContext/TrackContext.tsx +++ b/app/contexts/TrackContext/TrackContext.tsx @@ -38,6 +38,8 @@ export const TrackContext = createContext<{ }) => void; selectClip: (clipId: string) => void; updateCurrentTime: (time: number) => void; + toggleLipSyncMute: (characterId: string) => void; + toggleAudioMute: () => void; }>({ characters: [], camera: null, @@ -53,4 +55,6 @@ export const TrackContext = createContext<{ updateObject: () => {}, selectClip: () => {}, updateCurrentTime: () => {}, + toggleLipSyncMute: () => {}, + toggleAudioMute: () => {}, }); diff --git a/app/contexts/TrackContext/TrackProvider.tsx b/app/contexts/TrackContext/TrackProvider.tsx index fc2eeb806c..d5e83d6df9 100644 --- a/app/contexts/TrackContext/TrackProvider.tsx +++ b/app/contexts/TrackContext/TrackProvider.tsx @@ -10,9 +10,10 @@ interface Props { } export const TrackProvider = ({ children }: Props) => { - const { characters, updateCharacters } = useUpdateCharacters(); + const { characters, updateCharacters, toggleLipSyncMute } = + useUpdateCharacters(); const { camera, updateCamera } = useUpdateCamera(); - const { audio, updateAudio } = useUpdateAudio(); + const { audio, updateAudio, toggleAudioMute } = useUpdateAudio(); const { objects, updateObject } = useUpdateObject(); const [selectedClip, setSelectedClip] = useState(null); const [time, setTime] = useState(0); @@ -41,6 +42,8 @@ export const TrackProvider = ({ children }: Props) => { selectClip, selectedClip, updateCurrentTime, + toggleLipSyncMute, + toggleAudioMute, }; }, [ characters, @@ -55,6 +58,8 @@ export const TrackProvider = ({ children }: Props) => { updateObject, time, updateCurrentTime, + toggleLipSyncMute, + toggleAudioMute, ]); return ( {children} diff --git a/app/contexts/TrackContext/utils/useUpdateCharacters.ts b/app/contexts/TrackContext/utils/useUpdateCharacters.ts index 8f72001303..fd704720f7 100644 --- a/app/contexts/TrackContext/utils/useUpdateCharacters.ts +++ b/app/contexts/TrackContext/utils/useUpdateCharacters.ts @@ -120,7 +120,7 @@ export default function useUpdateCharacters() { [], ); - const toggleAudioMute = useCallback((characterId: string) => { + const toggleLipSyncMute = useCallback((characterId: string) => { setCharacters((oldCharacters) => { return oldCharacters.map((character) => ({ ...character, @@ -133,6 +133,6 @@ export default function useUpdateCharacters() { return { characters, updateCharacters, - toggleAudioMute, + toggleLipSyncMute, }; } diff --git a/app/pages/PageEnigma/comps/Timeline/Character.tsx b/app/pages/PageEnigma/comps/Timeline/Character.tsx index 7fb717a189..af48804527 100644 --- a/app/pages/PageEnigma/comps/Timeline/Character.tsx +++ b/app/pages/PageEnigma/comps/Timeline/Character.tsx @@ -114,6 +114,12 @@ export const Character = ({ characterId }: Props) => { > Lipsync Audio Track + diff --git a/app/pages/PageEnigma/comps/Timeline/Objects.tsx b/app/pages/PageEnigma/comps/Timeline/Objects.tsx index 31c52ec9fd..539639b53b 100644 --- a/app/pages/PageEnigma/comps/Timeline/Objects.tsx +++ b/app/pages/PageEnigma/comps/Timeline/Objects.tsx @@ -8,7 +8,7 @@ export const Objects = () => { return (
Objects
diff --git a/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx b/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx index ee4415aeda..6bf3910f24 100644 --- a/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx +++ b/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx @@ -9,7 +9,6 @@ interface Props { style: "character" | "camera" | "audio" | "objects"; clip: BaseClip; updateClip: (options: { id: string; offset: number; length: number }) => void; - selected?: boolean; } export const TrackClip = ({ clip, min, max, style, updateClip }: Props) => {