From 4cb8eeeffd7367fce3aee0c91b79109d3e8e6935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leslie=20Leigh=20=28=E6=9D=8E=E7=9A=84=E5=BA=8F=29?= Date: Sun, 18 Jul 2021 22:54:16 +0800 Subject: [PATCH] Support CCONB asset loading (#8996) * Support CCONB asset loading * Lint * Optimize --- cc.config.json | 1 - cocos/core/asset-manager/config.ts | 13 ++++++ cocos/core/asset-manager/deprecated.ts | 13 +++--- cocos/core/asset-manager/downloader.ts | 4 +- cocos/core/asset-manager/parser.ts | 2 +- cocos/core/asset-manager/url-transformer.ts | 2 +- cocos/core/data/deserialize.ts | 44 +++++++++++++++------ 7 files changed, 55 insertions(+), 24 deletions(-) diff --git a/cc.config.json b/cc.config.json index d87336122d..7f24e10567 100644 --- a/cc.config.json +++ b/cc.config.json @@ -33,7 +33,6 @@ "test": "context.mode === 'BUILD'", "isVirtualModule": false, "overrides": { - "cocos/core/data/deserialize-dynamic.ts": "cocos/core/data/deserialize-dynamic-empty.ts" } }, { diff --git a/cocos/core/asset-manager/config.ts b/cocos/core/asset-manager/config.ts index f25de76c48..af3355aa7e 100644 --- a/cocos/core/asset-manager/config.ts +++ b/cocos/core/asset-manager/config.ts @@ -48,6 +48,7 @@ export interface IConfigOption { redirect: string[]; debug: boolean; types: string[]; + extensionMap: Record; } export interface IAssetInfo { @@ -56,6 +57,7 @@ export interface IAssetInfo { redirect?: string; ver?: string; nativeVer?: string; + extension?: string; } export interface IPackInfo extends IAssetInfo { @@ -178,6 +180,17 @@ export default class Config { this._initPackage(options.packs); this._initVersion(options.versions); this._initRedirect(options.redirect); + for (const ext in options.extensionMap) { + if (!Object.prototype.hasOwnProperty.call(options.extensionMap, ext)) { + continue; + } + options.extensionMap[ext].forEach((uuid) => { + const assetInfo = this.assetInfos.get(uuid); + if (assetInfo) { + assetInfo.extension = ext; + } + }); + } } public getInfoWithPath (path: string, type?: AssetType | null): IAddressableInfo | null { diff --git a/cocos/core/asset-manager/deprecated.ts b/cocos/core/asset-manager/deprecated.ts index b89e752b02..fb8a96701c 100644 --- a/cocos/core/asset-manager/deprecated.ts +++ b/cocos/core/asset-manager/deprecated.ts @@ -302,8 +302,8 @@ export class CCLoader { completeCallback?: LoadCompleteCallback, ) { const { type: _type, onProgress, onComplete } = this._parseLoadResArgs(type as any, - progressCallback as LoadProgressCallback, - completeCallback as LoadCompleteCallback); + progressCallback as LoadProgressCallback, + completeCallback as LoadCompleteCallback); const extname = path.extname(url); if (extname && !resources.getInfoWithPath(url, _type)) { // strip extname @@ -351,8 +351,8 @@ export class CCLoader { completeCallback?: LoadCompleteCallback, ) { const { type: _type, onProgress, onComplete } = this._parseLoadResArgs>(type as any, - progressCallback as LoadProgressCallback, - completeCallback as LoadCompleteCallback); + progressCallback as LoadProgressCallback, + completeCallback as LoadCompleteCallback); urls.forEach((url, i) => { const extname = path.extname(url); if (extname && !resources.getInfoWithPath(url, _type)) { @@ -438,8 +438,8 @@ export class CCLoader { completeCallback?: LoadDirCompleteCallback, ) { const { type: _type, onProgress, onComplete } = this._parseLoadResArgs>(type as any, - progressCallback as LoadProgressCallback, - completeCallback as LoadDirCompleteCallback); + progressCallback as LoadProgressCallback, + completeCallback as LoadDirCompleteCallback); resources.loadDir(url, _type, onProgress, (err, out) => { let urls: string[] = []; if (!err) { @@ -858,6 +858,7 @@ export const AssetLibrary = { nativeBase: options.nativeBase, paths: options.rawAssets.assets, uuids: Object.keys(options.rawAssets.assets), + extensionMap: {}, }); } }, diff --git a/cocos/core/asset-manager/downloader.ts b/cocos/core/asset-manager/downloader.ts index aff04447c4..cdcb7c86f7 100644 --- a/cocos/core/asset-manager/downloader.ts +++ b/cocos/core/asset-manager/downloader.ts @@ -101,13 +101,13 @@ const downloadCCON = (url: string, options: IDownloadParseOptions, onComplete: C }; const downloadCCONB = (url: string, options: IDownloadParseOptions, onComplete: CompleteCallback) => { - downloadArrayBuffer(url, options, (err, json) => { + downloadArrayBuffer(url, options, (err, arrayBuffer: ArrayBuffer) => { if (err) { onComplete(err); return; } try { - const ccon = decodeCCONBinary(json); + const ccon = decodeCCONBinary(new Uint8Array(arrayBuffer)); onComplete(null, ccon); } catch (err) { onComplete(err); diff --git a/cocos/core/asset-manager/parser.ts b/cocos/core/asset-manager/parser.ts index 0ad8e4e85a..91113aa159 100644 --- a/cocos/core/asset-manager/parser.ts +++ b/cocos/core/asset-manager/parser.ts @@ -160,7 +160,7 @@ export class Parser { import: this.parseImport, '.ccon': this.parseImport, - '.ccobn': this.parseImport, + '.cconb': this.parseImport, }; public parseImage (file: HTMLImageElement | Blob, options: IDownloadParseOptions, onComplete: CompleteCallback) { diff --git a/cocos/core/asset-manager/url-transformer.ts b/cocos/core/asset-manager/url-transformer.ts index 68b3ba4bac..ec4e3fb61d 100644 --- a/cocos/core/asset-manager/url-transformer.ts +++ b/cocos/core/asset-manager/url-transformer.ts @@ -75,7 +75,7 @@ export function parse (task: Task) { out.config = config; out.info = info; } - out.ext = item.ext || '.json'; + out.ext = item.ext || info?.extension || '.json'; break; } case '__requestType__': diff --git a/cocos/core/data/deserialize.ts b/cocos/core/data/deserialize.ts index a29338f033..b9107a04fe 100644 --- a/cocos/core/data/deserialize.ts +++ b/cocos/core/data/deserialize.ts @@ -43,6 +43,8 @@ import type { CCON } from './ccon'; import { reportMissingClass as defaultReportMissingClass } from './report-missing-class'; import type { CompiledDeserializeFn } from './deserialize-dynamic'; +const FORCE_COMPILED = false; // TODO: BUILD; + /** ************************************************************************** * BUILT-IN TYPES / CONSTAINTS *************************************************************************** */ @@ -105,30 +107,31 @@ function serializeBuiltinValueTypes (obj: ValueType): IValueTypeData | null { const typeId = BuiltinValueTypes.indexOf(ctor); switch (ctor) { case Vec2: - // @ts-expect-error + // @ts-expect-error Complex typing return [typeId, obj.x, obj.y]; case Vec3: - // @ts-expect-error + // @ts-expect-error Complex typing return [typeId, obj.x, obj.y, obj.z]; case Vec4: case Quat: - // @ts-expect-error + // @ts-expect-error Complex typing return [typeId, obj.x, obj.y, obj.z, obj.w]; case Color: - // @ts-expect-error + // @ts-expect-error Complex typing return [typeId, obj._val]; case Size: - // @ts-expect-error + // @ts-expect-error Complex typing return [typeId, obj.width, obj.height]; case Rect: - // @ts-expect-error + // @ts-expect-error Complex typing return [typeId, obj.x, obj.y, obj.width, obj.height]; - case Mat4: - // @ts-expect-error - const res: IValueTypeData = new Array(1 + 16); + case Mat4: { + // @ts-expect-error Complex typing + const res: IValueTypeData = new Array(1 + 16); res[VALUETYPE_SETTER] = typeId; Mat4.toArray(res, obj as Mat4, 1); return res; + } default: return null; } @@ -262,6 +265,7 @@ export declare namespace deserialize.Internal { } interface DataTypes { + // eslint-disable-next-line @typescript-eslint/ban-types [DataTypeID.SimpleType]: number | string | boolean | null | object; [DataTypeID.InstanceRef]: InstanceBnotReverseIndex; [DataTypeID.Array_InstanceRef]: DataTypes[DataTypeID.InstanceRef][]; @@ -305,7 +309,9 @@ export interface CCClassConstructor extends Ctor { __values__: string[] __deserialize__?: CompiledDeserializeFn; } +// eslint-disable-next-line @typescript-eslint/ban-types type AnyCtor = Ctor; +// eslint-disable-next-line @typescript-eslint/ban-types type AnyCCClass = CCClassConstructor; export declare namespace deserialize.Internal { @@ -428,6 +434,7 @@ const enum Refs { interface IRefs extends Array { // owner // The owner of all the objects in the front is of type object, starting from OFFSET * 3 are of type InstanceIndex + // eslint-disable-next-line @typescript-eslint/ban-types [0]: (object | InstanceIndex), // property name [1]?: StringIndexBnotNumber; @@ -483,6 +490,7 @@ interface IFileData extends Array { // Result area // Asset-dependent objects that are deserialized and parsed into object arrays + // eslint-disable-next-line @typescript-eslint/ban-types [File.DependObjs]: (object|InstanceIndex)[]; // Asset-dependent key name or array index [File.DependKeys]: (StringIndexBnotNumber|string)[]; @@ -552,6 +560,7 @@ export class Details { obj.reset(); }, 5); + // eslint-disable-next-line @typescript-eslint/ban-types public declare assignAssetsBy: Function; /** @@ -559,7 +568,7 @@ export class Details { * @param {Object} data */ init (data?: IFileData) { - if (BUILD || data) { + if (FORCE_COMPILED || data) { this.uuidObjList = data![File.DependObjs]; this.uuidPropList = data![File.DependKeys]; this.uuidList = data![File.DependUuidIndices]; @@ -579,7 +588,7 @@ export class Details { * @method reset */ reset () { - if (BUILD) { + if (FORCE_COMPILED) { this.uuidList = null; this.uuidObjList = null; this.uuidPropList = null; @@ -601,6 +610,7 @@ export class Details { * @param {String} propName * @param {String} uuid */ + // eslint-disable-next-line @typescript-eslint/ban-types push (obj: object, propName: string, uuid: string, type?: string) { this.uuidObjList!.push(obj); this.uuidPropList!.push(propName); @@ -663,6 +673,7 @@ function deserializeCCObject (data: IFileData, objectData: IClassObjectData) { // return null; // } + // eslint-disable-next-line new-cap const obj = new ctor(); const keys = clazz[CLASS_KEYS]; @@ -679,6 +690,7 @@ function deserializeCCObject (data: IFileData, objectData: IClassObjectData) { // parse advanced type for (; i < objectData.length; ++i) { const key = keys[mask[i]]; + // eslint-disable-next-line @typescript-eslint/restrict-plus-operands const type = clazz[mask[i] + classTypeOffset]; const op = ASSIGNMENTS[type]; op(data, obj, key, objectData[i]); @@ -688,6 +700,7 @@ function deserializeCCObject (data: IFileData, objectData: IClassObjectData) { } function deserializeCustomCCObject (data: IFileData, ctor: Ctor, value: ICustomObjectDataContent) { + // eslint-disable-next-line new-cap const obj = new ctor(); if (obj._deserialize) { obj._deserialize(value, data[File.Context]); @@ -789,6 +802,7 @@ function parseArray (data: IFileData, owner: any, key: string, value: IArrayData const ASSIGNMENTS: { [K in keyof DataTypes]?: ParseFunction; +// eslint-disable-next-line @typescript-eslint/ban-types } = new Array(DataTypeID.ARRAY_LENGTH) as {}; ASSIGNMENTS[DataTypeID.SimpleType] = assignSimple; // Only be used in the instances array ASSIGNMENTS[DataTypeID.InstanceRef] = assignInstanceRef; @@ -845,6 +859,7 @@ function parseInstances (data: IFileData): RootInstanceIndex { } } + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return rootIndex; } @@ -884,6 +899,7 @@ function doLookupClass (classFinder, type: string, container: any[], index: numb container[index] = ((c, i, t) => function proxy () { const actualClass = classFinder(t) || getMissingClass(hasCustomFinder, t, reportMissingClass); c[i] = actualClass; + // eslint-disable-next-line @typescript-eslint/no-unsafe-return, new-cap return new actualClass(); })(container, index, type); return; @@ -919,7 +935,7 @@ function cacheMasks (data: IPackedFileData) { const classes = data[File.SharedClasses]; for (let i = 0; i < masks.length; ++i) { const mask = masks[i]; - // @ts-expect-error + // @ts-expect-error Complex typing. mask[MASK_CLASS] = classes[mask[MASK_CLASS]]; } } @@ -993,7 +1009,7 @@ export function deserialize (data: IFileData | string | CCON | any, details: Det details = details || Details.pool.get(); let res; - if (!BUILD && !(PREVIEW && isCompiledJson(data))) { + if (!FORCE_COMPILED && !isCompiledJson(data)) { res = deserializeDynamic(data, details, options); } else { details.init(data); @@ -1112,10 +1128,12 @@ export function hasNativeDep (data: IFileData): boolean { function getDependUuidList (json: IFileData): string[] { const sharedUuids = json[File.SharedUuids]; + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return json[File.DependUuidIndices].map((index) => sharedUuids[index]); } export function parseUuidDependencies (serialized: unknown) { + // eslint-disable-next-line @typescript-eslint/ban-types if (!DEV || isCompiledJson(serialized as object)) { return getDependUuidList(serialized as IFileData); } else {