fix particle-system deserialization (#12220)

This commit is contained in:
Santy-Wang
2022-07-29 11:54:49 +08:00
committed by GitHub
parent f8fb03e9af
commit f3fbfeb3b1
4 changed files with 92 additions and 10 deletions
+4 -2
View File
@@ -40,6 +40,8 @@ import { PropertyStash, PropertyStashInternalFlag } from './class-stash';
const DELIMETER = attributeUtils.DELIMETER;
const CCCLASS_TAG = '__ctors__'; // Still use this historical name to avoid unsynchronized version issue
export const ENUM_TAG = 'Enum';
export const BITMASK_TAG = 'BitMask';
function pushUnique (array, item) {
if (array.indexOf(item) < 0) {
@@ -444,10 +446,10 @@ function parseAttributes (constructor: Function, attributes: PropertyStash, clas
// }
else if (typeof type === 'object') {
if (Enum.isEnum(type)) {
(attrs || initAttrs())[`${propertyNamePrefix}type`] = 'Enum';
(attrs || initAttrs())[`${propertyNamePrefix}type`] = ENUM_TAG;
attrs![`${propertyNamePrefix}enumList`] = Enum.getList(type);
} else if (BitMask.isBitMask(type)) {
(attrs || initAttrs())[`${propertyNamePrefix}type`] = 'BitMask';
(attrs || initAttrs())[`${propertyNamePrefix}type`] = BITMASK_TAG;
attrs![`${propertyNamePrefix}bitmaskList`] = BitMask.getList(type);
} else if (DEV) {
errorID(3645, className, propertyName, type);
+5 -6
View File
@@ -28,7 +28,7 @@ import { EDITOR, TEST, DEV, DEBUG, JSB, PREVIEW, SUPPORT_JIT } from 'internal:co
import { legacyCC } from '../global-exports';
import * as js from '../utils/js';
import * as misc from '../utils/misc';
import { CCClass } from './class';
import { CCClass, ENUM_TAG, BITMASK_TAG } from './class';
import * as Attr from './utils/attribute';
import MissingScript from '../components/missing-script';
import { Details } from './deserialize';
@@ -145,11 +145,11 @@ function compileDeserializeJIT (self: _Deserializer, klass: CCClassConstructor<u
// function undefined object(null) string boolean number
const defaultValue = CCClass.getDefault(attrs[propName + POSTFIX_DEFAULT]);
const userType = attrs[propName + POSTFIX_TYPE] as AnyFunction | undefined;
const userType = attrs[propName + POSTFIX_TYPE] as AnyFunction | string | undefined;
if (fastMode && (defaultValue !== undefined || userType)) {
let isPrimitiveType;
if (defaultValue === undefined) {
isPrimitiveType = userType instanceof Attr.PrimitiveType;
isPrimitiveType = userType instanceof Attr.PrimitiveType || userType === ENUM_TAG || userType === BITMASK_TAG;
} else {
const defaultType = typeof defaultValue;
isPrimitiveType = defaultType === 'string'
@@ -217,12 +217,11 @@ function compileDeserializeNative (_self: _Deserializer, klass: CCClassConstruct
}
// function undefined object(null) string boolean number
const defaultValue = CCClass.getDefault(attrs[propName + POSTFIX_DEFAULT]);
const userType = attrs[propName + POSTFIX_TYPE] as AnyFunction | undefined;
const userType = attrs[propName + POSTFIX_TYPE] as AnyFunction | string | undefined;
let isPrimitiveType = false;
if (fastMode && (defaultValue !== undefined || userType)) {
const userType = attrs[propName + POSTFIX_TYPE];
if (defaultValue === undefined) {
isPrimitiveType = userType instanceof Attr.PrimitiveType;
isPrimitiveType = userType instanceof Attr.PrimitiveType || userType === ENUM_TAG || userType === BITMASK_TAG;
} else {
const defaultType = typeof defaultValue;
isPrimitiveType = defaultType === 'string'
@@ -35,6 +35,7 @@ ccenum(TextureUsageBit);
ccenum(StoreOp);
ccenum(LoadOp);
ccenum(AccessFlagBit);
ccenum(Format);
/**
* @en The tag of the render flow, including SCENE, POSTPROCESS and UI.
+82 -2
View File
@@ -1,7 +1,8 @@
import { CCClass, ccenum } from '../../cocos/core';
import { property } from '../../cocos/core/data/class-decorator';
import { ccclass } from '../../cocos/core/data/decorators';
import { ccclass, type } from '../../cocos/core/data/decorators';
import { deserialize } from '../../cocos/core/data/deserialize';
import { BitMask, ccbitmask } from '../../cocos/core/value-types/bitmask';
describe('Deserialize', () => {
test('Object array element', () => {
@@ -32,4 +33,83 @@ describe('Deserialize', () => {
expect(deserialized.array[1]).toBeInstanceOf(Foo);
expect(deserialized.array[1].name).toBe('foo2');
});
test('Enum and Bitmask deserialize without default value', () => {
enum MyEnum {
EnumOption1,
EnumOption2,
EnumOption3,
}
ccenum(MyEnum);
const MyBitMask = BitMask({
BitMask1: 1,
BitMask2: 1 << 1,
BitMask3: 1 << 2,
BitMask4: 1 << 3,
});
@ccclass('cc.TestDeserialization')
class TestClass {
@type(MyEnum)
enumOption1 = MyEnum.EnumOption1;
@type(MyEnum)
enumOption2 = MyEnum.EnumOption2;
@type(MyEnum)
enumOption3 = MyEnum.EnumOption3;
@type(MyBitMask)
bitmask1 = MyBitMask.BitMask1;
@type(MyBitMask)
bitmask2 = MyBitMask.BitMask1 | MyBitMask.BitMask4;
}
CCClass.Attr.setClassAttr(TestClass, 'enumOption1', 'default', undefined);
CCClass.Attr.setClassAttr(TestClass, 'enumOption2', 'default', undefined);
CCClass.Attr.setClassAttr(TestClass, 'enumOption3', 'default', undefined);
CCClass.Attr.setClassAttr(TestClass, 'bitmask1', 'default', undefined);
CCClass.Attr.setClassAttr(TestClass, 'bitmask2', 'default', undefined);
const dataSnippets = [
{
__type__: 'cc.TestDeserialization',
'enumOption1': MyEnum.EnumOption2,
'enumOption2': MyEnum.EnumOption3,
'bitmask1': MyBitMask.BitMask2 | MyBitMask.BitMask3
},
{
__type__: 'cc.TestDeserialization',
'enumOption2': MyEnum.EnumOption3,
'enumOption3': MyEnum.EnumOption2,
'bitmask2': MyBitMask.BitMask2 | MyBitMask.BitMask3
},
{
__type__: 'cc.TestDeserialization',
'enumOption1': MyEnum.EnumOption3,
'enumOption2': MyEnum.EnumOption2,
'enumOption3': MyEnum.EnumOption1,
'bitmask1': MyBitMask.BitMask2 | MyBitMask.BitMask3 | MyBitMask.BitMask4,
'bitmask2': 0
},
];
const deserialized = deserialize(dataSnippets[0], null) as TestClass;
expect(deserialized.enumOption1).toBe(MyEnum.EnumOption2);
expect(deserialized.enumOption2).toBe(MyEnum.EnumOption3);
expect(deserialized.enumOption3).toBe(MyEnum.EnumOption3);
expect(deserialized.bitmask1).toBe(MyBitMask.BitMask2 | MyBitMask.BitMask3);
expect(deserialized.bitmask2).toBe(MyBitMask.BitMask1 | MyBitMask.BitMask4);
const deserialized1 = deserialize(dataSnippets[1], null) as TestClass;
expect(deserialized1.enumOption1).toBe(MyEnum.EnumOption1);
expect(deserialized1.enumOption2).toBe(MyEnum.EnumOption3);
expect(deserialized1.enumOption3).toBe(MyEnum.EnumOption2);
expect(deserialized1.bitmask1).toBe(MyBitMask.BitMask1);
expect(deserialized1.bitmask2).toBe(MyBitMask.BitMask2 | MyBitMask.BitMask3);
const deserialized2 = deserialize(dataSnippets[2], null) as TestClass;
expect(deserialized2.enumOption1).toBe(MyEnum.EnumOption3);
expect(deserialized2.enumOption2).toBe(MyEnum.EnumOption2);
expect(deserialized2.enumOption3).toBe(MyEnum.EnumOption1);
expect(deserialized2.bitmask1).toBe(MyBitMask.BitMask2 | MyBitMask.BitMask3 | MyBitMask.BitMask4);
expect(deserialized2.bitmask2).toBe(0);
});
});