V3.6.0 pipeline2

[star-e]

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.

[github-actions]

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -202,15 +202,15 @@
         /**
          * @zh Batcher2D 中内存增量的大小（KB）
          * 这个值决定了当场景中存在的 2d 渲染组件的顶点数量超过当前 batcher2D 中可容纳的顶点数量时，内存扩充的增加量
          * 这个值越大，共用同一个 meshBuffer 的 2d 渲染组件数量会更多，但每次扩充所占用的内存也会更大
-         * 默认值在标准格式（[[VertexFormat.vfmtPosUvColor]]）下可容纳 4096 个顶点（4096*9*4/1024），你可以增加容量来提升每个批次可容纳的元素数量
+         * 默认值在标准格式（[[vfmtPosUvColor]]）下可容纳 4096 个顶点（4096*9*4/1024），你可以增加容量来提升每个批次可容纳的元素数量
          * @en The MeshBuffer chunk size in Batcher2D (KB)
          * This value determines the increase in memory expansion,
          * when the number of vertices of 2d rendering components present in the scene exceeds the number of vertices,
          * that can be accommodated in the current batcher2D.
          * The larger this value is, the more 2d rendering components will share the same meshBuffer, but the more memory will be used for each expansion
-         * The default size can contain 4096 standard vertex ([[VertexFormat.vfmtPosUvColor]]) in one buffer,
+         * The default size can contain 4096 standard vertex ([[vfmtPosUvColor]]) in one buffer,
          * you can user larger buffer size to increase the elements count per 2d draw batch.
          * @default 144 KB
          */
         BATCHER2D_MEM_INCREMENT: number;
@@ -435,10 +435,10 @@
      * @zh 用于初始化 [[SpriteFrame]] 资源的对象接口描述
      */
     export interface ISpriteFrameInitInfo {
         /**
-         * @en The texture of the sprite frame, could be `TextureBase`
-         * @zh 贴图对象资源，可以是 `TextureBase` 类型
+         * @en The texture of the sprite frame, could be [[TextureBase]]
+         * @zh 贴图对象资源，可以是 [[TextureBase]] 类型
          */
         texture?: __private._cocos_core_assets_texture_base__TextureBase;
         /**
          * @en The original size of the sprite frame
@@ -499,9 +499,9 @@
      *  1. Rectangle sprite frame
      *  2. Sliced 9 sprite frame
      *  3. Mesh sprite frame
      * It mainly contains:<br/>
-     *  - texture: A `TextureBase` that will be used by render process<br/>
+     *  - texture: A [[TextureBase]] that will be used by render process<br/>
      *  - rectangle: A rectangle of the texture
      *  - Sliced 9 border insets: The distance of each side from the internal rect to the sprite frame rect
      *  - vertices: Vertex list for the mesh type sprite frame
      *  - uv: The quad uv
@@ -513,9 +513,9 @@
      *  1. 矩形精灵帧
      *  2. 九宫格精灵帧
      *  3. 网格精灵帧
      * 它主要包含下列数据：<br/>
-     *  - 纹理：会被渲染流程使用的 `TextureBase` 资源。<br/>
+     *  - 纹理：会被渲染流程使用的 [[TextureBase]] 资源。<br/>
      *  - 矩形：在纹理中的矩形区域。
      *  - 九宫格信息：九宫格的内部矩形四个边距离 SpriteFrame 外部矩形的距离
      *  - 网格信息：网格类型精灵帧的所有顶点列表
      *  - uv: 四边形 UV
@@ -632,10 +632,10 @@
          */
         get rotated(): boolean;
         set rotated(rotated: boolean);
         /**
-         * @en The texture of the sprite frame, could be `TextureBase`
-         * @zh 贴图对象资源，可以是 `TextureBase` 类型
+         * @en The texture of the sprite frame, could be [[TextureBase]]
+         * @zh 贴图对象资源，可以是 [[TextureBase]] 类型
          */
         get texture(): __private._cocos_core_assets_texture_base__TextureBase;
         set texture(value: __private._cocos_core_assets_texture_base__TextureBase);
         /**
@@ -7446,14 +7446,8 @@
                  * @en x9 times
                  * @readonly
                  */
                 SOFT_2X: number;
-                /**
-                 * @zh x16 次采样
-                 * @en x16 times
-                 * @readonly
-                 */
-                SOFT_4X: number;
             };
             /**
              * @zh 级联阴影贴图层级。
              * @en The CSM shadow level
@@ -8772,13 +8766,13 @@
          * @en The render scene which is created by the [[Root]] and provides all basic render scene elements for the render process.
          * It manages:
          * 1. [[Camera]]s
          * 2. [[Light]]s
-         * 3. Renderable objects: [[renderer.Model]]s and `DrawBatchs`
+         * 3. Renderable objects: [[Model]]s and [[DrawBatch2D]]s
          * @zh 渲染场景，由 [[Root]] 创建，并提供用于渲染流程的所有场景基础元素。它管理：
          * 1. [[Camera]]s：相机
          * 2. [[Light]]s：光源
-         * 3. 渲染元素：[[renderer.Model]]s 和 `DrawBatchs`
+         * 3. 渲染元素：[[Model]]s 和 [[DrawBatch2D]]s
          */
         export class RenderScene {
             /**
              * @en The root manager of the renderer
@@ -16501,9 +16495,9 @@
          * @internal
          */
         export const deviceManager: DeviceManager;
     }
-    export const VERSION = "3.6.1";
+    export const VERSION = "3.6.0";
     /**
      * @en The root manager of the renderer which manages all device resources and the render pipeline.
      * @zh 基础渲染器管理类，管理所有设备相关的资源创建以及渲染管线。
      */
@@ -19660,10 +19654,10 @@
         validate(): boolean;
     }
     /**
      * @en Render texture is a render target for [[Camera]] or [[Canvas]] component,
-     * the render pipeline will use its `RenderWindow` as the target of the rendering process.
-     * @zh 渲染贴图是 [[Camera]] 或 [[Canvas]] 组件的渲染目标对象，渲染管线会使用它的 `RenderWindow` 作为渲染的目标窗口。
+     * the render pipeline will use its [[RenderWindow]] as the target of the rendering process.
+     * @zh 渲染贴图是 [[Camera]] 或 [[Canvas]] 组件的渲染目标对象，渲染管线会使用它的 [[RenderWindow]] 作为渲染的目标窗口。
      */
     export class RenderTexture extends __private._cocos_core_assets_texture_base__TextureBase {
         /**
          * @en The render window for the render pipeline, it's created internally and cannot be modified.
@@ -27536,16 +27530,16 @@
         protected _updatePriority(): void;
     }
     /**
      * @en Base class for all components which can submit contents for the rendering process.
-     * It manages a series of [[renderer.Model]]s and the visibility, the materials and the material instances of the models.
+     * It manages a series of [[Model]]s and the visibility, the materials and the material instances of the models.
      * There are several different material properties that must be distinguished clearly and used with caution:
      * - [[sharedMaterials]] are shared for all component instances that are using the same material asset, modification will be applied universally.
      * - [[materials]] are instances created independently for the component instance, modification will only be applied for the component instance.
      * - Render Materials retrieved by [[getRenderMaterial]] are materials used for the actual rendering process, material instances are used if exist.
      * By default, shared materials are used for rendering.
      * Material instances are created only when user try to retrieve a material instance with [[material]], [[materials]] and [[getMaterialInstance]].
-     * @zh 所有可以提交内容到渲染流程的可渲染类的基类，它管理着一组 [[renderer.Model]]，以及它们的可见性、材质和材质实例。
+     * @zh 所有可以提交内容到渲染流程的可渲染类的基类，它管理着一组 [[Model]]，以及它们的可见性、材质和材质实例。
      * 下面是这个组件所管理的各种材质属性的解释，需要正确区分并小心使用：
      * - [[sharedMaterials]] 是共享材质，所有使用此材质资源的组件实例都默认使用材质的共享实例对象，所有修改都会影响所有使用它的组件实例。
      * - [[materials]] 是专为组件对象创建的独立材质实例，所有修改仅会影响当前组件对象。
      * - 使用 [[getRenderMaterial]] 获取的渲染材质是用于实际渲染流程的材质对象，当存在材质实例的时候，永远使用材质实例。
@@ -29949,8 +29943,19 @@
         /**
          * @en Trigger garbage collection of ScriptEngine @zh 触发 ScriptEngine 的 GC
          */
         function garbageCollect(): void;
+        /**
+         * @en DownloaderTask @zh 下载任务对象
+         * @param requestURL @en Request download resource URL  @zh 请求下载资源的URL
+         * @param storagePath @en Storage path for downloaded file @zh 下载文件存储路径
+         * @param identifier  @en identifier @zh 标识符
+         */
+        export type DownloaderTask = {
+            requestURL: string;
+            storagePath: string;
+            identifier: string;
+        };
         export class EventAssetsManager {
             getEventCode(): number;
             getCURLECode(): number;
             getCURLMCode(): number;
@@ -30253,31 +30258,8 @@
                 FAIL_TO_UPDATE
             }
         }
         /**
-         * @en DownloadTask @zh 下载任务对象
-         * @param requestURL @en Request download resource URL  @zh 请求下载资源的URL
-         * @param storagePath @en Storage path for downloaded file @zh 下载文件存储路径
-         * @param identifier  @en identifier @zh 标识符
-         */
-        export type DownloadTask = {
-            requestURL: string;
-            storagePath: string;
-            identifier: string;
-        };
-        /**
-         * @en DownloaderTask @zh 下载任务对象
-         * @param requestURL @en Request download resource URL  @zh 请求下载资源的URL
-         * @param storagePath @en Storage path for downloaded file @zh 下载文件存储路径
-         * @param identifier  @en identifier @zh 标识符
-         * @deprecated since v3.7.0, please use `DownloadTask` to instead.
-         */
-        export type DownloaderTask = {
-            requestURL: string;
-            storagePath: string;
-            identifier: string;
-        };
-        /**
          * @en DownloaderHints @zh 下载任务的配置接口
          * @param countOfMaxProcessingTasks
          * @en Maximum number of download tasks processed at the same time, optional, default is 6
          * @zh 同时处理的最大下载任务数量, 可选, 默认值为6
@@ -30317,26 +30299,20 @@
              * ```
              */
             constructor(hints: DownloaderHints);
             /**
-             * @en abort a download task, which could be downloaded from last break point.
-             * @zh 中止一个下载任务. 被终止的任务可以在之后被续传.
-             * @param task @en DownloadTask need to abort  @zh 需要中止的下载任务
-             */
-            abort(task: DownloadTask): void;
-            /**
              * @en create a download task. The maximum size for a single download file is 4GB.
              * @zh 创建一个下载任务. 单个下载文件最大为4GB.
              * @param requestURL @en Request download resource URL  @zh 请求下载资源的URL
              * @param storagePath @en Storage path for downloaded file @zh 下载文件存储路径
              * @param identifier  @en identifier @zh 标识符
-             * @return @en DownloadTask @zh 下载任务对象
+             * @return @en DownloaderTask @zh 下载任务对象
              * @example
              * ```ts
              * let task = downloader.createDownloadTask('https://example.com/exampleFile.zip', native.fileUtils.getWritablePath());
              * ```
              */
-            createDownloadTask(requestURL: string, storagePath: string, identifier?: string): DownloadTask;
+            createDownloadTask(requestURL: string, storagePath: string, identifier?: string): DownloaderTask;
             /**
              * @en setter for the callback function after download success
              * @zh 任务成功下载后的回调函数的修改器
              * @param task @en download task @zh 下载的任务
@@ -30347,9 +30323,9 @@
              *      console.log('Success!'); // call when task download success
              * };
              * ```
              */
-            onSuccess: (task: DownloadTask) => void | undefined;
+            onSuccess: (task: DownloaderTask) => void | undefined;
             /**
              * @en setter for the callback function while download.
              * @zh 任务下载过程中的回调函数的修改器.
              * @param task @en download task @zh 下载任务
@@ -30364,9 +30340,9 @@
              *      console.log(totalBytesReceived / totalBytesExpected * 100).toFixed(1) + '%'); // progress prompt
              * };
              * ```
              */
-            onProgress: (task: DownloadTask, bytesReceived: number, totalBytesReceived: number, totalBytesExpected: number) => void | undefined;
+            onProgress: (task: DownloaderTask, bytesReceived: number, totalBytesReceived: number, totalBytesExpected: number) => void | undefined;
             /**
              * @en setter for the callback function when download error
              * @zh 任务下载发生错误时的回调函数的修改器
              * @param task @en download task @zh 下载任务
@@ -30379,23 +30355,23 @@
              *  downloader.onError = (task, errorCode, errorCodeInternal, errorStr) => {
              *  console.log('Error:', errorStr);
              * };
              */
-            onError: (task: DownloadTask, errorCode: number, errorCodeInternal: number, errorStr: string) => void | undefined;
+            onError: (task: DownloaderTask, errorCode: number, errorCodeInternal: number, errorStr: string) => void | undefined;
             /**
              * @deprecated since v3.6.0, please use `createDownloadTask` to instead.
              * @en create a download task. The maximum size for a single download file is 4GB.
              * @zh 创建一个下载任务. 单个下载文件最大为4GB.
              * @param requestURL @en Request download resource URL  @zh 请求下载资源的URL
              * @param storagePath @en Storage path for downloaded file @zh 下载文件存储路径
              * @param identifier  @en identifier @zh 标识符
-             * @return @en DownloadTask @zh 下载任务对象
+             * @return @en DownloaderTask @zh 下载任务对象
              * @example
              * ```ts
              * let task = downloader.createDownloadFileTask('https://example.com/exampleFile.zip', native.fileUtils.getWritablePath());
              * ```
              */
-            createDownloadFileTask(requestURL: string, storagePath: string, identifier?: string): DownloadTask;
+            createDownloadFileTask(requestURL: string, storagePath: string, identifier?: string): DownloaderTask;
             /**
              * @deprecated since v3.6.0, please use setter `onSuccess` to instead.
              * @en set callback function after download success
              * @zh 设置任务成功下载后的回调函数
@@ -30407,9 +30383,9 @@
              *  console.log('Success!'); // call when task download success
              * });
              * ```
              */
-            setOnFileTaskSuccess(onSucceed: (task: DownloadTask) => void): void;
+            setOnFileTaskSuccess(onSucceed: (task: DownloaderTask) => void): void;
             /**
              * @deprecated since v3.6.0, please use setter `onProgress` to instead.
              * @en set callback function while download.
              * @zh 设置任务下载过程中的回调函数.
@@ -30422,9 +30398,9 @@
              *  console.log(totalBytesReceived / totalBytesExpected * 100).toFixed(1) + '%'); // progress prompt
              * });
              * ```
              */
-            setOnTaskProgress(onProgress: (task: DownloadTask, bytesReceived: number, totalBytesReceived: number, totalBytesExpected: number) => void): void;
+            setOnTaskProgress(onProgress: (task: DownloaderTask, bytesReceived: number, totalBytesReceived: number, totalBytesExpected: number) => void): void;
             /**
              * @deprecated since v3.6.0, please use setter `onError` to instead.
              * @en set callback function when download error
              * @zh 设置任务下载发生错误时的回调函数
@@ -30436,9 +30412,9 @@
              *  console.log('Error:', errorStr);
              * });
              * ```
              */
-            setOnTaskError(onError: (task: DownloadTask, errorCode: number, errorCodeInternal: number, errorStr: string) => void): void;
+            setOnTaskError(onError: (task: DownloaderTask, errorCode: number, errorCodeInternal: number, errorStr: string) => void): void;
         }
         /**
          * @en ZipUtils  Helper class to handle unzip related operations.
          * @zh ZipUtils  对解压操作的辅助类。
@@ -44150,15 +44126,14 @@
         protected _weightMapSize: number;
         protected _lightMapSize: number;
         protected _heights: Uint16Array;
         protected _weights: Uint8Array;
-        protected _normals: Float32Array;
+        protected _normals: number[];
         protected _layerList: (TerrainLayer | null)[];
         protected _layerBuffer: number[];
         protected _blocks: TerrainBlock[];
-        protected _lod: __private._cocos_terrain_terrain_lod__TerrainLod | null;
+        protected _lod: __private._cocos_terrain_terrain_lod__TerrainLod;
         protected _sharedIndexBuffer: gfx.Buffer | null;
-        protected _sharedLodIndexBuffer: gfx.Buffer | null;
         constructor();
         set _asset(value: TerrainAsset | null);
         /**
          * @deprecated since v3.5.0, this is an engine private interface that will be removed in the future.
@@ -44448,9 +44423,8 @@
     export const TERRAIN_DATA_VERSION2 = 16842754;
     export const TERRAIN_DATA_VERSION3 = 16842755;
     export const TERRAIN_DATA_VERSION4 = 16842756;
     export const TERRAIN_DATA_VERSION5 = 16842757;
-    export const TERRAIN_DATA_VERSION6 = 16842758;
     export const TERRAIN_DATA_VERSION_DEFAULT = 16843025;
     /**
      * @en terrain layer info
      * @zh 地形纹理信息
@@ -44486,9 +44460,8 @@
         protected _blockCount: number[];
         protected _weightMapSize: number;
         protected _lightMapSize: number;
         protected _heights: Uint16Array;
-        protected _normals: Float32Array;
         protected _weights: Uint8Array;
         protected _layerBuffer: number[];
         protected _layerBinaryInfos: TerrainLayerBinaryInfo[];
         protected _layerInfos: TerrainLayerInfo[];
@@ -44533,14 +44506,8 @@
          */
         set heights(value: Uint16Array);
         get heights(): Uint16Array;
         /**
-         * @en normal buffer
-         * @zh 法线缓存
-         */
-        set normals(value: Float32Array);
-        get normals(): Float32Array;
-        /**
          * @en weight buffer
          * @zh 权重缓存
          */
         set weights(value: Uint8Array);
@@ -48719,13 +48686,9 @@
             parseTrsPath(): {
                 node: string;
                 property: "scale" | "eulerAngles" | "position" | "rotation";
             } | null;
-            createRuntimeBinding(target: unknown, poseOutput: _cocos_core_animation_pose_output__PoseOutput | undefined, isConstant: boolean): _cocos_core_animation_tracks_track__RuntimeBinding | {
-                target: any;
-                setValue: any;
-                getValue: any;
-            } | null;
+            createRuntimeBinding(target: unknown, poseOutput: _cocos_core_animation_pose_output__PoseOutput | undefined, isConstant: boolean): _cocos_core_animation_tracks_track__RuntimeBinding | null;
             isMaskedOff(mask: AnimationMask): boolean;
         }
         export type _cocos_core_animation_tracks_track__Binder = (binding: _cocos_core_animation_tracks_track__TrackBinding) => undefined | _cocos_core_animation_tracks_track__RuntimeBinding;
         export type _cocos_core_animation_exotic_animation_exotic_animation__FloatArray = Float32Array | Float64Array;