Fix Builtin reflection probe culling by passing the probe context to … (#186)

This commit is contained in:
xubing0906
2026-08-19 17:25:21 +08:00
committed by GitHub
parent ff436d6a27
commit 6b5c8556a2
3 changed files with 29 additions and 12 deletions
+6 -2
View File
@@ -195,10 +195,13 @@ function sceneCulling (
}
models.push(model);
} else if (probe.probeType === ProbeType.CUBE) {
if (!wBounds || !model.bakeToReflectionProbe) {
continue;
}
if (!isVisible(model, visibility)) {
continue;
}
if (wBounds && isIntersectAABB(wBounds, probe.boundingBox!)) {
if (isIntersectAABB(wBounds, probe.boundingBox!)) {
continue;
}
models.push(model);
@@ -475,7 +478,8 @@ export class SceneCulling {
);
// Get or create render queue
const renderQueueID = this.getOrCreateRenderQueue(renderQueueKey, sceneData.flags, sceneData.camera);
const renderCamera = sceneData.light.probe ? sceneData.light.probe.camera : sceneData.camera;
const renderQueueID = this.getOrCreateRenderQueue(renderQueueKey, sceneData.flags, renderCamera);
// add render queue query
const renderQueueQuery = this.cullingPools.renderQueueQueryRecycle.add();
+14 -1
View File
@@ -258,9 +258,19 @@ export class WebRenderQueueBuilder extends WebSetter implements RenderQueueBuild
addSceneOfCamera (camera: Camera, light: LightInfo, sceneFlags = SceneFlags.NONE, name = 'Camera'): void {
const lightTarget = light.light;
this.addScene(camera, sceneFlags, lightTarget);
const scene = light.probe?.node?.scene?.renderScene || undefined;
this._addScene(camera, sceneFlags, lightTarget, scene, light);
}
addScene (camera: Camera, sceneFlags = SceneFlags.NONE, light: Light | undefined | null = null, scene: RenderScene | undefined = undefined): SceneBuilder {
return this._addScene(camera, sceneFlags, light, scene);
}
private _addScene (
camera: Camera,
sceneFlags: SceneFlags,
light: Light | undefined | null,
scene: RenderScene | undefined,
lightInfo: LightInfo | null = null,
): SceneBuilder {
const sceneData = renderGraphPool.createSceneData(
scene || camera.scene,
camera,
@@ -268,6 +278,9 @@ export class WebRenderQueueBuilder extends WebSetter implements RenderQueueBuild
light && !(sceneFlags & SceneFlags.SHADOW_CASTER) ? CullingFlags.CAMERA_FRUSTUM | CullingFlags.LIGHT_BOUNDS : CullingFlags.CAMERA_FRUSTUM,
light,
);
if (lightInfo) {
sceneData.light.reset(lightInfo.light, lightInfo.level, lightInfo.culledByLight, lightInfo.probe);
}
const renderData = renderGraphPool.createRenderData();
const sceneId = this._renderGraph.addVertex<RenderGraphValue.Scene>(RenderGraphValue.Scene, sceneData, 'Scene', '', renderData, !DEBUG, this._vertID);
if (!(sceneFlags & SceneFlags.NON_BUILTIN)) {
@@ -669,8 +669,8 @@ export class BuiltinForwardPassBuilder implements rendering.PipelinePassBuilder
// Rendering
const probePass = ppl.addRenderPass(width, height, 'default');
probePass.name = `PlanarReflectionProbe${probeID}`;
this._buildReflectionProbePass(probePass, cameraConfigs, id, reflectionCamera,
colorName, depthStencilName, mainLight, scene);
this._buildReflectionProbePass(probePass, cameraConfigs, id, reflectionCamera, probe,
colorName, depthStencilName, mainLight);
} else if (EDITOR) {
for (let faceIdx = 0; faceIdx < probe.bakedCubeTextures.length; faceIdx++) {
probe.updateCameraDir(faceIdx);
@@ -686,8 +686,8 @@ export class BuiltinForwardPassBuilder implements rendering.PipelinePassBuilder
// Rendering
const probePass = ppl.addRenderPass(width, height, 'default');
probePass.name = `CubeProbe${probeID}${faceIdx}`;
this._buildReflectionProbePass(probePass, cameraConfigs, id, probe.camera,
colorName, depthStencilName, mainLight, scene);
this._buildReflectionProbePass(probePass, cameraConfigs, id, probe.camera, probe,
colorName, depthStencilName, mainLight);
}
probe.needRender = false;
}
@@ -702,10 +702,10 @@ export class BuiltinForwardPassBuilder implements rendering.PipelinePassBuilder
cameraConfigs: Readonly<CameraConfigs & ForwardPassConfigs>,
id: number,
camera: renderer.scene.Camera,
probe: renderer.scene.ReflectionProbe,
colorName: string,
depthStencilName: string,
mainLight: renderer.scene.DirectionalLight | null,
scene: renderer.RenderScene | null = null,
): void {
const QueueHint = rendering.QueueHint;
const SceneFlags = rendering.SceneFlags;
@@ -749,11 +749,11 @@ export class BuiltinForwardPassBuilder implements rendering.PipelinePassBuilder
// TODO(zhouzhenglong): Separate OPAQUE and MASK queue
// add opaque and mask queue
const lightInfo = new rendering.LightInfo(mainLight || null, 0, false, probe);
pass.addQueue(QueueHint.NONE, 'reflect-map') // Currently we put OPAQUE and MASK into one queue, so QueueHint is NONE
.addScene(camera,
SceneFlags.OPAQUE | SceneFlags.MASK | SceneFlags.REFLECTION_PROBE,
mainLight || undefined,
scene ? scene : undefined);
.addSceneOfCamera(camera,
lightInfo,
SceneFlags.OPAQUE | SceneFlags.MASK | SceneFlags.REFLECTION_PROBE);
}
private _addForwardRadiancePasses(
ppl: rendering.BasicPipeline,