reflection-probe-manager move to 3d module (#15359)

* move to 3d module

* export probetype

* fix error
This commit is contained in:
徐兵
2023-06-07 23:47:52 +08:00
committed by GitHub
parent 0a346b2fdd
commit 2eb37ff0d6
10 changed files with 23 additions and 23 deletions
-2
View File
@@ -24,7 +24,5 @@
*/
export { MeshRenderer } from './mesh-renderer';
export { ReflectionProbeType } from './reflection-probe-enum';
/** deprecated */
export * from './deprecated';
+1 -1
View File
@@ -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';
+2
View File
@@ -23,3 +23,5 @@
*/
export { ReflectionProbe } from './reflection-probe-component';
export { ReflectionProbeManager } from './reflection-probe-manager';
export { ReflectionProbeType } from './reflection-probe-enum';
@@ -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';
@@ -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]);
+1 -1
View File
@@ -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();
+7 -6
View File
@@ -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;
-1
View File
@@ -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();
+1 -1
View File
@@ -1 +1 @@
export { ReflectionProbeManager } from '../../cocos/rendering/reflection-probe-manager';
export { ReflectionProbeManager } from '../../cocos/3d/reflection-probe/reflection-probe-manager';