From 2eb37ff0d6c38e4e1e2d884d753df32d22ccdb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=85=B5?= <49358166+xubing0906@users.noreply.github.com> Date: Wed, 7 Jun 2023 23:47:52 +0800 Subject: [PATCH] reflection-probe-manager move to 3d module (#15359) * move to 3d module * export probetype * fix error --- cocos/3d/framework/index.ts | 2 -- cocos/3d/framework/mesh-renderer.ts | 2 +- cocos/3d/reflection-probe/index.ts | 2 ++ .../reflection-probe-component.ts | 2 +- .../reflection-probe-enum.ts | 0 .../reflection-probe-manager.ts | 20 +++++++++---------- cocos/render-scene/scene/model.ts | 2 +- cocos/rendering/custom/executor.ts | 13 ++++++------ cocos/rendering/index.ts | 1 - editor/exports/reflection-probe.ts | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) rename cocos/3d/{framework => reflection-probe}/reflection-probe-enum.ts (100%) rename cocos/{rendering => 3d/reflection-probe}/reflection-probe-manager.ts (97%) diff --git a/cocos/3d/framework/index.ts b/cocos/3d/framework/index.ts index 0639b813c0..d37def8114 100644 --- a/cocos/3d/framework/index.ts +++ b/cocos/3d/framework/index.ts @@ -24,7 +24,5 @@ */ export { MeshRenderer } from './mesh-renderer'; -export { ReflectionProbeType } from './reflection-probe-enum'; - /** deprecated */ export * from './deprecated'; diff --git a/cocos/3d/framework/mesh-renderer.ts b/cocos/3d/framework/mesh-renderer.ts index 80c8412266..1cba94e26c 100644 --- a/cocos/3d/framework/mesh-renderer.ts +++ b/cocos/3d/framework/mesh-renderer.ts @@ -38,7 +38,7 @@ import { NodeEventType } from '../../scene-graph/node-event'; import { Texture } from '../../gfx'; import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; import { settings, Settings } from '../../core/settings'; -import { ReflectionProbeType } from './reflection-probe-enum'; +import { ReflectionProbeType } from '../reflection-probe/reflection-probe-enum'; import { getPhaseID } from '../../rendering/pass-phase'; import { SubModel } from '../../render-scene/scene'; import { isEnableEffect } from '../../rendering/define'; diff --git a/cocos/3d/reflection-probe/index.ts b/cocos/3d/reflection-probe/index.ts index 14914f0198..5acc69c992 100644 --- a/cocos/3d/reflection-probe/index.ts +++ b/cocos/3d/reflection-probe/index.ts @@ -23,3 +23,5 @@ */ export { ReflectionProbe } from './reflection-probe-component'; +export { ReflectionProbeManager } from './reflection-probe-manager'; +export { ReflectionProbeType } from './reflection-probe-enum'; diff --git a/cocos/3d/reflection-probe/reflection-probe-component.ts b/cocos/3d/reflection-probe/reflection-probe-component.ts index 5ea0bf021a..eb24ff03c0 100644 --- a/cocos/3d/reflection-probe/reflection-probe-component.ts +++ b/cocos/3d/reflection-probe/reflection-probe-component.ts @@ -28,7 +28,7 @@ import { CCBoolean, CCObject, Color, Enum, Vec3 } from '../../core'; import { TextureCube } from '../../asset/assets'; import { scene } from '../../render-scene'; import { CAMERA_DEFAULT_MASK } from '../../rendering/define'; -import { ReflectionProbeManager } from '../../rendering/reflection-probe-manager'; +import { ReflectionProbeManager } from './reflection-probe-manager'; import { Component } from '../../scene-graph/component'; import { Layers } from '../../scene-graph/layers'; import { Camera } from '../../misc/camera-component'; diff --git a/cocos/3d/framework/reflection-probe-enum.ts b/cocos/3d/reflection-probe/reflection-probe-enum.ts similarity index 100% rename from cocos/3d/framework/reflection-probe-enum.ts rename to cocos/3d/reflection-probe/reflection-probe-enum.ts diff --git a/cocos/rendering/reflection-probe-manager.ts b/cocos/3d/reflection-probe/reflection-probe-manager.ts similarity index 97% rename from cocos/rendering/reflection-probe-manager.ts rename to cocos/3d/reflection-probe/reflection-probe-manager.ts index 404ff397b4..3e43789644 100644 --- a/cocos/rendering/reflection-probe-manager.ts +++ b/cocos/3d/reflection-probe/reflection-probe-manager.ts @@ -24,16 +24,16 @@ */ import { EDITOR } from 'internal:constants'; -import { MeshRenderer } from '../3d/framework/mesh-renderer'; -import { ReflectionProbeType } from '../3d/framework/reflection-probe-enum'; -import { ImageAsset, Texture2D } from '../asset/assets'; -import { PixelFormat } from '../asset/assets/asset-enum'; -import { Vec3, geometry, cclegacy } from '../core'; -import { AABB } from '../core/geometry'; -import { Texture } from '../gfx'; -import { Camera, Model } from '../render-scene/scene'; -import { ProbeType, ReflectionProbe } from '../render-scene/scene/reflection-probe'; -import { Layers } from '../scene-graph/layers'; +import { MeshRenderer } from '../framework/mesh-renderer'; +import { ReflectionProbeType } from './reflection-probe-enum'; +import { ImageAsset, Texture2D } from '../../asset/assets'; +import { PixelFormat } from '../../asset/assets/asset-enum'; +import { Vec3, geometry, cclegacy } from '../../core'; +import { AABB } from '../../core/geometry'; +import { Texture } from '../../gfx'; +import { Camera, Model } from '../../render-scene/scene'; +import { ProbeType, ReflectionProbe } from '../../render-scene/scene/reflection-probe'; +import { Layers } from '../../scene-graph/layers'; const REFLECTION_PROBE_DEFAULT_MASK = Layers.makeMaskExclude([Layers.BitMask.UI_2D, Layers.BitMask.UI_3D, Layers.BitMask.GIZMOS, Layers.BitMask.EDITOR, Layers.BitMask.SCENE_GIZMO, Layers.BitMask.PROFILER, Layers.Enum.IGNORE_RAYCAST]); diff --git a/cocos/render-scene/scene/model.ts b/cocos/render-scene/scene/model.ts index 0108933f84..1f052bfa85 100644 --- a/cocos/render-scene/scene/model.ts +++ b/cocos/render-scene/scene/model.ts @@ -41,7 +41,7 @@ import { Root } from '../../root'; import { TextureCube } from '../../asset/assets'; import { ShadowType } from './shadows'; import { ProbeType, ReflectionProbe } from './reflection-probe'; -import { ReflectionProbeType } from '../../3d/framework/reflection-probe-enum'; +import { ReflectionProbeType } from '../../3d/reflection-probe/reflection-probe-enum'; const m4_1 = new Mat4(); diff --git a/cocos/rendering/custom/executor.ts b/cocos/rendering/custom/executor.ts index d5a53fa004..9ed4289b28 100644 --- a/cocos/rendering/custom/executor.ts +++ b/cocos/rendering/custom/executor.ts @@ -62,7 +62,6 @@ import { DefaultVisitor, depthFirstSearch, ReferenceGraphView } from './graph'; import { VectorGraphColorMap } from './effect'; import { getDescBindingFromName, getDescriptorSetDataFromLayout, getDescriptorSetDataFromLayoutId, getRenderArea, mergeSrcToTargetDesc, updateGlobalDescBinding } from './define'; import { RenderReflectionProbeQueue } from '../render-reflection-probe-queue'; -import { ReflectionProbeManager } from '../reflection-probe-manager'; import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; import { Texture2D } from '../../asset/assets/texture-2d'; @@ -1026,11 +1025,13 @@ class DevicePreSceneTask extends WebSceneTask { if (this.graphScene.scene!.flags & SceneFlags.REFLECTION_PROBE && !this._submitInfo.reflectionProbe) { this._submitInfo.reflectionProbe = context.pools.addReflectionProbe(); this._submitInfo.reflectionProbe.clear(); - const probes = ReflectionProbeManager.probeManager.getProbes(); - for (let i = 0; i < probes.length; i++) { - if (probes[i].hasFrameBuffer(this._currentQueue.devicePass.framebuffer)) { - this._submitInfo.reflectionProbe.gatherRenderObjects(probes[i], this.camera, this._cmdBuff); - break; + if (cclegacy.internal.reflectionProbeManager) { + const probes = cclegacy.internal.reflectionProbeManager.getProbes(); + for (let i = 0; i < probes.length; i++) { + if (probes[i].hasFrameBuffer(this._currentQueue.devicePass.framebuffer)) { + this._submitInfo.reflectionProbe.gatherRenderObjects(probes[i], this.camera, this._cmdBuff); + break; + } } } return; diff --git a/cocos/rendering/index.ts b/cocos/rendering/index.ts index 7a5eab8820..d261599fb2 100644 --- a/cocos/rendering/index.ts +++ b/cocos/rendering/index.ts @@ -55,7 +55,6 @@ export { DebugView } from './debug-view'; export { ReflectionProbeFlow } from './reflection-probe/reflection-probe-flow'; export { ReflectionProbeStage } from './reflection-probe/reflection-probe-stage'; -export { ReflectionProbeManager } from './reflection-probe-manager'; export function createDefaultPipeline () { const rppl = new ForwardPipeline(); diff --git a/editor/exports/reflection-probe.ts b/editor/exports/reflection-probe.ts index 14721490c2..c3afa67f0b 100644 --- a/editor/exports/reflection-probe.ts +++ b/editor/exports/reflection-probe.ts @@ -1 +1 @@ -export { ReflectionProbeManager } from '../../cocos/rendering/reflection-probe-manager'; \ No newline at end of file +export { ReflectionProbeManager } from '../../cocos/3d/reflection-probe/reflection-probe-manager';