From f9ae193bf95cbdb63d6b5d5384bacaab82232c50 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 21 Apr 2024 22:48:51 -0400 Subject: [PATCH] pmd + vmd files --- .../src/utils/GetFileTypeByExtension.ts | 4 +++ .../v2/view/pages/dev_upload/DevUpload.tsx | 25 +++++++++++-------- .../OnboardingSelection.tsx | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/packages/components/src/utils/GetFileTypeByExtension.ts b/packages/components/src/utils/GetFileTypeByExtension.ts index 5b596540c2..2f96bbb9ee 100644 --- a/packages/components/src/utils/GetFileTypeByExtension.ts +++ b/packages/components/src/utils/GetFileTypeByExtension.ts @@ -20,6 +20,8 @@ export enum FileType { Gltf = "gltf", Obj = "obj", Ron = "ron", + Pmd = "pmd", + Vmd = "vmd", // Unknown or unsupported Unknown = "unknown", @@ -37,6 +39,8 @@ const FILE_TYPE_MAP : Record = { "png": FileType.Png, "ron": FileType.Ron, "wav": FileType.Wav, + "pmd": FileType.Pmd, + "vmd": FileType.Vmd, } export function GetFileTypeByExtension(filename: string) : FileType { diff --git a/packages/fakeyou.com/src/v2/view/pages/dev_upload/DevUpload.tsx b/packages/fakeyou.com/src/v2/view/pages/dev_upload/DevUpload.tsx index a6729485b8..28e7812cfc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/dev_upload/DevUpload.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/dev_upload/DevUpload.tsx @@ -25,10 +25,10 @@ interface DevUploadProps {} export default function DevUpload(props: DevUploadProps) { const { studioAccessCheck } = useSession(); - const [file, fileSet] = useState(null); - const [maybeMediaFileSubtype, maybeMediaFileSubtypeSet] = useState(undefined); - const [uploadType, uploadTypeSet] = useState(UploadType.Unknown); - const [tokens, tokensSet] = useState([]); + const [file, setFile] = useState(null); + const [maybeMediaFileSubtype, setMaybeMediaFileSubtype] = useState(undefined); + const [uploadType, setUploadType] = useState(UploadType.Unknown); + const [tokens, setTokens] = useState([]); const handleFileChange = (event: any) => { const maybeFile = event.target.files[0]; @@ -43,6 +43,9 @@ export default function DevUpload(props: DevUploadProps) { case FileType.Gltf: case FileType.Obj: case FileType.Ron: + case FileType.Ron: + case FileType.Pmd: + case FileType.Vmd: uploadType = UploadType.EngineAsset; break; case FileType.Jpg: @@ -62,14 +65,14 @@ export default function DevUpload(props: DevUploadProps) { break; } - fileSet(maybeFile); - uploadTypeSet(uploadType); + setFile(maybeFile); + setUploadType(uploadType); }; const handleSubtypeChange = (ev: React.FormEvent) => { const value = (ev.target as HTMLSelectElement).value; const maybeSubtype = value as MediaFileSubtype; - maybeMediaFileSubtypeSet(maybeSubtype); + setMaybeMediaFileSubtype(maybeSubtype); } const handleUpload = () => { @@ -87,8 +90,8 @@ export default function DevUpload(props: DevUploadProps) { }) .then((res: UploadEngineAssetResponse) => { if ("media_file_token" in res) { - tokensSet([res.media_file_token, ...tokens]); - fileSet(null); + setTokens([res.media_file_token, ...tokens]); + setFile(null); } }); break; @@ -100,8 +103,8 @@ export default function DevUpload(props: DevUploadProps) { }) .then((res: UploadMediaResponse) => { if ("media_file_token" in res) { - tokensSet([res.media_file_token, ...tokens]); - fileSet(null); + setTokens([res.media_file_token, ...tokens]); + setFile(null); } }); } diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/OnboardingSelection/OnboardingSelection.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/OnboardingSelection/OnboardingSelection.tsx index 1c5a21b5a1..d449a4cd50 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/OnboardingSelection/OnboardingSelection.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/OnboardingSelection/OnboardingSelection.tsx @@ -32,7 +32,7 @@ export default function OnboardingSelection(props: OnboardingSelectionProps) { const cards = [ { - text: "Inked Dragon", + text: "Ink Dragon", defaultVideo: "https://storage.googleapis.com/vocodes-public/media/n/j/n/a/s/njnasfa5cyvg5kf8vq17pmc5c4gpyj7z/videonjnasfa5cyvg5kf8vq17pmc5c4gpyj7zmp4", hoverVideo: