diff --git a/cocos/rendering/custom/index.jsb.ts b/cocos/rendering/custom/index.jsb.ts index 965646ebb69..9bb3d25bf2b 100644 --- a/cocos/rendering/custom/index.jsb.ts +++ b/cocos/rendering/custom/index.jsb.ts @@ -59,7 +59,7 @@ export function getCustomPipeline (name: string): PipelineBuilder { function addCustomBuiltinPipelines (map: Map) { map.set('Forward', new ForwardPipelineBuilder()); map.set('Deferred', new DeferredPipelineBuilder()); - map.set('Custom', new CustomPipelineBuilder()); + map.set('Deprecated', new CustomPipelineBuilder()); map.set('Test', new TestPipelineBuilder()); } diff --git a/cocos/rendering/custom/index.ts b/cocos/rendering/custom/index.ts index 7393436a77f..1230f9d72a5 100644 --- a/cocos/rendering/custom/index.ts +++ b/cocos/rendering/custom/index.ts @@ -74,7 +74,7 @@ export function getCustomPipeline (name: string): PipelineBuilder { function addCustomBuiltinPipelines (map: Map) { map.set('Forward', new ForwardPipelineBuilder()); map.set('Deferred', new DeferredPipelineBuilder()); - map.set('Custom', new CustomPipelineBuilder()); + map.set('Deprecated', new CustomPipelineBuilder()); } addCustomBuiltinPipelines(customPipelineBuilderMap); diff --git a/cocos/rendering/post-process/passes/forward-pass.ts b/cocos/rendering/post-process/passes/forward-pass.ts index 17739ae0402..92b1b9eea70 100644 --- a/cocos/rendering/post-process/passes/forward-pass.ts +++ b/cocos/rendering/post-process/passes/forward-pass.ts @@ -80,7 +80,7 @@ export class ForwardPass extends BasePass { .addSceneOfCamera(camera, new LightInfo(), SceneFlags.OPAQUE_OBJECT | SceneFlags.PLANAR_SHADOW | SceneFlags.CUTOUT_OBJECT - | SceneFlags.DEFAULT_LIGHTING | SceneFlags.DRAW_INSTANCING); + | SceneFlags.DEFAULT_LIGHTING | SceneFlags.DRAW_INSTANCING | SceneFlags.GEOMETRY); passContext.forwardPass = this; } diff --git a/cocos/rendering/post-process/passes/forward-transparency-pass.ts b/cocos/rendering/post-process/passes/forward-transparency-pass.ts index 68700609aef..8445003e3e4 100644 --- a/cocos/rendering/post-process/passes/forward-transparency-pass.ts +++ b/cocos/rendering/post-process/passes/forward-transparency-pass.ts @@ -36,10 +36,6 @@ export class ForwardTransparencyPass extends BasePass { enableInAllEditorCamera = true; depthBufferShadingScale = 1; - enable = true; - checkEnable (camera: Camera) { - return true; - } slotName (camera: Camera, index = 0) { return this.lastPass!.slotName(camera, index); diff --git a/cocos/rendering/post-process/passes/skin-pass.ts b/cocos/rendering/post-process/passes/skin-pass.ts index 56f5c9964a1..48140d0ac51 100644 --- a/cocos/rendering/post-process/passes/skin-pass.ts +++ b/cocos/rendering/post-process/passes/skin-pass.ts @@ -190,10 +190,6 @@ export class SkinPass extends SettingPass { ssssBlurData = new SSSSBlurData(); enableInAllEditorCamera = true; - enable = true; - checkEnable (camera: Camera) { - return true; - } public render (camera: Camera, ppl: BasicPipeline): void { passContext.material = this.material; @@ -314,11 +310,14 @@ export class SkinPass extends SettingPass { } } - pass.addQueue(QueueHint.RENDER_OPAQUE) - .addSceneOfCamera(camera, - new LightInfo(), - SceneFlags.OPAQUE_OBJECT | SceneFlags.PLANAR_SHADOW | SceneFlags.CUTOUT_OBJECT - | SceneFlags.DEFAULT_LIGHTING | SceneFlags.DRAW_INSTANCING); + pass.addQueue(QueueHint.RENDER_TRANSPARENT, 'default') + .addSceneOfCamera(camera, new LightInfo(), + SceneFlags.OPAQUE_OBJECT | SceneFlags.TRANSPARENT_OBJECT | SceneFlags.DEFAULT_LIGHTING | SceneFlags.PLANAR_SHADOW + | SceneFlags.CUTOUT_OBJECT | SceneFlags.DRAW_INSTANCING); + pass.addQueue(QueueHint.RENDER_TRANSPARENT, 'forward-add') + .addSceneOfCamera(camera, new LightInfo(), + SceneFlags.OPAQUE_OBJECT | SceneFlags.TRANSPARENT_OBJECT | SceneFlags.DEFAULT_LIGHTING | SceneFlags.PLANAR_SHADOW + | SceneFlags.CUTOUT_OBJECT | SceneFlags.DRAW_INSTANCING); } slotName (camera: Camera, index = 0) { diff --git a/cocos/rendering/post-process/post-process-builder.ts b/cocos/rendering/post-process/post-process-builder.ts index 054d37b736f..1d07b57f88c 100644 --- a/cocos/rendering/post-process/post-process-builder.ts +++ b/cocos/rendering/post-process/post-process-builder.ts @@ -197,4 +197,4 @@ export class PostProcessBuilder implements PipelineBuilder { } } -setCustomPipeline('PostProcess', new PostProcessBuilder()); +setCustomPipeline('Custom', new PostProcessBuilder()); diff --git a/editor/assets/effects/advanced/common-functions.chunk b/editor/assets/effects/advanced/common-functions.chunk index 15be29c81a1..ac99d9d875d 100644 --- a/editor/assets/effects/advanced/common-functions.chunk +++ b/editor/assets/effects/advanced/common-functions.chunk @@ -59,18 +59,6 @@ } #endif -#ifndef CC_SURFACES_FRAGMENT_MODIFY_EMISSIVE - #define CC_SURFACES_FRAGMENT_MODIFY_EMISSIVE - vec3 SurfacesFragmentModifyEmissive() - { - vec3 emissive = emissive.rgb; - #if USE_EMISSIVE_MAP - emissive = SRGBToLinear(texture(emissiveMap, EMISSIVE_UV).rgb); - #endif - return emissive * emissiveScaleParam.xyz; - } -#endif - #ifndef CC_SURFACES_FRAGMENT_MODIFY_PBRPARAMS #define CC_SURFACES_FRAGMENT_MODIFY_PBRPARAMS vec4 SurfacesFragmentModifyPBRParams() diff --git a/editor/assets/effects/advanced/hair.effect b/editor/assets/effects/advanced/hair.effect index 4459321f1f2..e7eb72881c2 100644 --- a/editor/assets/effects/advanced/hair.effect +++ b/editor/assets/effects/advanced/hair.effect @@ -15,8 +15,6 @@ CCEffect %{ roughness: { value: 0.5, target: pbrParams.y, editor: { slide: true, range: [0, 1.0], step: 0.001 } } metallic: { value: 0.0, target: pbrParams.z, editor: { slide: true, range: [0, 1.0], step: 0.001 } } specularIntensity: { value: 0.5, target: pbrParams.w, editor: { slide: true, range: [0.0, 1.0], step: 0.001 } } - emissive: { value: [0.0, 0.0, 0.0, 1.0], linear: true, editor: { type: color } } - emissiveScale: { value: [1.0, 1.0, 1.0], target: emissiveScaleParam.xyz } normalStrength: { value: 0.4, target: emissiveScaleParam.w, editor: { parent: USE_NORMAL_MAP, slide: true, range: [0, 5.0], step: 0.001 } } anisotropyIntensity: { value: 1.0, target: anisotropyParam.x, editor: { slide : true, range : [0.0, 1.0] , step : 0.0001 } } anisotropyRotation: { value: 0.0, target: anisotropyParam.y, editor: { slide : true, range : [0, 1.0] , step : 0.0001 } } @@ -25,7 +23,6 @@ CCEffect %{ normalMap: { value: normal } pbrMap: { value: grey } occlusionMap: { value: white } - emissiveMap: { value: grey } anisotropyMap: { value: black } roughnessTRT: { value: 0.2, target: trtParams.x, editor: { displayName: TRT Roughness Offset, slide: true, range: [0, 1.0], step: 0.001, tooltip: 'The extend range of internal reflection lighting around the direct specular' } } offsetTRT: { value: 0.0, target: trtParams.y, editor: { displayName: TRT Lighting Offset, slide: true, range: [-0.5, 0.5], step: 0.001, tooltip: 'The position offset of internal reflection lighting compared to direct specular' } } @@ -181,7 +178,6 @@ CCProgram shared-ubos %{ vec4 albedo; vec4 albedoScaleAndCutoff; vec4 pbrParams; - vec4 emissive; vec4 emissiveScaleParam; vec4 anisotropyParam; vec4 trtColor; @@ -242,10 +238,6 @@ CCProgram surface-fragment %{ #if USE_OCCLUSION_MAP uniform sampler2D occlusionMap; #endif - #if USE_EMISSIVE_MAP - uniform sampler2D emissiveMap; - #pragma define-meta EMISSIVE_UV options([v_uv, v_uv1]) - #endif #pragma define OCCLUSION_CHANNEL r #pragma define ROUGHNESS_CHANNEL g diff --git a/editor/assets/effects/advanced/leaf.effect b/editor/assets/effects/advanced/leaf.effect index b0b6621004f..f7b8c6ae2b0 100644 --- a/editor/assets/effects/advanced/leaf.effect +++ b/editor/assets/effects/advanced/leaf.effect @@ -14,19 +14,16 @@ CCEffect %{ occlusion: { value: 0.0, target: pbrParams.x, editor: { slide: true, range: [0, 1.0], step: 0.001 } } roughness: { value: 0.5, target: pbrParams.y, editor: { slide: true, range: [0, 1.0], step: 0.001 } } specularIntensity: { value: 0.5, target: pbrParams.w, editor: { slide: true, range: [0.0, 1.0], step: 0.001 } } - emissive: { value: [0.0, 0.0, 0.0, 1.0], linear: true, editor: { type: color } } - emissiveScale: { value: [1.0, 1.0, 1.0], target: emissiveScaleParam.xyz } normalStrength: { value: 1.0, target: emissiveScaleParam.w, editor: { parent: USE_NORMAL_MAP, slide: true, range: [0, 5.0], step: 0.001 } } mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } normalMap: { value: normal } pbrMap: { value: grey, editor: { displayName: PbrOrRoughnessMap } } occlusionMap: { value: white } - emissiveMap: { value: grey } thicknessMap: { value: white, editor: { parent: USE_THICKNESS_MAP } } scatterColorMap: { value: white, editor: { parent: USE_SCATTER_MAP } } extinction: { value: 0.0, target: scatterParams.y, editor: { displayName: Scatter Extinction, slide: true, range: [0, 3.0], step: 0.001 } } thickness: { value: 1.0, target: scatterParams.z, editor: { displayName: Thickness Scaling, slide: true, range: [0, 3.0], step: 0.001 } } - scatterColor: { value: [0.1, 0.5, 0.1, 1.0], linear: true, editor: { displayName: Scatter Color, type: color, tooltip: 'The color of scattered lighting' } } + scatterColor: { value: [0.5, 0.75, 0.2, 1.0], linear: true, editor: { displayName: Scatter Color, type: color, tooltip: 'The color of scattered lighting' } } rasterizerState: cullMode: None depthStencilState: @@ -90,7 +87,6 @@ CCProgram shared-ubos %{ vec4 albedo; vec4 albedoScaleAndCutoff; vec4 pbrParams; - vec4 emissive; vec4 emissiveScaleParam; vec4 scatterColor; vec4 scatterParams; @@ -101,6 +97,7 @@ CCProgram macro-remapping %{ // ui displayed macros #pragma define-meta HAS_SECOND_UV #pragma define-meta USE_TWOSIDE + //use FSInput_faceSideSign for materials #pragma define-meta USE_TWOSIDE_MATERIAL #pragma define-meta USE_VERTEX_COLOR #pragma define-meta USE_DITHERED_ALPHA_TEST @@ -144,10 +141,6 @@ CCProgram surface-fragment %{ #if USE_OCCLUSION_MAP uniform sampler2D occlusionMap; #endif - #if USE_EMISSIVE_MAP - uniform sampler2D emissiveMap; - #pragma define-meta EMISSIVE_UV options([v_uv, v_uv1]) - #endif #if USE_THICKNESS_MAP uniform sampler2D thicknessMap; #endif diff --git a/editor/assets/effects/advanced/simple-skin.effect b/editor/assets/effects/advanced/simple-skin.effect index c4e28701d0e..df8ffa22bf1 100644 --- a/editor/assets/effects/advanced/simple-skin.effect +++ b/editor/assets/effects/advanced/simple-skin.effect @@ -14,14 +14,11 @@ CCEffect %{ occlusion: { value: 0.0, target: pbrParams.x, editor: { slide: true, range: [0, 1.0], step: 0.001 } } roughness: { value: 0.5, target: pbrParams.y, editor: { slide: true, range: [0, 1.0], step: 0.001 } } specularIntensity: { value: 0.5, target: pbrParams.w, editor: { slide: true, range: [0.0, 1.0], step: 0.001 } } - emissive: { value: [0.0, 0.0, 0.0, 1.0], linear: true, editor: { type: color } } - emissiveScale: { value: [1.0, 1.0, 1.0], target: emissiveScaleParam.xyz } normalStrength: { value: 1.0, target: emissiveScaleParam.w, editor: { parent: USE_NORMAL_MAP, slide: true, range: [0, 5.0], step: 0.001 } } mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } normalMap: { value: normal } pbrMap: { value: grey, editor: { displayName: PbrOrRoughnessMap } } occlusionMap: { value: white } - emissiveMap: { value: grey } sssIntensity: { value: 1.0, target: scatterParams.z, editor: { parent: USE_NORMAL_MAP, slide: true, range: [0, 1.0], step: 0.001 } } preIntegratedSkinMap: { value: grey, editor: { parent: USE_PREINTEGRATED_SKIN } } sssCurvatureMap: { value: white, editor: { parent: USE_PREINTEGRATED_SKIN } } @@ -97,7 +94,6 @@ CCProgram shared-ubos %{ vec4 albedo; vec4 albedoScaleAndCutoff; vec4 pbrParams; - vec4 emissive; vec4 emissiveScaleParam; vec4 transmitColor; vec4 scatterParams; @@ -148,10 +144,6 @@ CCProgram surface-fragment %{ #if USE_OCCLUSION_MAP uniform sampler2D occlusionMap; #endif - #if USE_EMISSIVE_MAP - uniform sampler2D emissiveMap; - #pragma define-meta EMISSIVE_UV options([v_uv, v_uv1]) - #endif #pragma define OCCLUSION_CHANNEL r #pragma define ROUGHNESS_CHANNEL g diff --git a/editor/assets/effects/advanced/skin.effect b/editor/assets/effects/advanced/skin.effect index ca1f4a1d828..706c51b2726 100644 --- a/editor/assets/effects/advanced/skin.effect +++ b/editor/assets/effects/advanced/skin.effect @@ -15,14 +15,11 @@ CCEffect %{ occlusion: { value: 0.0, target: pbrParams.x, editor: { slide: true, range: [0, 1.0], step: 0.001 } } roughness: { value: 0.5, target: pbrParams.y, editor: { slide: true, range: [0, 1.0], step: 0.001 } } specularIntensity: { value: 0.5, target: pbrParams.w, editor: { slide: true, range: [0.0, 1.0], step: 0.001 } } - emissive: { value: [0.0, 0.0, 0.0, 1.0], linear: true, editor: { type: color } } - emissiveScale: { value: [1.0, 1.0, 1.0], target: emissiveScaleParam.xyz } normalStrength: { value: 1.0, target: emissiveScaleParam.w, editor: { parent: USE_NORMAL_MAP, slide: true, range: [0, 5.0], step: 0.001 } } mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } normalMap: { value: normal } pbrMap: { value: grey, editor: { displayName: PbrOrRoughnessMap } } occlusionMap: { value: white } - emissiveMap: { value: grey } sssIntensity: { value: 1.0, target: scatterParams.z, editor: { slide: true, range: [0, 1.0], step: 0.001 } } sssMap: { value: black } cavityMap: { value: white, editor: { tooltip: 'cavity map or specular map' } } @@ -120,7 +117,6 @@ CCProgram shared-ubos %{ vec4 albedo; vec4 albedoScaleAndCutoff; vec4 pbrParams; - vec4 emissive; vec4 emissiveScaleParam; vec4 transmitColor; vec4 scatterParams; @@ -170,10 +166,6 @@ CCProgram surface-fragment %{ #if USE_OCCLUSION_MAP uniform sampler2D occlusionMap; #endif - #if USE_EMISSIVE_MAP - uniform sampler2D emissiveMap; - #pragma define-meta EMISSIVE_UV options([v_uv, v_uv1]) - #endif #if USE_SSS_MAP uniform sampler2D sssMap; #endif