From 2d003cc61689a337e59d325201a8ed7c734c7c3f Mon Sep 17 00:00:00 2001 From: jk20012001 Date: Sat, 15 Aug 2026 15:36:26 +0800 Subject: [PATCH] fix punctual lights visibility issue with custom pipeline (#270) (#272) --- cocos/rendering/custom/scene-culling.ts | 16 +++++++++++++++ .../pipeline/custom/NativeSceneCulling.cpp | 20 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/cocos/rendering/custom/scene-culling.ts b/cocos/rendering/custom/scene-culling.ts index d44e927b7a..39e8685756 100644 --- a/cocos/rendering/custom/scene-culling.ts +++ b/cocos/rendering/custom/scene-culling.ts @@ -556,7 +556,11 @@ export class SceneCulling { private executeSphereLightCulling (light: SphereLight, frustumCullingResult: Array, lightBoundsCullingResult: Array): void { const lightAABB = light.aabb; + const visibility = light.visibility; for (const model of frustumCullingResult) { + if (!isVisible(model, visibility)) { + continue; + } const modelBounds = model.worldBounds; if (!modelBounds || intersect.aabbWithAABB(modelBounds, lightAABB)) { lightBoundsCullingResult.push(model); @@ -567,7 +571,11 @@ export class SceneCulling { private executeSpotLightCulling (light: SpotLight, frustumCullingResult: Array, lightBoundsCullingResult: Array): void { const lightAABB = light.aabb; const lightFrustum: Frustum = light.frustum; + const visibility = light.visibility; for (const model of frustumCullingResult) { + if (!isVisible(model, visibility)) { + continue; + } const modelBounds = model.worldBounds; if (!modelBounds || (intersect.aabbWithAABB(lightAABB, modelBounds) && intersect.aabbFrustum(modelBounds, lightFrustum))) { lightBoundsCullingResult.push(model); @@ -577,7 +585,11 @@ export class SceneCulling { private executePointLightCulling (light: PointLight, frustumCullingResult: Array, lightBoundsCullingResult: Array): void { const lightAABB = light.aabb; + const visibility = light.visibility; for (const model of frustumCullingResult) { + if (!isVisible(model, visibility)) { + continue; + } const modelBounds = model.worldBounds; if (!modelBounds || intersect.aabbWithAABB(lightAABB, modelBounds)) { lightBoundsCullingResult.push(model); @@ -590,8 +602,12 @@ export class SceneCulling { frustumCullingResult: Array, lightBoundsCullingResult: Array, ): void { + const visibility = light.visibility; rangedDirLightBoundingBox.transform(light.node!.worldMatrix, null, null, null, lightAABB); for (const model of frustumCullingResult) { + if (!isVisible(model, visibility)) { + continue; + } const modelBounds = model.worldBounds; if (!modelBounds || intersect.aabbWithAABB(lightAABB, modelBounds)) { lightBoundsCullingResult.push(model); diff --git a/native/cocos/renderer/pipeline/custom/NativeSceneCulling.cpp b/native/cocos/renderer/pipeline/custom/NativeSceneCulling.cpp index 32220eb0be..63355bb9aa 100644 --- a/native/cocos/renderer/pipeline/custom/NativeSceneCulling.cpp +++ b/native/cocos/renderer/pipeline/custom/NativeSceneCulling.cpp @@ -224,6 +224,10 @@ uint32_t isModelVisible(const scene::Model& model, uint32_t visibility) { return visibility & static_cast(model.getVisFlags()); } +uint32_t isVisible(const scene::Model& model, uint32_t visibility) { + return isNodeVisible(model.getNode(), visibility) || isModelVisible(model, visibility); +} + bool isReflectProbeMask(const scene::Model& model) { return ((model.getNode()->getLayer() & REFLECTION_PROBE_DEFAULT_MASK) == model.getNode()->getLayer()) || (REFLECTION_PROBE_DEFAULT_MASK & static_cast(model.getVisFlags())); @@ -432,8 +436,12 @@ void executeSphereLightCulling( const ccstd::vector& frustumCullingResult, ccstd::vector& lightBoundsCullingResult) { const auto& lightAABB = light.getAABB(); + const auto visibility = light.getVisibility(); for (const auto* const model : frustumCullingResult) { CC_EXPECTS(model); + if (!isVisible(*model, visibility)) { + continue; + } const auto* const modelBounds = model->getWorldBounds(); if (!modelBounds || modelBounds->aabbAabb(lightAABB)) { lightBoundsCullingResult.emplace_back(model); @@ -447,8 +455,12 @@ void executeSpotLightCulling( ccstd::vector& lightBoundsCullingResult) { const auto& lightAABB = light.getAABB(); const auto& lightFrustum = light.getFrustum(); + const auto visibility = light.getVisibility(); for (const auto* const model : frustumCullingResult) { CC_EXPECTS(model); + if (!isVisible(*model, visibility)) { + continue; + } const auto* const modelBounds = model->getWorldBounds(); if (!modelBounds || (modelBounds->aabbAabb(lightAABB) && modelBounds->aabbFrustum(lightFrustum))) { lightBoundsCullingResult.emplace_back(model); @@ -461,8 +473,12 @@ void executePointLightCulling( const ccstd::vector& frustumCullingResult, ccstd::vector& lightBoundsCullingResult) { const auto& lightAABB = light.getAABB(); + const auto visibility = light.getVisibility(); for (const auto* const model : frustumCullingResult) { CC_EXPECTS(model); + if (!isVisible(*model, visibility)) { + continue; + } const auto* const modelBounds = model->getWorldBounds(); if (!modelBounds || modelBounds->aabbAabb(lightAABB)) { lightBoundsCullingResult.emplace_back(model); @@ -479,8 +495,12 @@ void executeRangedDirectionalLightCulling( // light->getNode()->updateWorldTransform(); geometry::AABB lightAABB{}; rangedDirLightBoundingBox.transform(light.getNode()->getWorldMatrix(), &lightAABB); + const auto visibility = light.getVisibility(); for (const auto* const model : frustumCullingResult) { CC_EXPECTS(model); + if (!isVisible(*model, visibility)) { + continue; + } const auto* const modelBounds = model->getWorldBounds(); if (!modelBounds || modelBounds->aabbAabb(lightAABB)) { lightBoundsCullingResult.emplace_back(model);