Added mipmap bloom algorithm (#18725)

Author: GengineJS

cc.config.json

@@ -256,7 +256,8 @@
             "dependentScripts": [
                 "ff9b0199-ce04-4cfe-86cc-6c719f08d6e4",
                 "de1c2107-70c8-4021-8459-6399f24d01c6",
-                "cbf30902-517f-40dc-af90-a550bac27cf1"
+                "cbf30902-517f-40dc-af90-a550bac27cf1",
+                "5c601d96-e4c7-4698-991b-7ee674b11079"
             ]
         },
         "custom-pipeline-post-process": {

editor/assets/default_renderpipeline/builtin-bloom.mtl renamed to editor/assets/default_renderpipeline/builtin-kawase-bloom.mtl

@@ -0,0 +1,62 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "7ca08c6b-221a-43d5-8ad6-a6dd2ee7852b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {},
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {},
+    {},
+    {},
+    {}
+  ]
+}

editor/assets/default_renderpipeline/builtin-bloom.mtl.meta renamed to editor/assets/default_renderpipeline/builtin-kawase-bloom.mtl.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.0.21",
+  "importer": "material",
+  "imported": true,
+  "uuid": "9c3ea99f-fd05-43ec-9067-14ce54ccf9be",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

editor/assets/default_renderpipeline/builtin-mipmap-bloom.mtl

@@ -24,13 +24,14 @@
 
 import {
     _decorator, Camera, CCBoolean, CCFloat, CCInteger, Component,
-    Material, rendering, Texture2D,
+    Material, rendering, Texture2D, visible,
 } from 'cc';
 
 import { EDITOR } from 'cc/env';
 
 import {
-    fillRequiredPipelineSettings, makePipelineSettings, PipelineSettings,
+    BloomType,
+    fillRequiredPipelineSettings, getBuiltinBloomMaterial, makePipelineSettings, PipelineSettings,
 } from './builtin-pipeline-types';
 
 const { ccclass, disallowMultiple, executeInEditMode, menu, property, requireComponent, type } = _decorator;
@@ -54,7 +55,6 @@ export class BuiltinPipelineSettings extends Component {
         const cameraComponent = this.getComponent(Camera)!;
         const camera = cameraComponent.camera;
         camera.pipelineSettings = this._settings;
-
         if (EDITOR) {
             this._tryEnableEditorPreview();
         }
@@ -185,21 +185,53 @@ export class BuiltinPipelineSettings extends Component {
         return this._settings.bloom.enabled;
     }
 
+    @type(BloomType)
+    @property({
+        group: { id: 'Bloom', name: 'Bloom (PostProcessing)', style: 'section' },
+    })
+    set bloomType(value: BloomType) {
+        this._settings.bloom.type = value;
+        if (EDITOR) {
+            this._tryEnableEditorPreview();
+        }
+    }
+
+    get bloomType(): BloomType {
+        return this._settings.bloom.type;
+    }
+
+    @property({
+        group: { id: 'Bloom', name: 'Bloom (PostProcessing)', style: 'section' },
+        type: Material,
+    })
+    set kawaseBloomMaterial(value: Material) {
+        if (this._settings.bloom.kawaseFilterMaterial === value) {
+            return;
+        }
+        this._settings.bloom.kawaseFilterMaterial = value;
+        if (EDITOR) {
+            this._tryEnableEditorPreview();
+        }
+    }
+    get kawaseBloomMaterial(): Material {
+        return this._settings.bloom.kawaseFilterMaterial!;
+    }
+
     @property({
         group: { id: 'Bloom', name: 'Bloom (PostProcessing)', style: 'section' },
         type: Material,
     })
-    set bloomMaterial(value: Material) {
-        if (this._settings.bloom.material === value) {
+    set mipmapBloomMaterial(value: Material) {
+        if (this._settings.bloom.mipmapFilterMaterial === value) {
             return;
         }
-        this._settings.bloom.material = value;
+        this._settings.bloom.mipmapFilterMaterial = value;
         if (EDITOR) {
             this._tryEnableEditorPreview();
         }
     }
-    get bloomMaterial(): Material {
-        return this._settings.bloom.material!;
+    get mipmapBloomMaterial(): Material {
+        return this._settings.bloom.mipmapFilterMaterial!;
     }
 
     @property({
@@ -247,8 +279,18 @@ export class BuiltinPipelineSettings extends Component {
         return this._settings.bloom.threshold;
     }
 
+    @type(CCFloat)
+    @property({
+        group: { id: 'Bloom', name: 'Bloom (PostProcessing)', style: 'section' },
+    })
+    @visible(function(this: BuiltinPipelineSettings) {
+        return this.bloomType === BloomType.MipmapFilter;
+    })
     set bloomIntensity(value: number) {
         this._settings.bloom.intensity = value;
+        if (EDITOR) {
+            this._tryEnableEditorPreview();
+        }
     }
     get bloomIntensity(): number {
         return this._settings.bloom.intensity;
@@ -353,7 +395,6 @@ export class BuiltinPipelineSettings extends Component {
         type: CCBoolean,
     })
     set fsrEnable(value: boolean) {
-        this._settings.fsr.enabled = value;
         if (EDITOR) {
             this._tryEnableEditorPreview();
         }

editor/assets/default_renderpipeline/builtin-mipmap-bloom.mtl.meta

@@ -28,7 +28,7 @@
  * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! =========================
  */
 /* eslint-disable max-len */
-import { Material, Texture2D, gfx } from 'cc';
+import { Material, Texture2D, gfx, ccenum } from 'cc';
 
 const { SampleCount } = gfx;
 
@@ -96,35 +96,50 @@ export function fillRequiredHBAO(value: HBAO): void {
     }
 }
 
+export enum BloomType {
+    MipmapFilter,
+    KawaseDualFilter,
+}
+ccenum(BloomType);
 export interface Bloom {
     enabled: boolean; /* false */
-    /* refcount */ material: Material | null;
+    type: BloomType;
+    /* refcount */ kawaseFilterMaterial: Material | null;
+    mipmapFilterMaterial: Material | null;
     enableAlphaMask: boolean; /* false */
     iterations: number; /* 3 */
     threshold: number; /* 0.8 */
-    intensity: number; /* 2.3 */
+    intensity: number; /* 1 */
     [name: string]: unknown;
 }
 
 export function makeBloom(): Bloom {
     return {
         enabled: false,
-        material: null,
+        type: BloomType.KawaseDualFilter,
+        kawaseFilterMaterial: null,
+        mipmapFilterMaterial: null,
         enableAlphaMask: false,
         iterations: 3,
         threshold: 0.8,
-        intensity: 2.3,
+        intensity: 1,
     };
 }
 
 export function fillRequiredBloom(value: Bloom): void {
     if (value.enabled === undefined) {
         value.enabled = false;
     }
-    if (value.material === undefined) {
-        value.material = null;
+    if (value.type === undefined) {
+        value.type = BloomType.KawaseDualFilter;
+    }
+    if (!value.kawaseFilterMaterial) {
+        value.kawaseFilterMaterial = null;
+    }
+    if (!value.mipmapFilterMaterial) {
+        value.mipmapFilterMaterial = null;
     }
-    if (value.enableAlphaMask === undefined) {
+    if (!value.enableAlphaMask) {
         value.enableAlphaMask = false;
     }
     if (value.iterations === undefined) {
@@ -134,7 +149,7 @@ export function fillRequiredBloom(value: Bloom): void {
         value.threshold = 0.8;
     }
     if (value.intensity === undefined) {
-        value.intensity = 2.3;
+        value.intensity = 1;
     }
 }