Skip to content

Animation Retargeting: Fix regression in #17994 #17996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Popov72 merged 2 commits into from
Mar 2, 2026
Merged

Animation Retargeting: Fix regression in #17994 #17996

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b766ac4
Fix regression
Popov72 Feb 28, 2026
78fb168
Fix quaternion usage
Popov72 Feb 28, 2026
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
43 changes: 22 additions & 21 deletions packages/dev/core/src/Animations/animatorAvatar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export interface IRetargetOptions {
mapNodeNames?: Map<string, string>;
}

type TransformNodeNameToNode = Map<string, { node: TransformNode; initialTransformations: { position: Vector3; scaling: Vector3; quaternion: Quaternion } }>;
type TransformNodeNameToNode = Map<string, { node: TransformNode; initialTransformations: { position: Vector3; scaling: Vector3; quaternion?: Quaternion; rotation: Vector3 } }>;

/**
* Represents an animator avatar that manages meshes, skeletons and morph target managers for a hierarchical transform node and mesh structure.
Expand Down Expand Up @@ -158,16 +158,11 @@ export class AnimatorAvatar {
this._collectMesh(rootNode);
}

rootNode
.getChildMeshes(false, (node) => {
const mesh = node as AbstractMesh;
return mesh.getTotalVertices() > 0;
})
.forEach((mesh) => {
rootNode.getChildMeshes(false).forEach((mesh) => {
if (mesh.getTotalVertices() > 0) {
this._collectMesh(mesh);
});

this._computeBoneWorldMatrices();
}
});
}

private _collectMesh(mesh: AbstractMesh) {
Expand Down Expand Up @@ -271,19 +266,20 @@ export class AnimatorAvatar {

lstSourceTransformNodes.add(tn);

if (!tn.rotationQuaternion) {
tn.rotationQuaternion = Quaternion.FromEulerAngles(tn.rotation.x, tn.rotation.y, tn.rotation.z);
tn.rotation.setAll(0);
}

sourceTransformNodeNameToNode.set(mapNodeNames.get(tn.name) ?? tn.name, {
node: tn,
initialTransformations: {
position: tn.position.clone(),
scaling: tn.scaling.clone(),
quaternion: tn.rotationQuaternion.clone(),
quaternion: tn.rotationQuaternion?.clone(),
rotation: tn.rotation.clone(),
},
});

if (!tn.rotationQuaternion) {
tn.rotationQuaternion = Quaternion.FromEulerAngles(tn.rotation.x, tn.rotation.y, tn.rotation.z);
tn.rotation.setAll(0);
}
}
}

Expand Down Expand Up @@ -339,9 +335,9 @@ export class AnimatorAvatar {
Logger.Warn(
`RetargetAnimationGroup - Avatar '${this.name}', AnimationGroup '${animationGroup.name}': "${sourceTransformNodeName}" bone not found in any skeleton of avatar: animation removed.`
);
animationGroup.targetedAnimations.splice(i, 1);
i--;
}
animationGroup.targetedAnimations.splice(i, 1);
i--;
break;
}

Expand Down Expand Up @@ -465,6 +461,7 @@ export class AnimatorAvatar {

private _computeBoneWorldMatrices() {
this.skeletons.forEach((skeleton) => {
skeleton.returnToRest();
skeleton.prepare(true);

skeleton.bones.forEach((bone) => {
Expand Down Expand Up @@ -842,9 +839,13 @@ export class AnimatorAvatar {

sourceTransformNodeNameToNode.forEach((data) => {
const { node, initialTransformations } = data;
node.position = initialTransformations.position;
node.scaling = initialTransformations.scaling;
node.rotationQuaternion = initialTransformations.quaternion;
node.position.copyFrom(initialTransformations.position);
node.scaling.copyFrom(initialTransformations.scaling);
if (initialTransformations.quaternion) {
node.rotationQuaternion!.copyFrom(initialTransformations.quaternion);
} else {
node.rotation.copyFrom(initialTransformations.rotation);
}
node.computeWorldMatrix(true);
});
}
Expand Down