Add AnimationMask.joints setter (#10780)

* Add AnimationMask.joints setter

* Update

* Unit test
This commit is contained in:
Leslie Leigh (李的序)
2022-04-18 10:55:55 +08:00
committed by GitHub
parent d2508691e4
commit b4cc1bfcc6
2 changed files with 61 additions and 1 deletions
@@ -7,13 +7,20 @@ import { CLASS_NAME_PREFIX_ANIM } from '../define';
@ccclass(`${CLASS_NAME_PREFIX_ANIM}AnimationMask`)
export class AnimationMask extends Asset {
@serializable
@editable
private _jointMasks: JointMask[] = [];
@editable
get joints (): Iterable<JointMaskInfo> {
return this._jointMasks;
}
set joints (value) {
this.clear();
for (const joint of value) {
this.addJoint(joint.path, joint.enabled);
}
}
/**
* It's undefined behaviour to add same joint path for twice or more.
* @param path
+53
View File
@@ -0,0 +1,53 @@
import { AnimationMask } from '../../cocos/core/animation/marionette/animation-mask';
import 'jest-extended';
test('AnimationMask', () => {
const mask = new AnimationMask();
expect(Array.from(mask.joints)).toStrictEqual([]);
const getSortedJointMaskInfos = () => Array.from(mask.joints)
.sort(({ path: a }, { path: b }) => a.localeCompare(b))
.map((j) => [j.path, j.enabled]);
mask.addJoint('a', true);
mask.addJoint('a/b', true);
mask.addJoint('a/c', false);
mask.addJoint('b', true);
expect(getSortedJointMaskInfos()).toStrictEqual([
['a', true],
['a/b', true],
['a/c', false],
['b', true],
]);
// Remove a leaf
mask.removeJoint('a/b');
expect(getSortedJointMaskInfos()).toStrictEqual([
['a', true],
['a/c', false],
['b', true],
]);
// Remove a non-leaf, the remove is not recursive
mask.removeJoint('a');
expect(getSortedJointMaskInfos()).toStrictEqual([
['a/c', false],
['b', true],
]);
// Sets all joints, this operation will clear all old joint mask infos.
mask.joints = (function*(): Generator<AnimationMask.JointMaskInfo> {
yield { path: 'c', enabled: true };
yield { path: 'd', enabled: true };
yield { path: 'd/a', enabled: false };
})();
expect(getSortedJointMaskInfos()).toStrictEqual([
['c', true],
['d', true],
['d/a', false],
]);
// Clear.
mask.clear();
expect(Array.from(mask.joints)).toHaveLength(0);
});