V3.8.7 bloom (#18816)

This commit is contained in:
hyde zhou
2025-06-26 18:36:18 +08:00
committed by GitHub
parent 9f8fac3198
commit 13b8fd4d22
4 changed files with 513 additions and 398 deletions
@@ -24,7 +24,7 @@
import {
_decorator, Camera, CCBoolean, CCFloat, CCInteger, Component,
Material, rendering, Texture2D, visible,
Material, rendering, Texture2D,
} from 'cc';
import { EDITOR } from 'cc/env';
@@ -55,6 +55,7 @@ export class BuiltinPipelineSettings extends Component {
const cameraComponent = this.getComponent(Camera)!;
const camera = cameraComponent.camera;
camera.pipelineSettings = this._settings;
if (EDITOR) {
this._tryEnableEditorPreview();
}
@@ -62,8 +63,9 @@ export class BuiltinPipelineSettings extends Component {
onDisable(): void {
const cameraComponent = this.getComponent(Camera)!;
const camera = cameraComponent.camera;
camera.pipelineSettings = null;
if (camera) {
camera.pipelineSettings = null;
}
if (EDITOR) {
this._disableEditorPreview();
}
@@ -392,6 +394,7 @@ export class BuiltinPipelineSettings extends Component {
type: CCBoolean,
})
set fsrEnable(value: boolean) {
this._settings.fsr.enabled = value;
if (EDITOR) {
this._tryEnableEditorPreview();
}
@@ -28,7 +28,7 @@
* ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! =========================
*/
/* eslint-disable max-len */
import { Material, Texture2D, gfx, ccenum } from 'cc';
import { Material, Texture2D, ccenum, gfx } from 'cc';
const { SampleCount } = gfx;
@@ -38,14 +38,6 @@ export interface MSAA {
[name: string]: unknown;
}
export interface ForwardPassConfigs {
enableMainLightShadowMap: boolean;
enableMainLightPlanarShadowMap: boolean;
enablePlanarReflectionProbe: boolean;
enableMSAA: boolean;
enableSingleForwardPass: boolean;
}
export function makeMSAA(): MSAA {
return {
enabled: false,
@@ -62,6 +54,15 @@ export function fillRequiredMSAA(value: MSAA): void {
}
}
export interface ForwardPassConfigs {
enableMainLightShadowMap: boolean; /* false */
enableMainLightPlanarShadowMap: boolean; /* false */
enablePlanarReflectionProbe: boolean; /* false */
enableMSAA: boolean; /* false */
enableSingleForwardPass: boolean; /* false */
[name: string]: unknown;
}
export interface HBAO {
enabled: boolean; /* false */
radiusScale: number; /* 1 */
@@ -109,12 +110,13 @@ export enum BloomType {
MipmapFilter,
}
ccenum(BloomType);
export interface Bloom {
enabled: boolean; /* false */
type: BloomType;
material: Material | null;
type: BloomType; /* BloomType.KawaseDualFilter */
/* refcount */ material: Material | null;
/* refcount */ kawaseFilterMaterial: Material | null;
mipmapFilterMaterial: Material | null;
/* refcount */ mipmapFilterMaterial: Material | null;
enableAlphaMask: boolean; /* false */
iterations: number; /* 3 */
threshold: number; /* 0.8 */
@@ -143,13 +145,16 @@ export function fillRequiredBloom(value: Bloom): void {
if (value.type === undefined) {
value.type = BloomType.KawaseDualFilter;
}
if (!value.kawaseFilterMaterial) {
if (value.material === undefined) {
value.material = null;
}
if (value.kawaseFilterMaterial === undefined) {
value.kawaseFilterMaterial = value.material || null;
}
if (!value.mipmapFilterMaterial) {
if (value.mipmapFilterMaterial === undefined) {
value.mipmapFilterMaterial = null;
}
if (!value.enableAlphaMask) {
if (value.enableAlphaMask === undefined) {
value.enableAlphaMask = false;
}
if (value.iterations === undefined) {
File diff suppressed because it is too large Load Diff
@@ -9,35 +9,42 @@ techniques:
- passes:
- vert: base-vs:vert
frag: prefilter-fs:frag
pass: cc-bloom-prefilter
pass: cc-bloom-mipmap-prefilter
depthStencilState:
depthTest: false
depthWrite: false
- vert: downsample-vs:vert
frag: downsample-fs:frag
pass: cc-bloom-downsample
pass: cc-bloom-mipmap-downsample
depthStencilState:
depthTest: false
depthWrite: false
- vert: upsample-vs:vert
frag: upsample-fs:frag
pass: cc-bloom-upsample
pass: cc-bloom-mipmap-upsample
depthStencilState:
depthTest: false
depthWrite: false
- vert: base-vs:vert
frag: combine-fs:frag
pass: cc-bloom-combine
pass: cc-bloom-mipmap-combine
depthStencilState:
depthTest: false
depthWrite: false
blendState:
targets:
- blend: true
blendSrc: one
blendDst: one
blendSrcAlpha: zero
blendDstAlpha: one
}%
CCProgram base-vs %{
precision mediump float;
#include <legacy/decode>
#include <builtin/uniforms/cc-global>
#include <legacy/decode-standard>
#include <post-process/pipeline>
out vec2 vUv;
out vec2 vUv00;
@@ -49,19 +56,21 @@ out vec2 vUv04;
vec4 vert() {
vUv = a_texCoord;
vec4 position;
CCDecode(position);
return position;
StandardVertInput In;
CCDecode(In);
FLIP_VULKAN_NDC(In.position);
return In.position;
}
}%
CCProgram prefilter-fs %{
precision mediump float;
#include <builtin/uniforms/cc-global>
#define bloomParams cc_debug_view_mode
#pragma rate BloomUBO pass
uniform BloomUBO {
mediump vec4 bloomParams; // x: useHDRIlluminance z: threshold, w: enableAlphaMask
};
in vec2 vUv;
#pragma rate mainTexture pass
@@ -81,10 +90,13 @@ vec4 frag() {
CCProgram downsample-vs %{
precision mediump float;
#include <legacy/decode>
#include <builtin/uniforms/cc-global>
#include <legacy/decode-standard>
#include <post-process/pipeline>
#define bloomParams cc_debug_view_mode
#pragma rate BloomUBO pass
uniform BloomUBO {
mediump vec4 bloomParams; // x: useHDRIlluminance z: threshold, w: enableAlphaMask
};
out vec2 vUv;
out vec2 vUv00;
@@ -118,19 +130,19 @@ vec4 vert() {
vUv10 = vUv + bloomParams.xy * vec2(0.0, - 2.0);
vUv11 = vUv + bloomParams.xy * vec2(2.0, - 2.0);
vec4 position;
CCDecode(position);
return position;
StandardVertInput In;
CCDecode(In);
FLIP_VULKAN_NDC(In.position);
return In.position;
}
}%
CCProgram downsample-fs %{
precision mediump float;
// (1 / 4) * 0.5 = 0.125
// (1 / 4) * 0.5 = 0.125
#define WEIGHT_INNER 0.125
// (1 / 9) * 0.5 = 0.0555555
// (1 / 9) * 0.5 = 0.0555555
#define WEIGHT_OUTER 0.0555555
in vec2 vUv;
@@ -201,10 +213,13 @@ vec4 frag() {
CCProgram upsample-vs %{
precision mediump float;
#include <legacy/decode>
#include <builtin/uniforms/cc-global>
#include <legacy/decode-standard>
#include <post-process/pipeline>
#define bloomParams cc_debug_view_mode
#pragma rate BloomUBO pass
uniform BloomUBO {
mediump vec4 bloomParams; // x: useHDRIlluminance z: threshold, w: enableAlphaMask
};
out vec2 vUv;
out vec2 vUv0;
@@ -230,16 +245,15 @@ vec4 vert() {
vUv6 = vUv + bloomParams.xy * vec2(0.0, - 1.0);
vUv7 = vUv + bloomParams.xy * vec2(1.0, - 1.0);
vec4 position;
CCDecode(position);
return position;
StandardVertInput In;
CCDecode(In);
FLIP_VULKAN_NDC(In.position);
return In.position;
}
}%
CCProgram upsample-fs %{
precision mediump float;
#include <builtin/uniforms/cc-global>
in vec2 vUv;
in vec2 vUv0;
@@ -276,21 +290,20 @@ vec4 frag() {
CCProgram combine-fs %{
precision mediump float;
#include <builtin/uniforms/cc-global>
#define bloomParams cc_debug_view_mode
#pragma rate BloomUBO pass
uniform BloomUBO {
mediump vec4 bloomParams; // x: useHDRIlluminance z: threshold, w: enableAlphaMask
};
in vec2 vUv;
#pragma rate bloomTexture pass
uniform lowp sampler2D bloomTexture;
#pragma rate mainTexture pass
uniform sampler2D mainTexture;
uniform sampler2D bloomTexture;
vec4 frag() {
vec4 baseColor = texture(mainTexture, vUv);
vec4 bloomColor = texture(bloomTexture, vUv);
vec3 color = baseColor.rgb + bloomColor.rgb * bloomParams.w;
return vec4(color, baseColor.a);
vec3 color = bloomColor.rgb * bloomParams.w;
return vec4(color, 1);
}
}%