diff --git a/cocos/render-scene/scene/model.ts b/cocos/render-scene/scene/model.ts index 263d0d2f25..8c15ff48e1 100644 --- a/cocos/render-scene/scene/model.ts +++ b/cocos/render-scene/scene/model.ts @@ -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; diff --git a/editor/assets/chunks/legacy/shading-standard-base.chunk b/editor/assets/chunks/legacy/shading-standard-base.chunk index 8a41ebb56e..65f234681c 100644 --- a/editor/assets/chunks/legacy/shading-standard-base.chunk +++ b/editor/assets/chunks/legacy/shading-standard-base.chunk @@ -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); diff --git a/editor/assets/chunks/lighting-models/lighting-flow/common-flow.chunk b/editor/assets/chunks/lighting-models/lighting-flow/common-flow.chunk index a148e1d288..ca1d28fd7a 100644 --- a/editor/assets/chunks/lighting-models/lighting-flow/common-flow.chunk +++ b/editor/assets/chunks/lighting-models/lighting-flow/common-flow.chunk @@ -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); diff --git a/native/cocos/scene/Model.cpp b/native/cocos/scene/Model.cpp index 3571f43680..49f89e338c 100644 --- a/native/cocos/scene/Model.cpp +++ b/native/cocos/scene/Model.cpp @@ -65,7 +65,7 @@ const cc::gfx::SamplerInfo LIGHTMAP_SAMPLER_WITH_MIP_HASH{ const ccstd::vector SHADOW_MAP_PATCHES{{"CC_RECEIVE_SHADOW", true}}; const ccstd::vector 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 STATIC_LIGHTMAP_PATHES{{"CC_USE_LIGHTMAP", 1}}; const ccstd::vector STATIONARY_LIGHTMAP_PATHES{{"CC_USE_LIGHTMAP", 2}}; } // namespace @@ -469,7 +469,7 @@ ccstd::vector Model::getMacroPatches(index_t subModelIndex) { } } } - patches.push_back({CC_RECEIVE_DIRECTIONAL_LIGHT, _receiveDirLight}); + patches.push_back({CC_DISABLE_DIRECTIONAL_LIGHT, !_receiveDirLight}); return patches; }