From ae01a2e59bfebeede25b2d93e0e4eb29612cc8d0 Mon Sep 17 00:00:00 2001 From: jk20012001 Date: Tue, 23 May 2023 22:57:19 +0800 Subject: [PATCH] add leaf shader (#15156) --- .../shading-entries/data-structures/vs-fs.chunk | 2 +- editor/assets/effects/advanced/leaf.effect | 17 ++++++++++++----- .../assets/effects/advanced/simple-skin.effect | 1 - editor/assets/effects/advanced/skin.effect | 1 - 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/editor/assets/chunks/shading-entries/data-structures/vs-fs.chunk b/editor/assets/chunks/shading-entries/data-structures/vs-fs.chunk index bddc08805e..b56e2405d5 100644 --- a/editor/assets/chunks/shading-entries/data-structures/vs-fs.chunk +++ b/editor/assets/chunks/shading-entries/data-structures/vs-fs.chunk @@ -25,7 +25,7 @@ CC_SURFACES_VARING_MODIFIER vec2 v_uv; #endif #if CC_USE_REFLECTION_PROBE && USE_INSTANCING - CC_SURFACES_VARING_MODIFIER mediump vec4 v_reflectionProbeData; + CC_SURFACES_VARING_MODIFIER mediump vec4 v_reflectionProbeData; #endif #if CC_USE_FOG != CC_FOG_NONE && !CC_USE_ACCURATE_FOG diff --git a/editor/assets/effects/advanced/leaf.effect b/editor/assets/effects/advanced/leaf.effect index 7f5b493e45..b0b6621004 100644 --- a/editor/assets/effects/advanced/leaf.effect +++ b/editor/assets/effects/advanced/leaf.effect @@ -13,19 +13,19 @@ CCEffect %{ alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { slide: true, range: [0, 1.0], step: 0.001 } } 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 } } - 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: 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 } + 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, 10.0], step: 0.001 } } + 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' } } rasterizerState: cullMode: None @@ -179,7 +179,7 @@ CCProgram surface-fragment %{ distance = pow(distance, 10.0) * 1.0; #endif - return vec4(scatterParams.y, 0.0, 1.0, distance); + return vec4(scatterParams.y, 0.0, 1.0, distance * scatterParams.z); } #define CC_SURFACES_FRAGMENT_MODIFY_TRANSMIT_IN_SCATTERING_COLOR @@ -192,7 +192,7 @@ CCProgram surface-fragment %{ vec3 SurfacesFragmentModifyTransmitOutScatteringColor() { vec3 col = scatterColor.rgb; - #if USE_THICKNESS_MAP + #if USE_SCATTER_MAP col *= texture(scatterColorMap, FSInput_texcoord).rgb; #elif USE_ALBEDO_MAP col *= texture(albedoMap, FSInput_texcoord).rgb; @@ -200,6 +200,13 @@ CCProgram surface-fragment %{ return col; } + #include + #define CC_SURFACES_FRAGMENT_MODIFY_SHARED_DATA + void SurfacesFragmentModifySharedData(inout SurfacesMaterialData surfaceData) + { + surfaceData.metallic = 0.0; + } + #include }% diff --git a/editor/assets/effects/advanced/simple-skin.effect b/editor/assets/effects/advanced/simple-skin.effect index de07c46a9c..c4e28701d0 100644 --- a/editor/assets/effects/advanced/simple-skin.effect +++ b/editor/assets/effects/advanced/simple-skin.effect @@ -13,7 +13,6 @@ CCEffect %{ alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { parent: USE_ALPHA_TEST, slide: true, range: [0, 1.0], step: 0.001 } } 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 } } - 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 } diff --git a/editor/assets/effects/advanced/skin.effect b/editor/assets/effects/advanced/skin.effect index e8c98f0aca..ca1f4a1d82 100644 --- a/editor/assets/effects/advanced/skin.effect +++ b/editor/assets/effects/advanced/skin.effect @@ -14,7 +14,6 @@ CCEffect %{ alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { parent: USE_ALPHA_TEST, slide: true, range: [0, 1.0], step: 0.001 } } 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 } } - 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 }