From f3fbfeb3b18ce6912c8a5cfeafa1a687a4e20837 Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Fri, 29 Jul 2022 11:54:49 +0800 Subject: [PATCH] fix particle-system deserialization (#12220) --- cocos/core/data/class.ts | 6 +- cocos/core/data/deserialize-dynamic.ts | 11 ++- cocos/core/pipeline/pipeline-serialization.ts | 1 + tests/core/deserialize.test.ts | 84 ++++++++++++++++++- 4 files changed, 92 insertions(+), 10 deletions(-) diff --git a/cocos/core/data/class.ts b/cocos/core/data/class.ts index c5a9c32306..2c07599477 100644 --- a/cocos/core/data/class.ts +++ b/cocos/core/data/class.ts @@ -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); diff --git a/cocos/core/data/deserialize-dynamic.ts b/cocos/core/data/deserialize-dynamic.ts index ab54008dee..7eb9f98d5f 100644 --- a/cocos/core/data/deserialize-dynamic.ts +++ b/cocos/core/data/deserialize-dynamic.ts @@ -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 { 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); + }); });