diff --git a/packages/engine/src/avatar/functions/avatarFunctions.ts b/packages/engine/src/avatar/functions/avatarFunctions.ts index 5c4ba6ca42..160667d9d9 100644 --- a/packages/engine/src/avatar/functions/avatarFunctions.ts +++ b/packages/engine/src/avatar/functions/avatarFunctions.ts @@ -73,10 +73,6 @@ declare module '@pixiv/three-vrm/types/VRM' { } } -export const getPreloaded = () => { - return ['sitting'] -} - /** Checks if the asset is a VRM. If not, attempt to use * Mixamo based naming schemes to autocreate necessary VRM humanoid objects. */ export const autoconvertMixamoAvatar = (model: GLTF | VRM) => { diff --git a/packages/engine/src/avatar/systems/AvatarAnimationSystem.ts b/packages/engine/src/avatar/systems/AvatarAnimationSystem.ts index a7b99b616f..2e0811c229 100644 --- a/packages/engine/src/avatar/systems/AvatarAnimationSystem.ts +++ b/packages/engine/src/avatar/systems/AvatarAnimationSystem.ts @@ -51,11 +51,11 @@ import { AvatarHeadDecapComponent, AvatarIKTargetComponent } from '.././componen import { IKSerialization } from '../IKSerialization' import { updateAnimationGraph } from '../animation/AvatarAnimationGraph' import { solveTwoBoneIK } from '../animation/TwoBoneIKSolver' -import { ikTargets } from '../animation/Util' +import { emoteAnimations, ikTargets } from '../animation/Util' import { getArmIKHint } from '../animation/getArmIKHint' import { AvatarComponent } from '../components/AvatarComponent' import { SkinnedMeshComponent } from '../components/SkinnedMeshComponent' -import { loadLocomotionAnimations } from '../functions/avatarFunctions' +import { loadAnimationArray, loadLocomotionAnimations } from '../functions/avatarFunctions' import { updateVRMRetargeting } from '../functions/updateVRMRetargeting' import { AnimationSystem } from './AnimationSystem' @@ -338,7 +338,10 @@ const execute = () => { const reactor = () => { useEffect(() => { - if (isClient) loadLocomotionAnimations() + if (isClient) { + loadLocomotionAnimations() + loadAnimationArray(Object.values(emoteAnimations), 'emotes') + } const networkState = getMutableState(NetworkState)