From c8d5111b3b41af43f9a7b894e9dab8c39a78aa02 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 3 Jan 2025 17:37:21 +0800 Subject: [PATCH 1/3] [v3.8.6] Optimize code size by defining Constructor explicitly. --- cocos/2d/assembler/label/font-utils.ts | 3 +++ cocos/2d/assets/font.ts | 3 +++ cocos/3d/misc/buffer-blob.ts | 2 ++ cocos/asset/asset-manager/builtin-res-mgr.ts | 2 ++ cocos/asset/asset-manager/bundle.ts | 2 ++ cocos/asset/asset-manager/factory.ts | 3 ++- cocos/asset/assets/scripts.ts | 9 +++++++++ cocos/asset/assets/simple-texture.ts | 4 ++-- cocos/asset/assets/texture-2d.ts | 4 ++-- cocos/asset/assets/texture-base.ts | 4 ++-- cocos/core/data/garbage-collection.ts | 2 ++ cocos/core/event/callbacks-invoker.ts | 6 ++++++ cocos/core/memop/scalable-container.ts | 2 ++ cocos/core/settings.ts | 2 ++ cocos/core/value-types/value-type.ts | 1 + cocos/gfx/base/device.ts | 3 +++ cocos/gfx/device-manager.ts | 3 +++ cocos/render-scene/scene/fog.ts | 1 + cocos/render-scene/scene/submodel.ts | 2 ++ cocos/rendering/pipeline-state-manager.ts | 2 ++ cocos/scene-graph/component-scheduler.ts | 6 +++++- cocos/scene-graph/layers.ts | 1 + cocos/scene-graph/node-activator.ts | 6 +++++- cocos/scene-graph/prefab/prefab-info.ts | 14 ++++++++++++++ cocos/serialization/ccon.ts | 2 ++ 25 files changed, 80 insertions(+), 9 deletions(-) diff --git a/cocos/2d/assembler/label/font-utils.ts b/cocos/2d/assembler/label/font-utils.ts index 1afe602c179..a01ab7b611f 100644 --- a/cocos/2d/assembler/label/font-utils.ts +++ b/cocos/2d/assembler/label/font-utils.ts @@ -45,6 +45,9 @@ export class CanvasPool { } return _canvasPool; } + + private constructor () {} + public pool: ISharedLabelData[] = []; public get (): ISharedLabelData { let data = this.pool.pop(); diff --git a/cocos/2d/assets/font.ts b/cocos/2d/assets/font.ts index 2f7ac8a7bf0..493e06d7169 100644 --- a/cocos/2d/assets/font.ts +++ b/cocos/2d/assets/font.ts @@ -33,6 +33,9 @@ import { cclegacy } from '../../core'; */ @ccclass('cc.Font') export class Font extends Asset { + constructor (name = '') { + super(name); + } } cclegacy.Font = Font; diff --git a/cocos/3d/misc/buffer-blob.ts b/cocos/3d/misc/buffer-blob.ts index d873d3c6eff..927593d10fd 100644 --- a/cocos/3d/misc/buffer-blob.ts +++ b/cocos/3d/misc/buffer-blob.ts @@ -26,6 +26,8 @@ export class BufferBlob { private _arrayBufferOrPaddings: Array = []; private _length = 0; + constructor () {} + public setNextAlignment (align: number): void { if (align !== 0) { const remainder = this._length % align; diff --git a/cocos/asset/asset-manager/builtin-res-mgr.ts b/cocos/asset/asset-manager/builtin-res-mgr.ts index d9d971fbee4..dd3e536a81c 100644 --- a/cocos/asset/asset-manager/builtin-res-mgr.ts +++ b/cocos/asset/asset-manager/builtin-res-mgr.ts @@ -40,6 +40,8 @@ export class BuiltinResMgr { protected _resources: Record = {}; protected _materialsToBeCompiled: Material[] = []; + constructor () {} + // this should be called after renderer initialized public init (): void { const resources = this._resources; diff --git a/cocos/asset/asset-manager/bundle.ts b/cocos/asset/asset-manager/bundle.ts index 0eea6f75b5f..e319fdd2cc8 100644 --- a/cocos/asset/asset-manager/bundle.ts +++ b/cocos/asset/asset-manager/bundle.ts @@ -44,6 +44,8 @@ import type { AssetManager } from './asset-manager'; export default class Bundle { private _config: Config = new Config(); + constructor () {} + /** * For internal use. * @engineInternal diff --git a/cocos/asset/asset-manager/factory.ts b/cocos/asset/asset-manager/factory.ts index 3511ecb5d38..0db1fed2b7b 100644 --- a/cocos/asset/asset-manager/factory.ts +++ b/cocos/asset/asset-manager/factory.ts @@ -136,9 +136,10 @@ export class Factory { bundle: createBundle, default: createAsset, - }; + constructor () {} + public register (type: string | Record, handler?: CreateHandler): void { if (typeof type === 'object') { js.mixin(this._producers, type); diff --git a/cocos/asset/assets/scripts.ts b/cocos/asset/assets/scripts.ts index 6c99c16dd05..e5f40e844b6 100644 --- a/cocos/asset/assets/scripts.ts +++ b/cocos/asset/assets/scripts.ts @@ -33,6 +33,9 @@ import { cclegacy } from '../../core'; */ @ccclass('cc.Script') export class Script extends Asset { + constructor (name = '') { + super(name); + } } cclegacy._Script = Script; @@ -42,6 +45,9 @@ cclegacy._Script = Script; */ @ccclass('cc.JavaScript') export class JavaScript extends Script { + constructor (name = '') { + super(name); + } } cclegacy._JavaScript = JavaScript; @@ -51,5 +57,8 @@ cclegacy._JavaScript = JavaScript; */ @ccclass('cc.TypeScript') export class TypeScript extends Script { + constructor (name = '') { + super(name); + } } cclegacy._TypeScript = TypeScript; diff --git a/cocos/asset/assets/simple-texture.ts b/cocos/asset/assets/simple-texture.ts index 2eb185682b9..d37dbd357f6 100644 --- a/cocos/asset/assets/simple-texture.ts +++ b/cocos/asset/assets/simple-texture.ts @@ -81,8 +81,8 @@ export class SimpleTexture extends TextureBase { */ protected _maxLevel = 1000; - constructor () { - super(); + constructor (name = '') { + super(name); } /** diff --git a/cocos/asset/assets/texture-2d.ts b/cocos/asset/assets/texture-2d.ts index 6454b04a599..9f6e20fc259 100644 --- a/cocos/asset/assets/texture-2d.ts +++ b/cocos/asset/assets/texture-2d.ts @@ -83,8 +83,8 @@ export interface ITexture2DCreateInfo { */ @ccclass('cc.Texture2D') export class Texture2D extends SimpleTexture { - constructor () { - super(); + constructor (name = '') { + super(name); } /** diff --git a/cocos/asset/assets/texture-base.ts b/cocos/asset/assets/texture-base.ts index e8c31074624..94a379077ba 100644 --- a/cocos/asset/assets/texture-base.ts +++ b/cocos/asset/assets/texture-base.ts @@ -147,8 +147,8 @@ export class TextureBase extends Asset { private _textureHash = 0; - constructor () { - super(); + constructor (name = '') { + super(name); // Id for generate hash in material this._id = idGenerator.getNewId(); diff --git a/cocos/core/data/garbage-collection.ts b/cocos/core/data/garbage-collection.ts index 5447cb48e2e..bf57163accc 100644 --- a/cocos/core/data/garbage-collection.ts +++ b/cocos/core/data/garbage-collection.ts @@ -34,6 +34,8 @@ class GarbageCollectionManager { private _finalizationRegistry: FinalizationRegistry | null = EDITOR && typeof FinalizationRegistry !== 'undefined' ? new FinalizationRegistry(this.finalizationRegistryCallback.bind(this)) : null; private _gcObjects: WeakMap = new WeakMap(); + constructor () {} + public registerGCObject (gcObject: GCObject): GCObject { if (EDITOR && this._finalizationRegistry) { const token = {}; diff --git a/cocos/core/event/callbacks-invoker.ts b/cocos/core/event/callbacks-invoker.ts index a5f137f734c..549bea0c58a 100644 --- a/cocos/core/event/callbacks-invoker.ts +++ b/cocos/core/event/callbacks-invoker.ts @@ -38,6 +38,8 @@ class CallbackInfo { public target: unknown = undefined; public once = false; + constructor () {} + public set (callback: AnyFunction, target?: unknown, once?: boolean): void { this.callback = callback || empty; this.target = target; @@ -70,6 +72,8 @@ export class CallbackList { public isInvoking = false; public containCanceled = false; + constructor () {} + /** * @zh 从列表中移除与指定目标相同回调函数的事件。 * @en Remove the event listeners with the given callback from the list @@ -186,6 +190,8 @@ export class CallbacksInvoker { public _callbackTable: ICallbackTable = createMap(true); private _offCallback?: () => void; + constructor () {} + /** * @zh 向一个事件名注册一个新的事件监听器,包含回调函数和调用者 * @en Register an event listener to a given event key with callback and target. diff --git a/cocos/core/memop/scalable-container.ts b/cocos/core/memop/scalable-container.ts index 63a8ef89055..fe599905c23 100644 --- a/cocos/core/memop/scalable-container.ts +++ b/cocos/core/memop/scalable-container.ts @@ -51,6 +51,8 @@ class ScalableContainerManager { */ public shrinkTimeSpan = 5; + constructor () {} + /** * @en Add a ScalableContainer. Will add the same ScalableContainer instance once. * @param pool @en The ScalableContainer to add. diff --git a/cocos/core/settings.ts b/cocos/core/settings.ts index c7ec7a431a2..e5e66b53af4 100644 --- a/cocos/core/settings.ts +++ b/cocos/core/settings.ts @@ -61,6 +61,8 @@ export enum SettingsCategory { export class Settings { static Category = SettingsCategory; + constructor () {} + /** * Initialization * @internal diff --git a/cocos/core/value-types/value-type.ts b/cocos/core/value-types/value-type.ts index 15473af19e8..2c43589e896 100644 --- a/cocos/core/value-types/value-type.ts +++ b/cocos/core/value-types/value-type.ts @@ -32,6 +32,7 @@ import { legacyCC } from '../global-exports'; * @zh 所有值类型的基类。 */ export class ValueType { + constructor () {} /** * @en * Clone the current object. The clone result of the object should be equal to the current object, diff --git a/cocos/gfx/base/device.ts b/cocos/gfx/base/device.ts index 8b8eb016d31..4ab491a54b6 100644 --- a/cocos/gfx/base/device.ts +++ b/cocos/gfx/base/device.ts @@ -53,6 +53,9 @@ import { Swapchain } from './swapchain'; * @zh GFX 设备。 */ export abstract class Device { + + constructor () {} + /** * @en Current rendering API. * @zh 当前 GFX 使用的渲染 API。 diff --git a/cocos/gfx/device-manager.ts b/cocos/gfx/device-manager.ts index 5b581a34841..34a85b33b7c 100644 --- a/cocos/gfx/device-manager.ts +++ b/cocos/gfx/device-manager.ts @@ -100,6 +100,9 @@ export class DeviceManager { private _swapchain!: Swapchain; private _renderType: RenderType = RenderType.UNKNOWN; private _deviceInitialized = false; + + constructor () {} + public get gfxDevice (): Device { return this._gfxDevice; } diff --git a/cocos/render-scene/scene/fog.ts b/cocos/render-scene/scene/fog.ts index a0b95e74547..3087e8ef3aa 100644 --- a/cocos/render-scene/scene/fog.ts +++ b/cocos/render-scene/scene/fog.ts @@ -79,6 +79,7 @@ export const FOG_TYPE_NONE = FogType.LAYERED + 1; * @zh 渲染场景中的全局雾效配置 */ export class Fog { + constructor () {} /** * @zh 是否启用全局雾效 * @en Enable global fog diff --git a/cocos/render-scene/scene/submodel.ts b/cocos/render-scene/scene/submodel.ts index ac06ec9bfc4..b6dd9a75742 100644 --- a/cocos/render-scene/scene/submodel.ts +++ b/cocos/render-scene/scene/submodel.ts @@ -66,6 +66,8 @@ export class SubModel { protected _instancedSHIndex = -1; protected _useReflectionProbeType = 0; + constructor () {} + /** * @en * sub model's passes diff --git a/cocos/rendering/pipeline-state-manager.ts b/cocos/rendering/pipeline-state-manager.ts index 4dbb7cd3c3a..ef7a20f99df 100644 --- a/cocos/rendering/pipeline-state-manager.ts +++ b/cocos/rendering/pipeline-state-manager.ts @@ -26,6 +26,8 @@ import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, import { Pass } from '../render-scene/core/pass'; export class PipelineStateManager { + private constructor () {} + private static _PSOHashMap: Map = new Map(); // pass is only needed on TS. diff --git a/cocos/scene-graph/component-scheduler.ts b/cocos/scene-graph/component-scheduler.ts index ad760763e85..52add2eb662 100644 --- a/cocos/scene-graph/component-scheduler.ts +++ b/cocos/scene-graph/component-scheduler.ts @@ -85,7 +85,7 @@ function stableRemoveInactive (iterator, flagToClear): void { } } -type InvokeFunc = (...args: unknown[]) => void; +export type InvokeFunc = (...args: unknown[]) => void; // This class contains some queues used to invoke life-cycle methods by script execution order export class LifeCycleInvoker { @@ -173,6 +173,10 @@ export class OneOffInvoker extends LifeCycleInvoker { // for update: sort every time new component registered, invoke many times class ReusableInvoker extends LifeCycleInvoker { + constructor (invokeFunc: InvokeFunc) { + super(invokeFunc); + } + public add (comp: Component): void { const order = (comp.constructor as typeof Component)._executionOrder; if (order === 0) { diff --git a/cocos/scene-graph/layers.ts b/cocos/scene-graph/layers.ts index 275140ace4d..39060695661 100644 --- a/cocos/scene-graph/layers.ts +++ b/cocos/scene-graph/layers.ts @@ -58,6 +58,7 @@ export interface LayerItem { * Every node can be assigned to multiple layers with different bit masks, you can setup layer with inclusive or exclusive operation. */ export class Layers { + private constructor () {} /** * @en All layers in an Enum * @zh 以 Enum 形式存在的所有层列表 diff --git a/cocos/scene-graph/node-activator.ts b/cocos/scene-graph/node-activator.ts index 7851c4dcc4c..6aa9ed109c4 100644 --- a/cocos/scene-graph/node-activator.ts +++ b/cocos/scene-graph/node-activator.ts @@ -26,7 +26,7 @@ import { EDITOR, DEV, SUPPORT_JIT, DEBUG } from 'internal:constants'; import { CCObject, isValid } from '../core/data/object'; import { array, Pool } from '../core/utils/js'; import { tryCatchFunctor_EDITOR } from '../core/utils/misc'; -import { invokeOnEnable, createInvokeImpl, createInvokeImplJit, OneOffInvoker, LifeCycleInvoker } from './component-scheduler'; +import { invokeOnEnable, createInvokeImpl, createInvokeImplJit, OneOffInvoker, LifeCycleInvoker, InvokeFunc } from './component-scheduler'; import { legacyCC } from '../core/global-exports'; import { assert, errorID, getError } from '../core/platform/debug'; import { NodeEventType } from './node-event'; @@ -44,6 +44,10 @@ const Deactivating = CCObject.Flags.Deactivating; // for __preload: used internally, no sort class UnsortedInvoker extends LifeCycleInvoker { + constructor (invokeFunc: InvokeFunc) { + super(invokeFunc); + } + public add (comp: Component): void { this._zero.array.push(comp); } diff --git a/cocos/scene-graph/prefab/prefab-info.ts b/cocos/scene-graph/prefab/prefab-info.ts index dac885a21aa..5647c1a028c 100644 --- a/cocos/scene-graph/prefab/prefab-info.ts +++ b/cocos/scene-graph/prefab/prefab-info.ts @@ -44,6 +44,7 @@ function compareStringArray (array1: string[] | undefined, array2: string[] | un @ccclass('cc.TargetInfo') export class TargetInfo { + constructor () {} // as the target's fileId in prefab asset,used to find the target when prefab expanded. @serializable @type([CCString]) @@ -51,6 +52,8 @@ export class TargetInfo { } @ccclass('cc.TargetOverrideInfo') export class TargetOverrideInfo { + constructor () {} + @serializable @type(CCObject) public source: Component | Node | null = null; @@ -72,6 +75,8 @@ export class TargetOverrideInfo { @ccclass('cc.CompPrefabInfo') export class CompPrefabInfo { + constructor () {} + // To identify current component in a prefab asset, so only needs to be unique. @serializable @editable @@ -80,6 +85,7 @@ export class CompPrefabInfo { @ccclass('CCPropertyOverrideInfo') export class PropertyOverrideInfo { + constructor () {} @serializable @type(TargetInfo) public targetInfo: TargetInfo | null = null; @@ -100,6 +106,8 @@ export class PropertyOverrideInfo { @ccclass('cc.MountedChildrenInfo') export class MountedChildrenInfo { + constructor () {} + @serializable @type(TargetInfo) public targetInfo: TargetInfo | null = null; @@ -117,6 +125,8 @@ export class MountedChildrenInfo { @ccclass('cc.MountedComponentsInfo') export class MountedComponentsInfo { + constructor () {} + @serializable @type(TargetInfo) public targetInfo: TargetInfo | null = null; @@ -138,6 +148,8 @@ export class MountedComponentsInfo { */ @ccclass('cc.PrefabInstance') export class PrefabInstance { + constructor () {} + // Identify current prefabInstance; @serializable public fileId = ''; @@ -205,6 +217,8 @@ export interface TargetMap { [k: string]: TargetMap | Node | Component } @ccclass('cc.PrefabInfo') export class PrefabInfo { + constructor () {} + // the most top node of this prefab in the scene @serializable @type(Node) diff --git a/cocos/serialization/ccon.ts b/cocos/serialization/ccon.ts index 8d30642bd1e..8c40e1e6ccf 100644 --- a/cocos/serialization/ccon.ts +++ b/cocos/serialization/ccon.ts @@ -217,6 +217,8 @@ export class BufferBuilder { private _viewOrPaddings: (ArrayBufferView | number)[] = []; private _length = 0; + constructor () {} + get byteLength (): number { return this._length; } From b7dcbd652d4b78453ee8d88993dac8c6aba44352 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 3 Jan 2025 18:14:00 +0800 Subject: [PATCH 2/3] Update --- cocos/2d/assets/font.ts | 2 +- cocos/2d/assets/sprite-atlas.ts | 4 ++-- cocos/2d/assets/sprite-frame.ts | 4 ++-- cocos/3d/assets/mesh.ts | 4 ++-- cocos/3d/assets/skeleton.ts | 4 ++-- cocos/animation/animation-clip.ts | 4 ++++ cocos/asset/assets/asset.ts | 2 +- cocos/asset/assets/buffer-asset.ts | 4 ++-- cocos/asset/assets/effect-asset.ts | 4 ++-- cocos/asset/assets/json-asset.ts | 4 ++-- cocos/asset/assets/material.ts | 4 ++-- cocos/asset/assets/scene-asset.ts | 4 ++-- cocos/asset/assets/scripts.ts | 6 +++--- cocos/asset/assets/simple-texture.ts | 2 +- cocos/asset/assets/texture-2d.ts | 2 +- cocos/asset/assets/texture-base.ts | 2 +- cocos/audio/audio-clip.ts | 4 ++-- cocos/particle-2d/particle-asset.ts | 2 +- cocos/rendering/define.ts | 1 + 19 files changed, 34 insertions(+), 29 deletions(-) diff --git a/cocos/2d/assets/font.ts b/cocos/2d/assets/font.ts index 493e06d7169..7766296a212 100644 --- a/cocos/2d/assets/font.ts +++ b/cocos/2d/assets/font.ts @@ -33,7 +33,7 @@ import { cclegacy } from '../../core'; */ @ccclass('cc.Font') export class Font extends Asset { - constructor (name = '') { + constructor (name?: string) { super(name); } } diff --git a/cocos/2d/assets/sprite-atlas.ts b/cocos/2d/assets/sprite-atlas.ts index 50da5bdb556..0cdd2caad42 100644 --- a/cocos/2d/assets/sprite-atlas.ts +++ b/cocos/2d/assets/sprite-atlas.ts @@ -55,8 +55,8 @@ export class SpriteAtlas extends Asset { @editable public spriteFrames: ISpriteFrameList = js.createMap(); - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/2d/assets/sprite-frame.ts b/cocos/2d/assets/sprite-frame.ts index b2a744e1fda..fa048f9dbf1 100644 --- a/cocos/2d/assets/sprite-frame.ts +++ b/cocos/2d/assets/sprite-frame.ts @@ -643,8 +643,8 @@ export class SpriteFrame extends Asset { protected _minPos = v3(); protected _maxPos = v3(); - constructor () { - super(); + constructor (name?: string) { + super(name); if (EDITOR) { // Atlas asset uuid diff --git a/cocos/3d/assets/mesh.ts b/cocos/3d/assets/mesh.ts index 7b63aa9732e..fe80a6a9c69 100644 --- a/cocos/3d/assets/mesh.ts +++ b/cocos/3d/assets/mesh.ts @@ -380,8 +380,8 @@ export class Mesh extends Asset { private _jointBufferIndices: number[] | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/3d/assets/skeleton.ts b/cocos/3d/assets/skeleton.ts index 22f02cc3545..8f7812bf817 100644 --- a/cocos/3d/assets/skeleton.ts +++ b/cocos/3d/assets/skeleton.ts @@ -44,8 +44,8 @@ export class Skeleton extends Asset { private _invBindposes: Mat4[] | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/animation/animation-clip.ts b/cocos/animation/animation-clip.ts index f09feb96017..ccc30680773 100644 --- a/cocos/animation/animation-clip.ts +++ b/cocos/animation/animation-clip.ts @@ -155,6 +155,10 @@ export class AnimationClip extends Asset { @serializable public enableTrsBlending = false; + constructor (name?: string) { + super(name); + } + /** * @zh 动画的周期。 * @en Animation duration. diff --git a/cocos/asset/assets/asset.ts b/cocos/asset/assets/asset.ts index 312f4ee0721..f530a66184e 100644 --- a/cocos/asset/assets/asset.ts +++ b/cocos/asset/assets/asset.ts @@ -187,7 +187,7 @@ export class Asset extends Eventify(CCObject) { return this._file; } - constructor (name = '') { + constructor (name?: string) { super(name); Object.defineProperty(this, '_uuid', { diff --git a/cocos/asset/assets/buffer-asset.ts b/cocos/asset/assets/buffer-asset.ts index 0691978c249..31ac44c1c70 100644 --- a/cocos/asset/assets/buffer-asset.ts +++ b/cocos/asset/assets/buffer-asset.ts @@ -37,8 +37,8 @@ import { Asset } from './asset'; export class BufferAsset extends Asset { private _buffer: ArrayBuffer | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/asset/assets/effect-asset.ts b/cocos/asset/assets/effect-asset.ts index b7caab042b5..e5cbe940ade 100644 --- a/cocos/asset/assets/effect-asset.ts +++ b/cocos/asset/assets/effect-asset.ts @@ -325,8 +325,8 @@ export class EffectAsset extends Asset { @editorOnly public hideInEditor = false; - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/asset/assets/json-asset.ts b/cocos/asset/assets/json-asset.ts index 740eaec323c..bf26280ebce 100644 --- a/cocos/asset/assets/json-asset.ts +++ b/cocos/asset/assets/json-asset.ts @@ -41,8 +41,8 @@ export default class JsonAsset extends Asset { @editable public json: Record | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } } diff --git a/cocos/asset/assets/material.ts b/cocos/asset/assets/material.ts index 8badc7a2279..7b26f4b3f8a 100644 --- a/cocos/asset/assets/material.ts +++ b/cocos/asset/assets/material.ts @@ -139,8 +139,8 @@ export class Material extends Asset { */ protected _hash = 0; - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/asset/assets/scene-asset.ts b/cocos/asset/assets/scene-asset.ts index 8148775dc3f..6f6e7f20d39 100644 --- a/cocos/asset/assets/scene-asset.ts +++ b/cocos/asset/assets/scene-asset.ts @@ -43,8 +43,8 @@ export class SceneAsset extends Asset { @serializable public scene: Scene | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } public initDefault (uuid?: string): void { diff --git a/cocos/asset/assets/scripts.ts b/cocos/asset/assets/scripts.ts index e5f40e844b6..449c1dab58b 100644 --- a/cocos/asset/assets/scripts.ts +++ b/cocos/asset/assets/scripts.ts @@ -33,7 +33,7 @@ import { cclegacy } from '../../core'; */ @ccclass('cc.Script') export class Script extends Asset { - constructor (name = '') { + constructor (name?: string) { super(name); } } @@ -45,7 +45,7 @@ cclegacy._Script = Script; */ @ccclass('cc.JavaScript') export class JavaScript extends Script { - constructor (name = '') { + constructor (name?: string) { super(name); } } @@ -57,7 +57,7 @@ cclegacy._JavaScript = JavaScript; */ @ccclass('cc.TypeScript') export class TypeScript extends Script { - constructor (name = '') { + constructor (name?: string) { super(name); } } diff --git a/cocos/asset/assets/simple-texture.ts b/cocos/asset/assets/simple-texture.ts index d37dbd357f6..34bf0a44b57 100644 --- a/cocos/asset/assets/simple-texture.ts +++ b/cocos/asset/assets/simple-texture.ts @@ -81,7 +81,7 @@ export class SimpleTexture extends TextureBase { */ protected _maxLevel = 1000; - constructor (name = '') { + constructor (name?: string) { super(name); } diff --git a/cocos/asset/assets/texture-2d.ts b/cocos/asset/assets/texture-2d.ts index 9f6e20fc259..7b575417149 100644 --- a/cocos/asset/assets/texture-2d.ts +++ b/cocos/asset/assets/texture-2d.ts @@ -83,7 +83,7 @@ export interface ITexture2DCreateInfo { */ @ccclass('cc.Texture2D') export class Texture2D extends SimpleTexture { - constructor (name = '') { + constructor (name?: string) { super(name); } diff --git a/cocos/asset/assets/texture-base.ts b/cocos/asset/assets/texture-base.ts index 94a379077ba..f3ee301b0d6 100644 --- a/cocos/asset/assets/texture-base.ts +++ b/cocos/asset/assets/texture-base.ts @@ -147,7 +147,7 @@ export class TextureBase extends Asset { private _textureHash = 0; - constructor (name = '') { + constructor (name?: string) { super(name); // Id for generate hash in material diff --git a/cocos/audio/audio-clip.ts b/cocos/audio/audio-clip.ts index 28a6e2733c3..82e87c044ae 100644 --- a/cocos/audio/audio-clip.ts +++ b/cocos/audio/audio-clip.ts @@ -60,8 +60,8 @@ export class AudioClip extends Asset { private _player: AudioPlayer | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } public destroy (): boolean { diff --git a/cocos/particle-2d/particle-asset.ts b/cocos/particle-2d/particle-asset.ts index 9b75d43b85d..ba345761451 100644 --- a/cocos/particle-2d/particle-asset.ts +++ b/cocos/particle-2d/particle-asset.ts @@ -39,7 +39,7 @@ const { ccclass, serializable, editable } = _decorator; export class ParticleAsset extends Asset { @serializable @editable - public spriteFrame: SpriteFrame | null= null; + public spriteFrame: SpriteFrame | null = null; } cclegacy.ParticleAsset = ParticleAsset; diff --git a/cocos/rendering/define.ts b/cocos/rendering/define.ts index 99e28960470..455692869da 100644 --- a/cocos/rendering/define.ts +++ b/cocos/rendering/define.ts @@ -677,6 +677,7 @@ localDescriptorSetLayout.bindings[UBOMorph.BINDING] = UBOMorph.DESCRIPTOR; // UI local uniform UBO export class UBOUILocal { // pre one vec4 + private constructor () {} public static readonly NAME = 'CCUILocal'; public static readonly BINDING = ModelLocalBindings.UBO_UI_LOCAL; public static readonly DESCRIPTOR = new DescriptorSetLayoutBinding(UBOUILocal.BINDING, DescriptorType.DYNAMIC_UNIFORM_BUFFER, 1, ShaderStageFlagBit.VERTEX); From 15b0473ca940fbd116baf26c26e48d9f3b05bac6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 13 Jan 2025 17:17:13 +0800 Subject: [PATCH 3/3] Again. --- cocos/asset/assets/render-texture.ts | 4 ++-- cocos/asset/assets/text-asset.ts | 4 ++-- cocos/asset/assets/texture-cube.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cocos/asset/assets/render-texture.ts b/cocos/asset/assets/render-texture.ts index c1e3dc42004..dc770504102 100644 --- a/cocos/asset/assets/render-texture.ts +++ b/cocos/asset/assets/render-texture.ts @@ -61,8 +61,8 @@ const _windowInfo: IRenderWindowInfo = { @ccclass('cc.RenderTexture') export class RenderTexture extends TextureBase { private _window: RenderWindow | null = null; - constructor () { - super(); + constructor (name?: string) { + super(name); } /** diff --git a/cocos/asset/assets/text-asset.ts b/cocos/asset/assets/text-asset.ts index d6c6fa10e62..654542fc03e 100644 --- a/cocos/asset/assets/text-asset.ts +++ b/cocos/asset/assets/text-asset.ts @@ -45,8 +45,8 @@ export class TextAsset extends Asset { return this.text; } - constructor () { - super(); + constructor (name?: string) { + super(name); } } diff --git a/cocos/asset/assets/texture-cube.ts b/cocos/asset/assets/texture-cube.ts index c7db6870a7f..f1d348ea0ea 100644 --- a/cocos/asset/assets/texture-cube.ts +++ b/cocos/asset/assets/texture-cube.ts @@ -128,8 +128,8 @@ export class TextureCube extends SimpleTexture { @serializable _mipmapMode = MipmapMode.NONE; - constructor () { - super(); + constructor (name?: string) { + super(name); } /**