diff --git a/app/enums/FileTypes.ts b/app/enums/FileTypes.ts index 048be25b3b..a0fd8e7ce9 100644 --- a/app/enums/FileTypes.ts +++ b/app/enums/FileTypes.ts @@ -1,7 +1,10 @@ -export enum ANIMATION_FILE_TYPE { - GLB = "GLB", +export enum ANIMATION_MMD_FILE_TYPE { VMD = "VMD", } +export enum ANIMATION_MIXAMO_FILE_TYPE { + GLB = "GLB", + FBX = "FBX", +} export enum AUDIO_FILE_TYPE { MP3 = "MP3", @@ -27,7 +30,13 @@ export enum OBJECT_FILE_TYPE { GLB = "GLB", } -export enum CHARACTER_FILE_TYPE { +export enum CHARACTER_MMD_FILE_TYPE { PMD = "PMD", ZIP = "ZIP", } + +export enum CHARACTER_MIXAMO_FILE_TYPE { + FBX = "FBX", + OBJ = "OBJ", + ZIP = "ZIP", +} diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageAnimation.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageAnimation.tsx index 50bf7c417b..210de96aa4 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageAnimation.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageAnimation.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useMemo, useState } from "react"; import { faCirclePlus } from "@fortawesome/pro-solid-svg-icons"; import { - ANIMATION_FILE_TYPE, + ANIMATION_MIXAMO_FILE_TYPE, + ANIMATION_MMD_FILE_TYPE, AssetFilterOption, FeatureFlags, FilterEngineCategories, @@ -289,7 +290,11 @@ export const AnimationTab = ({ onSuccess={fetchUserAnimations} isOpen={open} type={FilterEngineCategories.ANIMATION} - fileTypes={Object.values(ANIMATION_FILE_TYPE)} + fileTypes={Object.values( + animationType === MediaFileAnimationType.Mixamo + ? ANIMATION_MIXAMO_FILE_TYPE + : ANIMATION_MMD_FILE_TYPE, + )} title="Upload Animation" options={{ fileSubtypes: [ diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageCharacters.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageCharacters.tsx index 4eaefca51a..ba0821da2c 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageCharacters.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/tabComps/AnimationCharacterComboTabs/subpageCharacters.tsx @@ -3,7 +3,8 @@ import { useSignals } from "@preact/signals-react/runtime"; import { faCirclePlus } from "@fortawesome/pro-solid-svg-icons"; import { AssetFilterOption, - CHARACTER_FILE_TYPE, + CHARACTER_MIXAMO_FILE_TYPE, + CHARACTER_MMD_FILE_TYPE, FeatureFlags, FilterEngineCategories, MediaFileAnimationType, @@ -308,7 +309,11 @@ export const CharactersTab = ({ // { Rokoko: MediaFileAnimationType.Rokoko }, ], }} - fileTypes={Object.values(CHARACTER_FILE_TYPE)} + fileTypes={Object.values( + animationType === MediaFileAnimationType.Mixamo + ? CHARACTER_MIXAMO_FILE_TYPE + : CHARACTER_MMD_FILE_TYPE, + )} title="Upload Characters" />