385 revert $ #17912

dumganhar · 2024-11-25T03:39:02Z

Re: #

Changelog

Continuous Integration

This pull request:

needs automatic test cases check.

Manual trigger with @cocos-robot run test cases afterward.
does not change any runtime related code or build configuration

If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.

Compatibility Check

This pull request:

changes public API, and have ensured backward compatibility with deprecated features.
affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
affects file structure of the build package or build configuration which requires user project upgrade.
introduces breaking changes, please list all changes, affected features and the scope of violation.

…)\$ to \1

minggo · 2024-11-25T03:43:38Z

@cocos-robot run test cases

github-actions · 2024-11-25T03:51:16Z

⚠️ Package size ⤴ 65004 bytes, old: 5376145, new: 5441149

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -7977,10 +7977,10 @@
          */
         export class Sampler extends GFXObject {
             get info(): Readonly<SamplerInfo>;
             get hash(): number;
-            protected _info$: SamplerInfo;
-            protected _hash$: number;
+            protected _info: SamplerInfo;
+            protected _hash: number;
             constructor(info: Readonly<SamplerInfo>, hash: number);
             static computeHash(info: Readonly<SamplerInfo>): number;
             static unpackFromHash(hash: number): SamplerInfo;
         }
@@ -8007,13 +8007,13 @@
          * @zh GFX 描述符集组。
          */
         export abstract class DescriptorSet extends GFXObject {
             get layout(): DescriptorSetLayout;
-            protected _layout$: DescriptorSetLayout | null;
-            protected _buffers$: Buffer[];
-            protected _textures$: Texture[];
-            protected _samplers$: Sampler[];
-            protected _isDirty$: boolean;
+            protected _layout: DescriptorSetLayout | null;
+            protected _buffers: Buffer[];
+            protected _textures: Texture[];
+            protected _samplers: Sampler[];
+            protected _isDirty: boolean;
             constructor();
             abstract initialize(info: Readonly<DescriptorSetInfo>): void;
             abstract destroy(): void;
             abstract update(): void;
@@ -8087,15 +8087,15 @@
              * @zh 缓冲条目数量。
              */
             get count(): number;
             get flags(): BufferFlags;
-            protected _usage$: BufferUsage;
-            protected _memUsage$: MemoryUsage;
-            protected _size$: number;
-            protected _stride$: number;
-            protected _count$: number;
-            protected _flags$: BufferFlags;
-            protected _isBufferView$: boolean;
+            protected _usage: BufferUsage;
+            protected _memUsage: MemoryUsage;
+            protected _size: number;
+            protected _stride: number;
+            protected _count: number;
+            protected _flags: BufferFlags;
+            protected _isBufferView: boolean;
             constructor();
             abstract initialize(info: Readonly<BufferInfo> | Readonly<BufferViewInfo>): void;
             abstract destroy(): void;
             /**
@@ -8141,13 +8141,13 @@
              * @en Number of triangles currently recorded.
              * @zh 绘制三角形数量。
              */
             get numTris(): number;
-            protected _queue$: Queue | null;
-            protected _type$: CommandBufferType;
-            protected _numDrawCalls$: number;
-            protected _numInstances$: number;
-            protected _numTris$: number;
+            protected _queue: Queue | null;
+            protected _type: CommandBufferType;
+            protected _numDrawCalls: number;
+            protected _numInstances: number;
+            protected _numTris: number;
             constructor();
             abstract initialize(info: Readonly<CommandBufferInfo>): void;
             abstract destroy(): void;
             /**
@@ -9426,11 +9426,11 @@
         export class GFXObject extends __private._cocos_core_data_gc_object__GCObject {
             get objectType(): ObjectType;
             get objectID(): number;
             get typedID(): number;
-            protected _objectType$: ObjectType;
-            protected _objectID$: number;
-            protected _typedID$: number;
+            protected _objectType: ObjectType;
+            protected _objectID: number;
+            protected _typedID: number;
             constructor(objectType: ObjectType);
         }
         export interface ISwapchainTextureInfo {
             swapchain: Swapchain;
@@ -9535,26 +9535,26 @@
              * @en Current device binding mappings.
              * @zh 当前设备的绑定槽位映射关系。
              */
             get bindingMappingInfo(): BindingMappingInfo;
-            protected _gfxAPI$: API;
-            protected _renderer$: string;
-            protected _vendor$: string;
-            protected _features$: boolean[];
-            protected _formatFeatures$: FormatFeatureBit[];
-            protected _queue$: Queue | null;
-            protected _cmdBuff$: CommandBuffer | null;
-            protected _numDrawCalls$: number;
-            protected _numInstances$: number;
-            protected _numTris$: number;
-            protected _memoryStatus$: MemoryStatus;
-            protected _caps$: DeviceCaps;
-            protected _bindingMappingInfo$: BindingMappingInfo;
-            protected _samplers$: Map<number, Sampler>;
-            protected _generalBarrierss$: Map<number, GeneralBarrier>;
-            protected _textureBarriers$: Map<number, TextureBarrier>;
-            protected _bufferBarriers$: Map<number, __private._cocos_gfx_base_states_buffer_barrier__BufferBarrier>;
-            protected _swapchainFormat$: Format;
+            protected _gfxAPI: API;
+            protected _renderer: string;
+            protected _vendor: string;
+            protected _features: boolean[];
+            protected _formatFeatures: FormatFeatureBit[];
+            protected _queue: Queue | null;
+            protected _cmdBuff: CommandBuffer | null;
+            protected _numDrawCalls: number;
+            protected _numInstances: number;
+            protected _numTris: number;
+            protected _memoryStatus: MemoryStatus;
+            protected _caps: DeviceCaps;
+            protected _bindingMappingInfo: BindingMappingInfo;
+            protected _samplers: Map<number, Sampler>;
+            protected _generalBarrierss: Map<number, GeneralBarrier>;
+            protected _textureBarriers: Map<number, TextureBarrier>;
+            protected _bufferBarriers: Map<number, __private._cocos_gfx_base_states_buffer_barrier__BufferBarrier>;
+            protected _swapchainFormat: Format;
             static canvas: HTMLCanvasElement;
             abstract initialize(info: Readonly<DeviceInfo>): boolean | Promise<boolean>;
             abstract destroy(): void;
             /**
@@ -9755,11 +9755,11 @@
              */
             get surfaceTransform(): SurfaceTransform;
             get width(): number;
             get height(): number;
-            protected _transform$: SurfaceTransform;
-            protected _colorTexture$: Texture;
-            protected _depthStencilTexture$: Texture;
+            protected _transform: SurfaceTransform;
+            protected _colorTexture: Texture;
+            protected _depthStencilTexture: Texture;
             constructor();
             abstract initialize(info: Readonly<SwapchainInfo>): void;
             abstract resize(width: number, height: number, surfaceTransform: SurfaceTransform): void;
             abstract destroy(): void;
@@ -9786,13 +9786,13 @@
             get depthStencilTexture(): Texture | null;
             get width(): number;
             get height(): number;
             get needRebuild(): boolean;
-            protected _renderPass$: RenderPass | null;
-            protected _colorTextures$: (Texture | null)[];
-            protected _depthStencilTexture$: Texture | null;
-            protected _width$: number;
-            protected _height$: number;
+            protected _renderPass: RenderPass | null;
+            protected _colorTextures: (Texture | null)[];
+            protected _depthStencilTexture: Texture | null;
+            protected _width: number;
+            protected _height: number;
             constructor();
             abstract initialize(info: Readonly<FramebufferInfo>): void;
             abstract destroy(): void;
         }
@@ -9877,22 +9877,22 @@
              * @en get the draw range
              * @zh 获取渲染范围
              */
             get drawInfo(): DrawInfo;
-            protected _attributes$: Attribute[];
-            protected _attributesHash$: number;
-            protected _vertexBuffers$: Buffer[];
-            protected _indexBuffer$: Buffer | null;
-            protected _indirectBuffer$: Buffer | null;
-            protected _drawInfo$: DrawInfo;
+            protected _attributes: Attribute[];
+            protected _attributesHash: number;
+            protected _vertexBuffers: Buffer[];
+            protected _indexBuffer: Buffer | null;
+            protected _indirectBuffer: Buffer | null;
+            protected _drawInfo: DrawInfo;
             constructor();
             /**
              * @en Get the specified vertex buffer.
              * @zh 获取顶点缓冲。
              * @param stream The stream index of the vertex buffer.
              */
             getVertexBuffer(stream?: number): Buffer | null;
-            protected computeAttributesHash$(): number;
+            protected computeAttributesHash(): number;
             abstract initialize(info: Readonly<InputAssemblerInfo>): void;
             abstract destroy(): void;
         }
         /**
@@ -9902,11 +9902,11 @@
         export abstract class DescriptorSetLayout extends GFXObject {
             get bindings(): DescriptorSetLayoutBinding[];
             get bindingIndices(): number[];
             get descriptorIndices(): number[];
-            protected _bindings$: DescriptorSetLayoutBinding[];
-            protected _bindingIndices$: number[];
-            protected _descriptorIndices$: number[];
+            protected _bindings: DescriptorSetLayoutBinding[];
+            protected _bindingIndices: number[];
+            protected _descriptorIndices: number[];
             constructor();
             abstract initialize(info: Readonly<DescriptorSetLayoutInfo>): void;
             abstract destroy(): void;
         }
@@ -9915,9 +9915,9 @@
          * @zh GFX 管线布局。
          */
         export abstract class PipelineLayout extends GFXObject {
             get setLayouts(): DescriptorSetLayout[];
-            protected _setLayouts$: DescriptorSetLayout[];
+            protected _setLayouts: DescriptorSetLayout[];
             constructor();
             abstract initialize(info: Readonly<PipelineLayoutInfo>): void;
             abstract destroy(): void;
         }
@@ -10077,17 +10077,17 @@
              * @en Get current render pass.
              * @zh GFX 渲染过程。
              */
             get renderPass(): RenderPass;
-            protected _shader$: Shader | null;
-            protected _pipelineLayout$: PipelineLayout | null;
-            protected _primitive$: PrimitiveMode;
-            protected _is$: InputState | null;
-            protected _rs$: RasterizerState;
-            protected _dss$: DepthStencilState;
-            protected _bs$: BlendState;
-            protected _dynamicStates$: DynamicStateFlags;
-            protected _renderPass$: RenderPass | null;
+            protected _shader: Shader | null;
+            protected _pipelineLayout: PipelineLayout | null;
+            protected _primitive: PrimitiveMode;
+            protected _is: InputState | null;
+            protected _rs: RasterizerState;
+            protected _dss: DepthStencilState;
+            protected _bs: BlendState;
+            protected _dynamicStates: DynamicStateFlags;
+            protected _renderPass: RenderPass | null;
             constructor();
             abstract initialize(info: Readonly<PipelineStateInfo>): void;
             abstract destroy(): void;
         }
@@ -10100,9 +10100,9 @@
              * @en Get current type.
              * @zh 队列类型。
              */
             get type(): number;
-            protected _type$: QueueType;
+            protected _type: QueueType;
             constructor();
             abstract initialize(info: Readonly<QueueInfo>): void;
             abstract destroy(): void;
             /**
@@ -10117,12 +10117,12 @@
          * @en GFX render pass.
          * @zh GFX 渲染过程。
          */
         export abstract class RenderPass extends GFXObject {
-            protected _colorInfos$: ColorAttachment[];
-            protected _depthStencilInfo$: DepthStencilAttachment | null;
-            protected _subpasses$: SubpassInfo[];
-            protected _hash$: number;
+            protected _colorInfos: ColorAttachment[];
+            protected _depthStencilInfo: DepthStencilAttachment | null;
+            protected _subpasses: SubpassInfo[];
+            protected _hash: number;
             get colorAttachments(): Readonly<ColorAttachment[]>;
             get depthStencilAttachment(): Readonly<DepthStencilAttachment> | null;
             get subPasses(): Readonly<SubpassInfo[]>;
             get hash(): number;
@@ -10140,13 +10140,13 @@
             get attributes(): Attribute[];
             get blocks(): UniformBlock[];
             get samplers(): UniformSampler[];
             get stages(): ShaderStage[];
-            protected _name$: string;
-            protected _stages$: ShaderStage[];
-            protected _attributes$: Attribute[];
-            protected _blocks$: UniformBlock[];
-            protected _samplers$: UniformSampler[];
+            protected _name: string;
+            protected _stages: ShaderStage[];
+            protected _attributes: Attribute[];
+            protected _blocks: UniformBlock[];
+            protected _samplers: UniformSampler[];
             constructor();
             abstract initialize(info: Readonly<ShaderInfo>): void;
             abstract destroy(): void;
         }
@@ -10224,13 +10224,13 @@
              * @en Get texture type.
              * @zh 是否为纹理视图。
              */
             get isTextureView(): boolean;
-            protected _info$: TextureInfo;
-            protected _viewInfo$: TextureViewInfo;
-            protected _isPowerOf2$: boolean;
-            protected _isTextureView$: boolean;
-            protected _size$: number;
+            protected _info: TextureInfo;
+            protected _viewInfo: TextureViewInfo;
+            protected _isPowerOf2: boolean;
+            protected _isTextureView: boolean;
+            protected _size: number;
             constructor();
             abstract initialize(info: Readonly<TextureInfo> | Readonly<TextureViewInfo>): void;
             abstract destroy(): void;
             abstract getTextureHandle(): TextureHandle;
@@ -10249,10 +10249,10 @@
          */
         export class GeneralBarrier extends GFXObject {
             get info(): Readonly<GeneralBarrierInfo>;
             get hash(): number;
-            protected _info$: GeneralBarrierInfo;
-            protected _hash$: number;
+            protected _info: GeneralBarrierInfo;
+            protected _hash: number;
             constructor(info: Readonly<GeneralBarrierInfo>, hash: number);
             static computeHash(info: Readonly<GeneralBarrierInfo>): number;
         }
         /**
@@ -10261,10 +10261,10 @@
          */
         export class TextureBarrier extends GFXObject {
             get info(): Readonly<TextureBarrierInfo>;
             get hash(): number;
-            protected _info$: TextureBarrierInfo;
-            protected _hash$: number;
+            protected _info: TextureBarrierInfo;
+            protected _hash: number;
             constructor(info: Readonly<TextureBarrierInfo>, hash: number);
             static computeHash(info: Readonly<TextureBarrierInfo>): number;
         }
         /**
@@ -44777,9 +44777,9 @@
         get nullTexCube(): __private._cocos_gfx_webgl_webgl_texture__WebGLTexture;
         get textureExclusive(): boolean[];
         get bindingMappings(): __private._cocos_gfx_webgl_webgl_gpu_objects__IWebGLBindingMapping;
         get blitManager(): __private._cocos_gfx_webgl_webgl_gpu_objects__IWebGLBlitManager;
-        protected _textureExclusive$: boolean[];
+        protected _textureExclusive: boolean[];
         initialize(info: Readonly<gfx.DeviceInfo>): boolean;
         destroy(): void;
         flushCommands(cmdBuffs: gfx.CommandBuffer[]): void;
         acquire(swapchains: gfx.Swapchain[]): void;
@@ -44810,15 +44810,15 @@
     export class WebGL2Device extends gfx.Device {
         constructor();
         get gl(): WebGL2RenderingContext;
         get extensions(): __private._cocos_gfx_webgl2_webgl2_define__IWebGL2Extensions;
-        getStateCache$(): __private._cocos_gfx_webgl2_webgl2_state_cache__WebGL2StateCache;
+        getStateCache(): __private._cocos_gfx_webgl2_webgl2_state_cache__WebGL2StateCache;
         get nullTex2D(): __private._cocos_gfx_webgl2_webgl2_texture__WebGL2Texture;
         get nullTexCube(): __private._cocos_gfx_webgl2_webgl2_texture__WebGL2Texture;
         get textureExclusive(): boolean[];
         get bindingMappings(): __private._cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2BindingMapping;
         get blitManager(): __private._cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2BlitManager | null;
-        protected _textureExclusive$: boolean[];
+        protected _textureExclusive: boolean[];
         initialize(info: Readonly<gfx.DeviceInfo>): boolean;
         destroy(): void;
         flushCommands(cmdBuffs: Readonly<gfx.CommandBuffer[]>): void;
         acquire(swapchains: Readonly<gfx.Swapchain[]>): void;
@@ -62695,10 +62695,10 @@
          */
         export class _cocos_gfx_base_states_buffer_barrier__BufferBarrier extends gfx.GFXObject {
             get info(): Readonly<gfx.BufferBarrierInfo>;
             get hash(): number;
-            protected _info$: gfx.BufferBarrierInfo;
-            protected _hash$: number;
+            protected _info: gfx.BufferBarrierInfo;
+            protected _hash: number;
             constructor(info: Readonly<gfx.BufferBarrierInfo>, hash: number);
             static computeHash(info: Readonly<gfx.BufferBarrierInfo>): number;
         }
         export type __types_globals__TypedArrayConstructor = Uint8ArrayConstructor | Uint8ClampedArrayConstructor | Int8ArrayConstructor | Uint16ArrayConstructor | Int16ArrayConstructor | Uint32ArrayConstructor | Int32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor;
@@ -66258,87 +66258,87 @@
             readonly COMPRESSED_RGB_PVRTC_2BPPV1_IMG: GLenum;
             readonly COMPRESSED_RGBA_PVRTC_2BPPV1_IMG: GLenum;
         }
         export interface _cocos_gfx_webgl_webgl_define__IWebGLExtensions {
-            EXT_texture_filter_anisotropic$: EXT_texture_filter_anisotropic | null;
-            EXT_blend_minmax$: EXT_blend_minmax | null;
-            EXT_frag_depth$: EXT_frag_depth | null;
-            EXT_shader_texture_lod$: EXT_shader_texture_lod | null;
-            EXT_sRGB$: EXT_sRGB | null;
-            OES_vertex_array_object$: OES_vertex_array_object | null;
-            EXT_color_buffer_half_float$: __node_modules_typescript_lib_libdom__EXT_color_buffer_half_float | null;
-            WEBGL_multi_draw$: __node_modules_typescript_lib_libdom__WEBGL_multi_draw | null;
-            WEBGL_color_buffer_float$: WEBGL_color_buffer_float | null;
-            WEBGL_compressed_texture_etc1$: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc1 | null;
-            WEBGL_compressed_texture_etc$: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc | null;
-            WEBGL_compressed_texture_pvrtc$: __types_webGLextras__WEBGL_compressed_texture_pvrtc | null;
-            WEBGL_compressed_texture_astc$: WEBGL_compressed_texture_astc | null;
-            WEBGL_compressed_texture_s3tc$: WEBGL_compressed_texture_s3tc | null;
-            WEBGL_compressed_texture_s3tc_srgb$: WEBGL_compressed_texture_s3tc_srgb | null;
-            WEBGL_debug_shaders$: WEBGL_debug_shaders | null;
-            WEBGL_draw_buffers$: WEBGL_draw_buffers | null;
-            WEBGL_lose_context$: WEBGL_lose_context | null;
-            WEBGL_depth_texture$: WEBGL_depth_texture | null;
-            WEBGL_debug_renderer_info$: WEBGL_debug_renderer_info | null;
-            OES_texture_half_float$: OES_texture_half_float | null;
-            OES_texture_half_float_linear$: OES_texture_half_float_linear | null;
-            OES_texture_float$: OES_texture_float | null;
-            OES_texture_float_linear$: OES_texture_float_linear | null;
-            OES_standard_derivatives$: OES_standard_derivatives | null;
-            OES_element_index_uint$: OES_element_index_uint | null;
-            ANGLE_instanced_arrays$: ANGLE_instanced_arrays | null;
-            destroyShadersImmediately$: boolean;
-            noCompressedTexSubImage2D$: boolean;
-            isLocationActive$: (glLoc: unknown) => glLoc is WebGLUniformLocation;
-            useVAO$: boolean;
+            EXT_texture_filter_anisotropic: EXT_texture_filter_anisotropic | null;
+            EXT_blend_minmax: EXT_blend_minmax | null;
+            EXT_frag_depth: EXT_frag_depth | null;
+            EXT_shader_texture_lod: EXT_shader_texture_lod | null;
+            EXT_sRGB: EXT_sRGB | null;
+            OES_vertex_array_object: OES_vertex_array_object | null;
+            EXT_color_buffer_half_float: __node_modules_typescript_lib_libdom__EXT_color_buffer_half_float | null;
+            WEBGL_multi_draw: __node_modules_typescript_lib_libdom__WEBGL_multi_draw | null;
+            WEBGL_color_buffer_float: WEBGL_color_buffer_float | null;
+            WEBGL_compressed_texture_etc1: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc1 | null;
+            WEBGL_compressed_texture_etc: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc | null;
+            WEBGL_compressed_texture_pvrtc: __types_webGLextras__WEBGL_compressed_texture_pvrtc | null;
+            WEBGL_compressed_texture_astc: WEBGL_compressed_texture_astc | null;
+            WEBGL_compressed_texture_s3tc: WEBGL_compressed_texture_s3tc | null;
+            WEBGL_compressed_texture_s3tc_srgb: WEBGL_compressed_texture_s3tc_srgb | null;
+            WEBGL_debug_shaders: WEBGL_debug_shaders | null;
+            WEBGL_draw_buffers: WEBGL_draw_buffers | null;
+            WEBGL_lose_context: WEBGL_lose_context | null;
+            WEBGL_depth_texture: WEBGL_depth_texture | null;
+            WEBGL_debug_renderer_info: WEBGL_debug_renderer_info | null;
+            OES_texture_half_float: OES_texture_half_float | null;
+            OES_texture_half_float_linear: OES_texture_half_float_linear | null;
+            OES_texture_float: OES_texture_float | null;
+            OES_texture_float_linear: OES_texture_float_linear | null;
+            OES_standard_derivatives: OES_standard_derivatives | null;
+            OES_element_index_uint: OES_element_index_uint | null;
+            ANGLE_instanced_arrays: ANGLE_instanced_arrays | null;
+            destroyShadersImmediately: boolean;
+            noCompressedTexSubImage2D: boolean;
+            isLocationActive: (glLoc: unknown) => glLoc is WebGLUniformLocation;
+            useVAO: boolean;
         }
         export interface _cocos_gfx_webgl_webgl_state_cache__IWebGLTexUnit {
-            glTexture$: WebGLTexture | null;
+            glTexture: WebGLTexture | null;
         }
         export class _cocos_gfx_webgl_webgl_state_cache__WebGLStateCache {
-            glArrayBuffer$: WebGLBuffer | null;
-            glElementArrayBuffer$: WebGLBuffer | null;
-            glVAO$: WebGLVertexArrayObjectOES | null;
-            texUnit$: number;
-            glTexUnits$: _cocos_gfx_webgl_webgl_state_cache__IWebGLTexUnit[];
-            glRenderbuffer$: WebGLRenderbuffer | null;
-            glFramebuffer$: WebGLFramebuffer | null;
-            viewport$: gfx.Viewport;
-            scissorRect$: gfx.Rect;
-            rs$: gfx.RasterizerState;
-            dss$: gfx.DepthStencilState;
-            bs$: gfx.BlendState;
-            glProgram$: WebGLProgram | null;
-            glEnabledAttribLocs$: boolean[];
-            glCurrentAttribLocs$: boolean[];
-            texUnitCacheMap$: Record<string, number>;
+            glArrayBuffer: WebGLBuffer | null;
+            glElementArrayBuffer: WebGLBuffer | null;
+            glVAO: WebGLVertexArrayObjectOES | null;
+            texUnit: number;
+            glTexUnits: _cocos_gfx_webgl_webgl_state_cache__IWebGLTexUnit[];
+            glRenderbuffer: WebGLRenderbuffer | null;
+            glFramebuffer: WebGLFramebuffer | null;
+            viewport: gfx.Viewport;
+            scissorRect: gfx.Rect;
+            rs: gfx.RasterizerState;
+            dss: gfx.DepthStencilState;
+            bs: gfx.BlendState;
+            glProgram: WebGLProgram | null;
+            glEnabledAttribLocs: boolean[];
+            glCurrentAttribLocs: boolean[];
+            texUnitCacheMap: Record<string, number>;
             initialize(texUnit: number, vertexAttributes: number): void;
         }
         export interface _cocos_gfx_webgl_webgl_gpu_objects__IWebGLGPUTexture {
-            type$: gfx.TextureType;
-            format$: gfx.Format;
-            usage$: gfx.TextureUsage;
-            width$: number;
-            height$: number;
-            depth$: number;
-            size$: number;
-            arrayLayer$: number;
-            mipLevel$: number;
-            samples$: gfx.SampleCount;
-            flags$: gfx.TextureFlags;
-            isPowerOf2$: boolean;
-            glTarget$: GLenum;
-            glInternalFmt$: GLenum;
-            glFormat$: GLenum;
-            glType$: GLenum;
-            glUsage$: GLenum;
-            glTexture$: WebGLTexture | null;
-            glRenderbuffer$: WebGLRenderbuffer | null;
-            glWrapS$: GLenum;
-            glWrapT$: GLenum;
-            glMinFilter$: GLenum;
-            glMagFilter$: GLenum;
-            isSwapchainTexture$: boolean;
+            type: gfx.TextureType;
+            format: gfx.Format;
+            usage: gfx.TextureUsage;
+            width: number;
+            height: number;
+            depth: number;
+            size: number;
+            arrayLayer: number;
+            mipLevel: number;
+            samples: gfx.SampleCount;
+            flags: gfx.TextureFlags;
+            isPowerOf2: boolean;
+            glTarget: GLenum;
+            glInternalFmt: GLenum;
+            glFormat: GLenum;
+            glType: GLenum;
+            glUsage: GLenum;
+            glTexture: WebGLTexture | null;
+            glRenderbuffer: WebGLRenderbuffer | null;
+            glWrapS: GLenum;
+            glWrapT: GLenum;
+            glMinFilter: GLenum;
+            glMagFilter: GLenum;
+            isSwapchainTexture: boolean;
         }
         export class _cocos_gfx_webgl_webgl_texture__WebGLTexture extends gfx.Texture {
             get gpuTexture(): _cocos_gfx_webgl_webgl_gpu_objects__IWebGLGPUTexture;
             get lodLevel(): number;
@@ -66348,11 +66348,11 @@
             getTextureHandle(): number;
             resize(width: number, height: number): void;
         }
         export interface _cocos_gfx_webgl_webgl_gpu_objects__IWebGLBindingMapping {
-            blockOffsets$: number[];
-            samplerTextureOffsets$: number[];
-            flexibleSet$: number;
+            blockOffsets: number[];
+            samplerTextureOffsets: number[];
+            flexibleSet: number;
         }
         export class _cocos_gfx_webgl_webgl_gpu_objects__IWebGLBlitManager {
             constructor();
             destroy(): void;
@@ -66362,85 +66362,85 @@
         }
         export interface __node_modules_typescript_lib_libdom__EXT_color_buffer_float {
         }
         export interface _cocos_gfx_webgl2_webgl2_define__IWebGL2Extensions {
-            EXT_texture_filter_anisotropic$: EXT_texture_filter_anisotropic | null;
-            EXT_color_buffer_half_float$: __node_modules_typescript_lib_libdom__EXT_color_buffer_half_float | null;
-            EXT_color_buffer_float$: __node_modules_typescript_lib_libdom__EXT_color_buffer_float | null;
-            WEBGL_multi_draw$: __node_modules_typescript_lib_libdom__WEBGL_multi_draw | null;
-            WEBGL_compressed_texture_etc1$: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc1 | null;
-            WEBGL_compressed_texture_etc$: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc | null;
-            WEBGL_compressed_texture_pvrtc$: __types_webGLextras__WEBGL_compressed_texture_pvrtc | null;
-            WEBGL_compressed_texture_astc$: WEBGL_compressed_texture_astc | null;
-            WEBGL_compressed_texture_s3tc$: WEBGL_compressed_texture_s3tc | null;
-            WEBGL_compressed_texture_s3tc_srgb$: WEBGL_compressed_texture_s3tc_srgb | null;
-            WEBGL_debug_shaders$: WEBGL_debug_shaders | null;
-            WEBGL_lose_context$: WEBGL_lose_context | null;
-            WEBGL_debug_renderer_info$: WEBGL_debug_renderer_info | null;
-            OES_texture_half_float_linear$: OES_texture_half_float_linear | null;
-            OES_texture_float_linear$: OES_texture_float_linear | null;
-            useVAO$: boolean;
+            EXT_texture_filter_anisotropic: EXT_texture_filter_anisotropic | null;
+            EXT_color_buffer_half_float: __node_modules_typescript_lib_libdom__EXT_color_buffer_half_float | null;
+            EXT_color_buffer_float: __node_modules_typescript_lib_libdom__EXT_color_buffer_float | null;
+            WEBGL_multi_draw: __node_modules_typescript_lib_libdom__WEBGL_multi_draw | null;
+            WEBGL_compressed_texture_etc1: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc1 | null;
+            WEBGL_compressed_texture_etc: __node_modules_typescript_lib_libdom__WEBGL_compressed_texture_etc | null;
+            WEBGL_compressed_texture_pvrtc: __types_webGLextras__WEBGL_compressed_texture_pvrtc | null;
+            WEBGL_compressed_texture_astc: WEBGL_compressed_texture_astc | null;
+            WEBGL_compressed_texture_s3tc: WEBGL_compressed_texture_s3tc | null;
+            WEBGL_compressed_texture_s3tc_srgb: WEBGL_compressed_texture_s3tc_srgb | null;
+            WEBGL_debug_shaders: WEBGL_debug_shaders | null;
+            WEBGL_lose_context: WEBGL_lose_context | null;
+            WEBGL_debug_renderer_info: WEBGL_debug_renderer_info | null;
+            OES_texture_half_float_linear: OES_texture_half_float_linear | null;
+            OES_texture_float_linear: OES_texture_float_linear | null;
+            useVAO: boolean;
         }
         export interface _cocos_gfx_webgl2_webgl2_state_cache__IWebGL2TexUnit {
-            glTexture$: WebGLTexture | null;
+            glTexture: WebGLTexture | null;
         }
         export class _cocos_gfx_webgl2_webgl2_state_cache__WebGL2StateCache {
-            glArrayBuffer$: WebGLBuffer | null;
-            glElementArrayBuffer$: WebGLBuffer | null;
-            glUniformBuffer$: WebGLBuffer | null;
-            glBindUBOs$: (WebGLBuffer | null)[];
-            glBindUBOOffsets$: number[];
-            glVAO$: WebGLVertexArrayObject | null;
-            texUnit$: number;
-            glTexUnits$: _cocos_gfx_webgl2_webgl2_state_cache__IWebGL2TexUnit[];
-            glSamplerUnits$: (WebGLSampler | null)[];
-            glRenderbuffer$: WebGLRenderbuffer | null;
-            glFramebuffer$: WebGLFramebuffer | null;
-            glReadFramebuffer$: WebGLFramebuffer | null;
-            viewport$: gfx.Viewport;
-            scissorRect$: gfx.Rect;
-            rs$: gfx.RasterizerState;
-            dss$: gfx.DepthStencilState;
-            bs$: gfx.BlendState;
-            glProgram$: WebGLProgram | null;
-            glEnabledAttribLocs$: boolean[];
-            glCurrentAttribLocs$: boolean[];
-            texUnitCacheMap$: Record<string, number>;
+            glArrayBuffer: WebGLBuffer | null;
+            glElementArrayBuffer: WebGLBuffer | null;
+            glUniformBuffer: WebGLBuffer | null;
+            glBindUBOs: (WebGLBuffer | null)[];
+            glBindUBOOffsets: number[];
+            glVAO: WebGLVertexArrayObject | null;
+            texUnit: number;
+            glTexUnits: _cocos_gfx_webgl2_webgl2_state_cache__IWebGL2TexUnit[];
+            glSamplerUnits: (WebGLSampler | null)[];
+            glRenderbuffer: WebGLRenderbuffer | null;
+            glFramebuffer: WebGLFramebuffer | null;
+            glReadFramebuffer: WebGLFramebuffer | null;
+            viewport: gfx.Viewport;
+            scissorRect: gfx.Rect;
+            rs: gfx.RasterizerState;
+            dss: gfx.DepthStencilState;
+            bs: gfx.BlendState;
+            glProgram: WebGLProgram | null;
+            glEnabledAttribLocs: boolean[];
+            glCurrentAttribLocs: boolean[];
+            texUnitCacheMap: Record<string, number>;
             constructor();
             initialize(texUnit: number, bufferBindings: number, vertexAttributes: number): void;
         }
         export interface _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2GPUTexture {
-            type$: gfx.TextureType;
-            format$: gfx.Format;
-            usage$: gfx.TextureUsage;
-            width$: number;
-            height$: number;
-            depth$: number;
-            size$: number;
-            arrayLayer$: number;
-            mipLevel$: number;
-            samples$: gfx.SampleCount;
-            flags$: gfx.TextureFlags;
-            isPowerOf2$: boolean;
-            glTarget$: GLenum;
-            glInternalFmt$: GLenum;
-            glFormat$: GLenum;
-            glType$: GLenum;
-            glUsage$: GLenum;
-            glTexture$: WebGLTexture | null;
-            glRenderbuffer$: WebGLRenderbuffer | null;
-            glWrapS$: GLenum;
-            glWrapT$: GLenum;
-            glMinFilter$: GLenum;
-            glMagFilter$: GLenum;
-            isSwapchainTexture$: boolean;
+            type: gfx.TextureType;
+            format: gfx.Format;
+            usage: gfx.TextureUsage;
+            width: number;
+            height: number;
+            depth: number;
+            size: number;
+            arrayLayer: number;
+            mipLevel: number;
+            samples: gfx.SampleCount;
+            flags: gfx.TextureFlags;
+            isPowerOf2: boolean;
+            glTarget: GLenum;
+            glInternalFmt: GLenum;
+            glFormat: GLenum;
+            glType: GLenum;
+            glUsage: GLenum;
+            glTexture: WebGLTexture | null;
+            glRenderbuffer: WebGLRenderbuffer | null;
+            glWrapS: GLenum;
+            glWrapT: GLenum;
+            glMinFilter: GLenum;
+            glMagFilter: GLenum;
+            isSwapchainTexture: boolean;
         }
         export interface _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2GPUTextureView {
-            gpuTexture$: _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2GPUTexture;
-            type$: gfx.TextureType;
-            format$: gfx.Format;
-            baseLevel$: number;
-            levelCount$: number;
+            gpuTexture: _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2GPUTexture;
+            type: gfx.TextureType;
+            format: gfx.Format;
+            baseLevel: number;
+            levelCount: number;
         }
         export class _cocos_gfx_webgl2_webgl2_texture__WebGL2Texture extends gfx.Texture {
             constructor();
             get gpuTexture(): _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2GPUTexture;
@@ -66450,17 +66450,17 @@
             getTextureHandle(): number;
             resize(width: number, height: number): void;
         }
         export interface _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2BindingMapping {
-            blockOffsets$: number[];
-            samplerTextureOffsets$: number[];
-            flexibleSet$: number;
+            blockOffsets: number[];
+            samplerTextureOffsets: number[];
+            flexibleSet: number;
         }
         export class _cocos_gfx_webgl2_webgl2_gpu_objects__IWebGL2BlitManager {
             get srcFramebuffer(): WebGLFramebuffer | null;
             get dstFramebuffer(): WebGLFramebuffer | null;
             constructor();
-            destroy$(): void;
+            destroy(): void;
         }
         export interface _cocos_gfx_webgpu_webgpu_gpu_objects__IWebGPUBindingMapping {
             blockOffsets: number[];
             samplerTextureOffsets: number[];
@@ -71617,18 +71617,18 @@
          */
         export class _cocos_ui_view__EqualToFrame extends _cocos_ui_view__ContainerStrategy {
             name: string;
             constructor();
-            apply$(_view: any, designedResolution: any): void;
+            apply(_view: any, designedResolution: any): void;
         }
         /**
          * @class ProportionalToFrame
          * @extends ContainerStrategy
          */
         export class _cocos_ui_view__ProportionalToFrame extends _cocos_ui_view__ContainerStrategy {
             name: string;
             constructor();
-            apply$(_view: any, designedResolution: any): void;
+            apply(_view: any, designedResolution: any): void;
         }
         /**
          * ContainerStrategy class is the root strategy class of container's scale strategy,
          * it controls the behavior of how to scale the cc.game.container and cc.game.canvas object
@@ -71648,9 +71648,9 @@
              * @zh 策略应用方法
              * @param view
              * @param designedResolution
              */
-            apply$(_view: View, designedResolution: math.Size): void;
+            apply(_view: View, designedResolution: math.Size): void;
             /**
              * @en
              * Manipulation after applying the strategy
              * @zh 策略调用之后的操作
@@ -71672,29 +71672,29 @@
         }
         export class _cocos_ui_view__ExactFit extends _cocos_ui_view__ContentStrategy {
             name: string;
             constructor();
-            apply$(_view: View, designedResolution: math.Size): _cocos_ui_view__AdaptResult;
+            apply(_view: View, designedResolution: math.Size): _cocos_ui_view__AdaptResult;
         }
         export class _cocos_ui_view__ShowAll extends _cocos_ui_view__ContentStrategy {
             name: string;
             constructor();
-            apply$(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
+            apply(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
         }
         export class _cocos_ui_view__NoBorder extends _cocos_ui_view__ContentStrategy {
             name: string;
             constructor();
-            apply$(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
+            apply(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
         }
         export class _cocos_ui_view__FixedHeight extends _cocos_ui_view__ContentStrategy {
             name: string;
             constructor();
-            apply$(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
+            apply(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
         }
         export class _cocos_ui_view__FixedWidth extends _cocos_ui_view__ContentStrategy {
             name: string;
             constructor();
-            apply$(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
+            apply(_view: any, designedResolution: any): _cocos_ui_view__AdaptResult;
         }
         /**
          * @en
          * Emit when canvas resize.
@@ -71722,27 +71722,27 @@
              * @en Manipulation before applying the strategy
              * @zh 策略应用前的操作
              * @param view - The target view
              */
-            preApply$(_view: View): void;
+            preApply(_view: View): void;
             /**
              * @en Function to apply this strategy
              * The return value is {scale: [scaleX, scaleY], viewport: {new Rect}},
              * The target view can then apply these value to itself, it's preferred not to modify directly its private variables
              * @zh 调用策略方法
              * @return The result scale and viewport rect
              */
-            apply$(_view: View, designedResolution: math.Size): _cocos_ui_view__AdaptResult;
+            apply(_view: View, designedResolution: math.Size): _cocos_ui_view__AdaptResult;
             /**
              * @en Manipulation after applying the strategy
              * @zh 策略调用之后的操作
              * @param view - The target view
              */
-            postApply$(_view: View): void;
+            postApply(_view: View): void;
             /**
              * @deprecated since v3.5.0, this is an engine private interface that will be removed in the future.
              */
-            _buildResult$(containerW: number, containerH: number, contentW: number, contentH: number, scaleX: number, scaleY: number): _cocos_ui_view__AdaptResult;
+            _buildResult(containerW: number, containerH: number, contentW: number, contentH: number, scaleX: number, scaleY: number): _cocos_ui_view__AdaptResult;
         }
         export enum _cocos_video_video_player_enums__VideoPlayerEventType {
             /**
              * @en None.

dumganhar · 2024-11-25T03:53:34Z

@cocos-robot run test cases

github-actions · 2024-11-25T05:42:36Z

@dumganhar, Please check the result of run test cases:

Test Platform: PR-Test
Editor Version: v3.8.5
Task Result: PASS
Task URL: https://cctest.cocos.org/#/reportview/PR-TEST/df23da9b-7202-4851-975c-f6ffda703f7d/-1
GitHub Action: https://github.com/cocos/cocos-engine/actions/runs/12002938558

Task Details

github-actions · 2024-11-25T05:42:37Z

@dumganhar, Please check the result of run test cases:

Test Platform: PR-Test
Editor Version: v3.8.5
Task Result: PASS
Task URL: https://cctest.cocos.org/#/reportview/PR-TEST/afe948b8-c109-4ae9-bfa8-1a81eb62f80c/-1
GitHub Action: https://github.com/cocos/cocos-engine/actions/runs/12002938558

Task Details

dumganhar added 14 commits November 25, 2024 09:54

Remove dollar suffix for private property definition.

ce639fd

(\._[a-z][a-zA-Z0-9]{3,})\$ to \1

0fa805b

(protected _[a-z][a-zA-Z0-9]{3,})\$ and (public _[a-z][a-zA-Z0-9]{3,}…

d3530a5

…)\$ to \1

( _[a-z][a-zA-Z0-9]{3,})\$([^0-9]) to \1\2

90cec3d

Remove $ suffix manually for gfx-webgl backend.

80be17c

(public [a-z][a-zA-Z0-9]{3,})\$ to \1

175ed45

(\.[a-z][a-zA-Z0-9]{3,})\$ to \1

a9f6fbc

More reverts.

58ee9e7

Continue.

607dff8

Continue 2 ...

8969d10

Continue 3.

be21826

Continue 4.

10233d6

Continue 5.

db5df7c

Continue 6.

201b9df

dumganhar requested a review from minggo November 25, 2024 03:39

dumganhar added 2 commits November 25, 2024 11:54

Remove mangle hack.

9a4810d

Continue 7.

e578ab4

minggo approved these changes Nov 25, 2024

View reviewed changes

minggo merged commit 42384e2 into cocos:v3.8.5 Nov 25, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

385 revert $ #17912

385 revert $ #17912

dumganhar commented Nov 25, 2024

minggo commented Nov 25, 2024

github-actions bot commented Nov 25, 2024 •

edited

Loading

dumganhar commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

385 revert $ #17912

385 revert $ #17912

Conversation

dumganhar commented Nov 25, 2024

Changelog

Continuous Integration

Compatibility Check

minggo commented Nov 25, 2024

github-actions bot commented Nov 25, 2024 • edited Loading

⚠️ Package size ⤴ 65004 bytes, old: 5376145, new: 5441149

Interface Check Report

dumganhar commented Nov 25, 2024

github-actions bot commented Nov 25, 2024

Task Details

github-actions bot commented Nov 25, 2024

Task Details

github-actions bot commented Nov 25, 2024 •

edited

Loading