fix punctual lights visibility issue with custom pipeline (#270) (#272)

This commit is contained in:
jk20012001
2026-08-15 15:36:26 +08:00
committed by GitHub
parent b710cb6e9b
commit 2d003cc616
2 changed files with 36 additions and 0 deletions
+16
View File
@@ -556,7 +556,11 @@ export class SceneCulling {
private executeSphereLightCulling (light: SphereLight, frustumCullingResult: Array<Model>, lightBoundsCullingResult: Array<Model>): 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<Model>, lightBoundsCullingResult: Array<Model>): 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<Model>, lightBoundsCullingResult: Array<Model>): 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<Model>,
lightBoundsCullingResult: Array<Model>,
): 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);
@@ -224,6 +224,10 @@ uint32_t isModelVisible(const scene::Model& model, uint32_t visibility) {
return visibility & static_cast<uint32_t>(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<uint32_t>(model.getVisFlags()));
@@ -432,8 +436,12 @@ void executeSphereLightCulling(
const ccstd::vector<const scene::Model*>& frustumCullingResult,
ccstd::vector<const scene::Model*>& 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<const scene::Model*>& 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<const scene::Model*>& frustumCullingResult,
ccstd::vector<const scene::Model*>& 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);