merge pipeline

# Conflicts: # cocos/rendering/custom/executor.ts # cocos/rendering/custom/render-graph.ts # cocos/rendering/custom/web-pipeline.ts
cocos · Oct 9, 2023 · a197813 · a197813
1 parent 602fa60
commit a197813
Show file tree

Hide file tree

Showing 48 changed files with 4,770 additions and 823 deletions.
diff --git a/cocos/gfx/base/define.ts b/cocos/gfx/base/define.ts
@@ -979,6 +979,15 @@ export class Viewport {
         this.maxDepth = info.maxDepth;
         return this;
     }
+
+    public reset (): void {
+        this.left = 0;
+        this.top = 0;
+        this.width = 0;
+        this.height = 0;
+        this.minDepth = 0;
+        this.maxDepth = 1;
+    }
 }
 
 export class Color {
@@ -1006,6 +1015,13 @@ export class Color {
         this.w = w;
         return this;
     }
+
+    public reset (): void {
+        this.x = 0;
+        this.y = 0;
+        this.z = 0;
+        this.w = 0;
+    }
 }
 
 export class BindingMappingInfo {
@@ -1756,6 +1772,10 @@ export class DescriptorSetLayoutInfo {
         deepCopy(this.bindings, info.bindings, DescriptorSetLayoutBinding);
         return this;
     }
+
+    reset (): void {
+        this.bindings.length = 0;
+    }
 }
 
 export class DescriptorSetInfo {

diff --git a/cocos/rendering/custom/define.ts b/cocos/rendering/custom/define.ts
@@ -755,8 +755,10 @@ export function buildReflectionProbePass (
         probeCamera.clearStencil,
         probeCamera.clearFlag,
     );
-    const passBuilder = probePass.addQueue(QueueHint.RENDER_OPAQUE);
-    passBuilder.addSceneOfCamera(camera, new LightInfo(), SceneFlags.REFLECTION_PROBE);
+    const passBuilder = probePass.addQueue(QueueHint.RENDER_OPAQUE, 'reflect-map');
+    const lightInfo = new LightInfo();
+    lightInfo.probe = probe;
+    passBuilder.addSceneOfCamera(camera, lightInfo, SceneFlags.REFLECTION_PROBE | SceneFlags.OPAQUE_OBJECT);
     updateCameraUBO(passBuilder as unknown as any, probeCamera, ppl);
 }