Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Fix loop animation component race condition #8034

Merged
HexaField merged 1 commit into from
May 31, 2023
Merged

Fix loop animation component race condition #8034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/engine/src/avatar/components/LoopAnimationComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
getComponent,
hasComponent,
removeComponent,
setComponent,
useComponent,
useOptionalComponent
} from '../../ecs/functions/ComponentFunctions'
Expand Down Expand Up @@ -52,6 +53,8 @@ export const LoopAnimationComponent = defineComponent({

const modelComponent = useOptionalComponent(entity, ModelComponent)

const animComponent = useOptionalComponent(entity, AnimationComponent)

/**
* Callback functions
*/
Expand Down Expand Up @@ -99,7 +102,7 @@ export const LoopAnimationComponent = defineComponent({

if (changedToAvatarAnimation) {
if (!hasComponent(entity, AvatarAnimationComponent)) {
addComponent(entity, AvatarAnimationComponent, {
setComponent(entity, AvatarAnimationComponent, {
animationGraph: {
states: {},
transitionRules: {},
Expand All @@ -123,7 +126,7 @@ export const LoopAnimationComponent = defineComponent({
}

if (!loopComponent.action?.paused) playAnimationClip(animationComponent, loopComponent)
}, [modelComponent?.scene])
}, [animComponent?.animations])

return null
}
Expand Down
4 changes: 2 additions & 2 deletions packages/engine/src/avatar/functions/avatarFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export const boneMatchAvatarModel = (entity: Entity) => (model: Object3D) => {
if (groupComponent) for (const obj of groupComponent) obj.userData.scale = 0.01
} else if (assetType == AssetType.VRM) {
if (model && (model as UpdateableObject3D).update) {
addComponent(entity, UpdatableComponent, true)
setComponent(entity, UpdatableComponent, true)
setCallback(entity, UpdatableCallback, (delta: number) => {
;(model as UpdateableObject3D).update(delta)
})
Expand All @@ -158,7 +158,7 @@ export const boneMatchAvatarModel = (entity: Entity) => (model: Object3D) => {

export const rigAvatarModel = (entity: Entity) => (model: Object3D) => {
const avatarAnimationComponent = getComponent(entity, AvatarAnimationComponent)
removeComponent(entity, AvatarRigComponent)

const rig = avatarBoneMatching(model)
const rootBone = rig.Root || rig.Hips
rootBone.updateWorldMatrix(true, true)
Expand Down