[Bug] fix deferred pipeline dir-light effect error (#14407)

This commit is contained in:
troublemaker52025
2023-02-28 17:56:43 +08:00
committed by GitHub
parent 71b764ad0d
commit 056fda3e6a
4 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -64,7 +64,7 @@ const lightProbePatches: IMacroPatch[] = [
{ name: 'CC_USE_LIGHT_PROBE', value: true },
];
const CC_USE_REFLECTION_PROBE = 'CC_USE_REFLECTION_PROBE';
const CC_RECEIVE_DIRECTIONAL_LIGHT = 'CC_RECEIVE_DIRECTIONAL_LIGHT';
const CC_DISABLE_DIRECTIONAL_LIGHT = 'CC_DISABLE_DIRECTIONAL_LIGHT';
export enum ModelType {
DEFAULT,
SKINNING,
@@ -1092,7 +1092,7 @@ export class Model {
];
patches = patches ? patches.concat(reflectionProbePatches) : reflectionProbePatches;
const receiveDirLightPatches: IMacroPatch[] = [
{ name: CC_RECEIVE_DIRECTIONAL_LIGHT, value: this._receiveDirLight },
{ name: CC_DISABLE_DIRECTIONAL_LIGHT, value: !this._receiveDirLight },
];
patches = patches ? patches.concat(receiveDirLightPatches) : receiveDirLightPatches;
@@ -150,7 +150,7 @@ vec4 CCStandardShadingBase (StandardSurface s, vec4 shadowPos) {
#endif
#endif
#if CC_RECEIVE_DIRECTIONAL_LIGHT
#if !CC_DISABLE_DIRECTIONAL_LIGHT
float NV = max(abs(dot(N, V)), 0.0);
specular = BRDFApprox(specular, s.roughness, NV);
@@ -166,7 +166,7 @@
// dynamic & stationary dir light
lightingResult.directDiffuse = lightingResult.directSpecular = vec3(0.0);
#if CC_RECEIVE_DIRECTIONAL_LIGHT && !CC_FORWARD_ADD
#if !CC_DISABLE_DIRECTIONAL_LIGHT && !CC_FORWARD_ADD
CCSurfacesLightingCalculateColorWithLighting(lightingResult.diffuseColorWithLighting, lightingResult.specularColorWithLighting, surfaceData, lightingData);
CCSurfacesLightingCalculateDirect(lightingResult.directDiffuse, lightingResult.directSpecular, lightingData, cc_mainLitColor);
+2 -2
View File
@@ -65,7 +65,7 @@ const cc::gfx::SamplerInfo LIGHTMAP_SAMPLER_WITH_MIP_HASH{
const ccstd::vector<cc::scene::IMacroPatch> SHADOW_MAP_PATCHES{{"CC_RECEIVE_SHADOW", true}};
const ccstd::vector<cc::scene::IMacroPatch> LIGHT_PROBE_PATCHES{{"CC_USE_LIGHT_PROBE", true}};
const ccstd::string CC_USE_REFLECTION_PROBE = "CC_USE_REFLECTION_PROBE";
const ccstd::string CC_RECEIVE_DIRECTIONAL_LIGHT = "CC_RECEIVE_DIRECTIONAL_LIGHT";
const ccstd::string CC_DISABLE_DIRECTIONAL_LIGHT = "CC_DISABLE_DIRECTIONAL_LIGHT";
const ccstd::vector<cc::scene::IMacroPatch> STATIC_LIGHTMAP_PATHES{{"CC_USE_LIGHTMAP", 1}};
const ccstd::vector<cc::scene::IMacroPatch> STATIONARY_LIGHTMAP_PATHES{{"CC_USE_LIGHTMAP", 2}};
} // namespace
@@ -469,7 +469,7 @@ ccstd::vector<IMacroPatch> Model::getMacroPatches(index_t subModelIndex) {
}
}
}
patches.push_back({CC_RECEIVE_DIRECTIONAL_LIGHT, _receiveDirLight});
patches.push_back({CC_DISABLE_DIRECTIONAL_LIGHT, !_receiveDirLight});
return patches;
}