diff --git a/cc.config.json b/cc.config.json index e9a1d051a9..517e541e42 100644 --- a/cc.config.json +++ b/cc.config.json @@ -156,17 +156,17 @@ "cocos/core/pipeline/render-pipeline.ts": "cocos/core/pipeline/render-pipeline.jsb.ts", "cocos/core/pipeline/geometry-renderer.ts": "cocos/core/pipeline/geometry-renderer.jsb.ts", "cocos/core/pipeline/custom/index.ts": "cocos/core/pipeline/custom/index.jsb.ts", - "cocos/core/renderer/core/native-pools.ts": "cocos/core/renderer/core/native-pools.jsb.ts", - "cocos/core/renderer/core/material-instance.ts": "cocos/core/renderer/core/material-instance.jsb.ts", - "cocos/core/renderer/core/pass.ts": "cocos/core/renderer/core/pass.jsb.ts", - "cocos/core/renderer/core/program-lib.ts": "cocos/core/renderer/core/program-lib.jsb.ts", - "cocos/core/renderer/core/render-window.ts": "cocos/core/renderer/core/render-window.jsb.ts", - "cocos/core/renderer/core/sampler-lib.ts": "cocos/core/renderer/core/sampler.jsb.ts", - "cocos/core/renderer/scene/camera.ts": "cocos/core/renderer/scene/camera.jsb.ts", - "cocos/core/renderer/scene/model.ts": "cocos/core/renderer/scene/model.jsb.ts", - "cocos/core/renderer/core/render-scene.ts": "cocos/core/renderer/core/render-scene.jsb.ts", - "cocos/core/renderer/scene/submodel.ts": "cocos/core/renderer/scene/submodel.jsb.ts", - "cocos/core/renderer/scene/index.ts": "cocos/core/renderer/scene/index.jsb.ts", + "cocos/render-scene/core/native-pools.ts": "cocos/render-scene/core/native-pools.jsb.ts", + "cocos/render-scene/core/material-instance.ts": "cocos/render-scene/core/material-instance.jsb.ts", + "cocos/render-scene/core/pass.ts": "cocos/render-scene/core/pass.jsb.ts", + "cocos/render-scene/core/program-lib.ts": "cocos/render-scene/core/program-lib.jsb.ts", + "cocos/render-scene/core/render-window.ts": "cocos/render-scene/core/render-window.jsb.ts", + "cocos/render-scene/core/sampler-lib.ts": "cocos/render-scene/core/sampler.jsb.ts", + "cocos/render-scene/scene/camera.ts": "cocos/render-scene/scene/camera.jsb.ts", + "cocos/render-scene/scene/model.ts": "cocos/render-scene/scene/model.jsb.ts", + "cocos/render-scene/core/render-scene.ts": "cocos/render-scene/core/render-scene.jsb.ts", + "cocos/render-scene/scene/submodel.ts": "cocos/render-scene/scene/submodel.jsb.ts", + "cocos/render-scene/scene/index.ts": "cocos/render-scene/scene/index.jsb.ts", "cocos/2d/renderer/native-2d.ts": "cocos/2d/renderer/native-2d.jsb.ts", "cocos/gfx/base/pipeline-state.ts": "cocos/gfx/base/pipeline-state.jsb.ts", "cocos/gfx/index.ts": "cocos/gfx/index.jsb.ts", diff --git a/cocos/2d/components/graphics.ts b/cocos/2d/components/graphics.ts index cd06ecced1..acf185cbaf 100644 --- a/cocos/2d/components/graphics.ts +++ b/cocos/2d/components/graphics.ts @@ -30,7 +30,7 @@ import { builtinResMgr } from '../../asset/asset-manager'; import { InstanceMaterialType, UIRenderer } from '../framework/ui-renderer'; import { director } from '../../core/director'; import { Color } from '../../core/math'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { IAssembler } from '../renderer/base'; import { IBatcher } from '../renderer/i-batcher'; import { LineCap, LineJoin } from '../assembler/graphics/types'; diff --git a/cocos/2d/framework/sprite-renderer.ts b/cocos/2d/framework/sprite-renderer.ts index 52c5a97b5e..0a5521dff2 100644 --- a/cocos/2d/framework/sprite-renderer.ts +++ b/cocos/2d/framework/sprite-renderer.ts @@ -28,7 +28,7 @@ import { Material } from '../../asset/assets'; import { Color, ModelRenderer, Vec2 } from '../../core'; import { legacyCC } from '../../core/global-exports'; import { ModelLocalBindings } from '../../core/pipeline/define'; -import { Model } from '../../core/renderer/scene'; +import { Model } from '../../render-scene/scene'; import { Root } from '../../core/root'; import { TransformBit } from '../../core/scene-graph/node-enum'; import { SpriteFrame } from '../assets/sprite-frame'; diff --git a/cocos/2d/renderer/batcher-2d.ts b/cocos/2d/renderer/batcher-2d.ts index 2eb838998d..64b71e635c 100644 --- a/cocos/2d/renderer/batcher-2d.ts +++ b/cocos/2d/renderer/batcher-2d.ts @@ -24,7 +24,7 @@ */ import { JSB } from 'internal:constants'; -import { Camera, Model } from '../../core/renderer/scene'; +import { Camera, Model } from '../../render-scene/scene'; import type { UIStaticBatch } from '../components/ui-static-batch'; import { Material } from '../../asset/assets/material'; import { RenderRoot2D, UIRenderer } from '../framework'; @@ -50,7 +50,7 @@ import { BaseRenderData, MeshRenderData } from './render-data'; import { UIMeshRenderer } from '../components/ui-mesh-renderer'; import { NativeBatcher2d, NativeUIMeshBuffer } from './native-2d'; import { MeshBuffer } from './mesh-buffer'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { builtinResMgr } from '../../asset/asset-manager'; import { RenderingSubMesh } from '../../asset/assets'; diff --git a/cocos/2d/renderer/draw-batch.ts b/cocos/2d/renderer/draw-batch.ts index 442f788008..f6751de472 100644 --- a/cocos/2d/renderer/draw-batch.ts +++ b/cocos/2d/renderer/draw-batch.ts @@ -26,10 +26,10 @@ import { Material } from '../../asset/assets/material'; import { Texture, Sampler, InputAssembler, DescriptorSet, Shader } from '../../gfx'; import { Node } from '../../core/scene-graph'; -import { Model } from '../../core/renderer/scene/model'; +import { Model } from '../../render-scene/scene/model'; import { Layers } from '../../core/scene-graph/layers'; import { legacyCC } from '../../core/global-exports'; -import { Pass } from '../../core/renderer/core/pass'; +import { Pass } from '../../render-scene/core/pass'; import { IBatcher } from './i-batcher'; const UI_VIS_FLAG = Layers.Enum.NONE | Layers.Enum.UI_3D; diff --git a/cocos/2d/renderer/i-batcher.ts b/cocos/2d/renderer/i-batcher.ts index 3729944d65..33cf9d815f 100644 --- a/cocos/2d/renderer/i-batcher.ts +++ b/cocos/2d/renderer/i-batcher.ts @@ -2,8 +2,8 @@ import { CachedArray, Node } from '../../core'; import { TextureBase } from '../../asset/assets/texture-base'; import { Device } from '../../gfx'; import { Attribute } from '../../gfx/base/define'; -import { Camera } from '../../core/renderer/scene/camera'; -import { Model } from '../../core/renderer/scene/model'; +import { Camera } from '../../render-scene/scene/camera'; +import { Model } from '../../render-scene/scene/model'; import { SpriteFrame } from '../assets/sprite-frame'; import { UIStaticBatch } from '../components/ui-static-batch'; import { UIRenderer, RenderRoot2D } from '../framework'; diff --git a/cocos/2d/renderer/native-2d.ts b/cocos/2d/renderer/native-2d.ts index c648c6edda..fb5e9973c8 100644 --- a/cocos/2d/renderer/native-2d.ts +++ b/cocos/2d/renderer/native-2d.ts @@ -1,7 +1,7 @@ import { Material } from '../../asset/assets'; import { Attribute, Device, Sampler, Texture } from '../../gfx'; import { Node } from '../../core/scene-graph'; -import { Model } from '../../core/renderer/scene'; +import { Model } from '../../render-scene/scene'; export declare class NativeRenderDrawInfo { constructor(); diff --git a/cocos/2d/renderer/render-draw-info.ts b/cocos/2d/renderer/render-draw-info.ts index 129b2df8bd..c47e55976c 100644 --- a/cocos/2d/renderer/render-draw-info.ts +++ b/cocos/2d/renderer/render-draw-info.ts @@ -3,7 +3,7 @@ import { IRenderData } from './render-data'; import { NativeRenderDrawInfo } from './native-2d'; import { Node } from '../../core'; import { Sampler, Texture } from '../../gfx'; -import { Model } from '../../core/renderer/scene'; +import { Model } from '../../render-scene/scene'; import { Material } from '../../asset/assets'; export enum AttrUInt8ArrayView { diff --git a/cocos/3d/assets/morph-rendering.ts b/cocos/3d/assets/morph-rendering.ts index 7d56afc3e0..93575ae7df 100644 --- a/cocos/3d/assets/morph-rendering.ts +++ b/cocos/3d/assets/morph-rendering.ts @@ -35,7 +35,7 @@ import { warn } from '../../core/platform/debug'; import { Morph, SubMeshMorph } from './morph'; import { assertIsNonNullable, assertIsTrue } from '../../core/data/utils/asserts'; import { log2, nextPow2 } from '../../core/math/bits'; -import { IMacroPatch } from '../../core/renderer'; +import { IMacroPatch } from '../../render-scene'; import { legacyCC } from '../../core/global-exports'; import { PixelFormat } from '../../asset/assets/asset-enum'; diff --git a/cocos/3d/framework/mesh-renderer.ts b/cocos/3d/framework/mesh-renderer.ts index f73f01c492..73ca0058d2 100644 --- a/cocos/3d/framework/mesh-renderer.ts +++ b/cocos/3d/framework/mesh-renderer.ts @@ -30,7 +30,7 @@ import { Texture2D } from '../../asset/assets'; import { Material } from '../../asset/assets/material'; import { Mesh } from '../assets/mesh'; import { Vec4 } from '../../core/math'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { MorphModel } from '../models/morph-model'; import { Root } from '../../core/root'; import { TransformBit } from '../../core/scene-graph/node-enum'; diff --git a/cocos/3d/lights/directional-light-component.ts b/cocos/3d/lights/directional-light-component.ts index 2d1b04d0cf..4628351ba2 100644 --- a/cocos/3d/lights/directional-light-component.ts +++ b/cocos/3d/lights/directional-light-component.ts @@ -26,9 +26,9 @@ import { ccclass, range, slide, type, editable, visible, help, executeInEditMode, menu, tooltip, serializable, formerlySerializedAs } from 'cc.decorator'; import { Light } from './light-component'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { legacyCC } from '../../core/global-exports'; -import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../core/renderer/scene'; +import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../render-scene/scene'; import { Root } from '../../core/root'; import { property } from '../../core/data/class-decorator'; import { CCBoolean, CCFloat } from '../../core/data/utils/attribute'; diff --git a/cocos/3d/lights/light-component.ts b/cocos/3d/lights/light-component.ts index a9f3f43d4c..7b6b09c013 100644 --- a/cocos/3d/lights/light-component.ts +++ b/cocos/3d/lights/light-component.ts @@ -27,7 +27,7 @@ import { ccclass, tooltip, range, slide, type, displayOrder, serializable, edita import { Component } from '../../core/components/component'; import { Color, Vec3 } from '../../core/math'; import { Enum } from '../../core/value-types'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { Root } from '../../core/root'; import { legacyCC } from '../../core/global-exports'; diff --git a/cocos/3d/lights/sphere-light-component.ts b/cocos/3d/lights/sphere-light-component.ts index 1db1b4893d..890caf6de5 100644 --- a/cocos/3d/lights/sphere-light-component.ts +++ b/cocos/3d/lights/sphere-light-component.ts @@ -24,10 +24,10 @@ */ import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs } from 'cc.decorator'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { Light, PhotometricTerm } from './light-component'; import { legacyCC } from '../../core/global-exports'; -import { Camera } from '../../core/renderer/scene'; +import { Camera } from '../../render-scene/scene'; import { Root } from '../../core/root'; /** diff --git a/cocos/3d/lights/spot-light-component.ts b/cocos/3d/lights/spot-light-component.ts index b79fdc0d9b..20404ef0f5 100644 --- a/cocos/3d/lights/spot-light-component.ts +++ b/cocos/3d/lights/spot-light-component.ts @@ -26,11 +26,11 @@ import { ccclass, range, slide, type, editable, displayOrder, help, executeInEditMode, menu, tooltip, serializable, formerlySerializedAs, visible } from 'cc.decorator'; import { toRadian } from '../../core/math'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { Light, PhotometricTerm } from './light-component'; import { legacyCC } from '../../core/global-exports'; import { Root } from '../../core/root'; -import { Camera, PCFType, ShadowType } from '../../core/renderer/scene'; +import { Camera, PCFType, ShadowType } from '../../render-scene/scene'; import { property } from '../../core/data/class-decorator'; import { CCBoolean, CCFloat } from '../../core/data/utils/attribute'; diff --git a/cocos/3d/models/baked-skinning-model.ts b/cocos/3d/models/baked-skinning-model.ts index ea4795edc3..51691d81ac 100644 --- a/cocos/3d/models/baked-skinning-model.ts +++ b/cocos/3d/models/baked-skinning-model.ts @@ -30,9 +30,9 @@ import { AABB } from '../../core/geometry'; import { BufferUsageBit, MemoryUsageBit, Attribute, DescriptorSet, Buffer, BufferInfo } from '../../gfx'; import { INST_JOINT_ANIM_INFO, UBOSkinningAnimation, UBOSkinningTexture, UNIFORM_JOINT_TEXTURE_BINDING } from '../../core/pipeline/define'; import { Node } from '../../core/scene-graph'; -import { IMacroPatch, Pass } from '../../core/renderer/core/pass'; +import { IMacroPatch, Pass } from '../../render-scene/core/pass'; import type { DataPoolManager } from '../skeletal-animation/data-pool-manager'; -import { ModelType } from '../../core/renderer/scene/model'; +import { ModelType } from '../../render-scene/scene/model'; import { IAnimInfo, IJointTextureHandle } from '../skeletal-animation/skeletal-animation-utils'; import { MorphModel } from './morph-model'; import { legacyCC } from '../../core/global-exports'; diff --git a/cocos/3d/models/morph-model.ts b/cocos/3d/models/morph-model.ts index e0dddc3ab5..5f89a741ab 100644 --- a/cocos/3d/models/morph-model.ts +++ b/cocos/3d/models/morph-model.ts @@ -23,12 +23,12 @@ THE SOFTWARE. */ -import { Model } from '../../core/renderer/scene/model'; +import { Model } from '../../render-scene/scene/model'; import { MorphRenderingInstance } from '../assets/morph-rendering'; import { Material } from '../../asset/assets/material'; import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; import { DescriptorSet } from '../../gfx'; -import { IMacroPatch } from '../../core/renderer'; +import { IMacroPatch } from '../../render-scene'; /** * @en diff --git a/cocos/3d/models/skinning-model.ts b/cocos/3d/models/skinning-model.ts index bf1537eca1..2ed86bf0d0 100644 --- a/cocos/3d/models/skinning-model.ts +++ b/cocos/3d/models/skinning-model.ts @@ -32,11 +32,11 @@ import { BufferUsageBit, MemoryUsageBit, DescriptorSet, Buffer, BufferInfo, Attr import { Mat4, Vec3 } from '../../core/math'; import { UBOSkinning, UNIFORM_REALTIME_JOINT_TEXTURE_BINDING } from '../../core/pipeline/define'; import { Node } from '../../core/scene-graph/node'; -import { ModelType } from '../../core/renderer/scene/model'; +import { ModelType } from '../../render-scene/scene/model'; import { uploadJointData } from '../skeletal-animation/skeletal-animation-utils'; import { MorphModel } from './morph-model'; import { deleteTransform, getTransform, getWorldMatrix, IJointTransform } from '../../animation/skeletal-animation-utils'; -import { IMacroPatch, BatchingSchemes, Pass } from '../../core/renderer'; +import { IMacroPatch, BatchingSchemes, Pass } from '../../render-scene'; import { warnID } from '../../core/platform/debug'; import { director } from '../../core'; import { PixelFormat } from '../../asset/assets/asset-enum'; diff --git a/cocos/3d/skeletal-animation/skeletal-animation-utils.ts b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts index 2b967c025a..1162e6cd34 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-utils.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts @@ -35,7 +35,7 @@ import { BufferUsageBit, Format, FormatInfos, import { Mat4, Quat, Vec3 } from '../../core/math'; import { UBOSkinningAnimation } from '../../core/pipeline/define'; import { Node } from '../../core/scene-graph'; -import { ITextureBufferHandle, TextureBufferPool } from '../../core/renderer/core/texture-buffer-pool'; +import { ITextureBufferHandle, TextureBufferPool } from '../../render-scene/core/texture-buffer-pool'; import { jointTextureSamplerInfo } from '../misc/joint-texture-sampler-info'; // change here and cc-skinning.chunk to use other skinning algorithms diff --git a/cocos/animation/value-proxy-factories/uniform.ts b/cocos/animation/value-proxy-factories/uniform.ts index 8b801c77b6..6e09a20fd2 100644 --- a/cocos/animation/value-proxy-factories/uniform.ts +++ b/cocos/animation/value-proxy-factories/uniform.ts @@ -29,8 +29,8 @@ import { Material } from '../../asset/assets/material'; import { SpriteFrame } from '../../2d/assets/sprite-frame'; import { TextureBase } from '../../asset/assets/texture-base'; import { deviceManager, Type } from '../../gfx'; -import { Pass } from '../../core/renderer/core/pass'; -import { getDefaultFromType } from '../../core/renderer/core/pass-utils'; +import { Pass } from '../../render-scene/core/pass'; +import { getDefaultFromType } from '../../render-scene/core/pass-utils'; import { IValueProxy, IValueProxyFactory } from '../value-proxy'; import { warn } from '../../core/platform/debug'; diff --git a/cocos/asset/assets/effect-asset.ts b/cocos/asset/assets/effect-asset.ts index 39cbc55f9e..12752ea404 100644 --- a/cocos/asset/assets/effect-asset.ts +++ b/cocos/asset/assets/effect-asset.ts @@ -29,8 +29,8 @@ import { Root } from '../../core/root'; import { BlendState, DepthStencilState, RasterizerState, DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format, deviceManager } from '../../gfx'; import { RenderPassStage } from '../../core/pipeline/define'; -import { MacroRecord } from '../../core/renderer/core/pass-utils'; -import { programLib } from '../../core/renderer/core/program-lib'; +import { MacroRecord } from '../../render-scene/core/pass-utils'; +import { programLib } from '../../render-scene/core/program-lib'; import { Asset } from './asset'; import { legacyCC } from '../../core/global-exports'; import { warnID } from '../../core/platform/debug'; diff --git a/cocos/asset/assets/material.ts b/cocos/asset/assets/material.ts index 75b9676a4d..8bd7ae49df 100644 --- a/cocos/asset/assets/material.ts +++ b/cocos/asset/assets/material.ts @@ -29,8 +29,8 @@ import { EffectAsset } from './effect-asset'; import { Texture, Type } from '../../gfx'; import { TextureBase } from './texture-base'; import { legacyCC } from '../../core/global-exports'; -import { IPassInfoFull, Pass, PassOverrides } from '../../core/renderer/core/pass'; -import { MacroRecord, MaterialProperty } from '../../core/renderer/core/pass-utils'; +import { IPassInfoFull, Pass, PassOverrides } from '../../render-scene/core/pass'; +import { MacroRecord, MaterialProperty } from '../../render-scene/core/pass-utils'; import { Color } from '../../core/math/color'; import { warnID } from '../../core/platform/debug'; import { Vec4 } from '../../core/math'; diff --git a/cocos/asset/assets/render-texture.ts b/cocos/asset/assets/render-texture.ts index 0f0d89ebf4..eee42a72c2 100644 --- a/cocos/asset/assets/render-texture.ts +++ b/cocos/asset/assets/render-texture.ts @@ -28,7 +28,7 @@ import { EDITOR, TEST } from 'internal:constants'; import { clamp } from '../../core/math/utils'; import { Texture, ColorAttachment, DepthStencilAttachment, GeneralBarrierInfo, AccessFlagBit, RenderPassInfo, Format, deviceManager } from '../../gfx'; import { legacyCC } from '../../core/global-exports'; -import { RenderWindow, IRenderWindowInfo } from '../../core/renderer/core/render-window'; +import { RenderWindow, IRenderWindowInfo } from '../../render-scene/core/render-window'; import { Root } from '../../core/root'; import { TextureBase } from './texture-base'; import { BufferTextureCopy } from '../../gfx/base/define'; diff --git a/cocos/core/components/camera-component.ts b/cocos/core/components/camera-component.ts index 48bb13478b..d84151a498 100644 --- a/cocos/core/components/camera-component.ts +++ b/cocos/core/components/camera-component.ts @@ -31,16 +31,16 @@ import { Component } from './component'; import { Ray } from '../geometry'; import { Color, Rect, toRadian, Vec3 } from '../math'; import { CAMERA_DEFAULT_MASK } from '../pipeline/define'; -import { scene } from '../renderer'; +import { scene } from '../../render-scene'; import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter, - CameraType, TrackingType } from '../renderer/scene/camera'; + CameraType, TrackingType } from '../../render-scene/scene/camera'; import { Root } from '../root'; import { Node } from '../scene-graph/node'; import { Layers } from '../scene-graph/layers'; import { Enum } from '../value-types'; import { TransformBit } from '../scene-graph/node-enum'; import { legacyCC } from '../global-exports'; -import { RenderWindow } from '../renderer/core/render-window'; +import { RenderWindow } from '../../render-scene/core/render-window'; import { ClearFlagBit } from '../../gfx'; const _temp_vec3_1 = new Vec3(); diff --git a/cocos/core/components/component.ts b/cocos/core/components/component.ts index 7a1d377f1d..367da38141 100644 --- a/cocos/core/components/component.ts +++ b/cocos/core/components/component.ts @@ -30,7 +30,7 @@ import { Script } from '../../asset/assets/scripts'; import { CCObject } from '../data/object'; import IDGenerator from '../utils/id-generator'; import { getClassName, value } from '../utils/js'; -import { RenderScene } from '../renderer/core/render-scene'; +import { RenderScene } from '../../render-scene/core/render-scene'; import { Rect } from '../math'; import * as RF from '../data/utils/requiring-frame'; import { Node } from '../scene-graph'; diff --git a/cocos/core/components/model-renderer.ts b/cocos/core/components/model-renderer.ts index c8e7056318..c16016eae6 100644 --- a/cocos/core/components/model-renderer.ts +++ b/cocos/core/components/model-renderer.ts @@ -26,7 +26,7 @@ import { ccclass, serializable, } from 'cc.decorator'; -import { scene } from '../renderer'; +import { scene } from '../../render-scene'; import { Layers } from '../scene-graph/layers'; import { Renderer } from './renderer'; diff --git a/cocos/core/components/renderer.ts b/cocos/core/components/renderer.ts index bd0ec386f5..8b39aed8f0 100644 --- a/cocos/core/components/renderer.ts +++ b/cocos/core/components/renderer.ts @@ -29,7 +29,7 @@ import { } from 'cc.decorator'; import { Material } from '../../asset/assets/material'; import { Component } from './component'; -import { IMaterialInstanceInfo, MaterialInstance } from '../renderer/core/material-instance'; +import { IMaterialInstanceInfo, MaterialInstance } from '../../render-scene/core/material-instance'; import { warnID } from '../platform/debug'; const _matInsInfo: IMaterialInstanceInfo = { diff --git a/cocos/core/deprecated.ts b/cocos/core/deprecated.ts index d06847f161..43a48d91dc 100644 --- a/cocos/core/deprecated.ts +++ b/cocos/core/deprecated.ts @@ -27,7 +27,7 @@ import { replaceProperty, removeProperty, markAsWarning } from './utils/x-deprec import * as math from './math'; import { Scheduler } from './scheduler'; import { legacyCC } from './global-exports'; -import { SubModel } from './renderer/scene/submodel'; +import { SubModel } from '../render-scene/scene/submodel'; import { Root } from './root'; import { game } from './game'; import System from './components/system'; diff --git a/cocos/core/geometry/frustum.ts b/cocos/core/geometry/frustum.ts index 0415c871b2..da1ab4926d 100644 --- a/cocos/core/geometry/frustum.ts +++ b/cocos/core/geometry/frustum.ts @@ -24,7 +24,7 @@ */ import { Mat4, Vec3 } from '../math'; -import { Camera } from '../renderer/scene'; +import { Camera } from '../../render-scene/scene'; import enums from './enums'; import { Plane } from './plane'; import { AABB } from './aabb'; diff --git a/cocos/core/geometry/intersect.ts b/cocos/core/geometry/intersect.ts index 337bcdb015..9e196e8517 100644 --- a/cocos/core/geometry/intersect.ts +++ b/cocos/core/geometry/intersect.ts @@ -40,7 +40,7 @@ import { Mesh } from '../../3d/assets/mesh'; import { IBArray, RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; import { IRaySubMeshOptions, ERaycastMode, IRaySubMeshResult, IRayMeshOptions, IRayModelOptions } from './spec'; import { IVec3Like } from '../math/type-define'; -import { scene } from '../renderer'; +import { scene } from '../../render-scene'; /** * @en diff --git a/cocos/core/pipeline/batched-buffer.ts b/cocos/core/pipeline/batched-buffer.ts index 1a2c415661..d2b9e117d3 100644 --- a/cocos/core/pipeline/batched-buffer.ts +++ b/cocos/core/pipeline/batched-buffer.ts @@ -26,10 +26,10 @@ import { BufferUsageBit, Format, MemoryUsageBit, Device, DescriptorSet, InputAssembler, InputAssemblerInfo, Attribute, Buffer, BufferInfo, Shader } from '../../gfx'; import { Mat4 } from '../math'; -import { SubModel } from '../renderer/scene/submodel'; +import { SubModel } from '../../render-scene/scene/submodel'; import { UBOLocalBatched } from './define'; -import { Pass } from '../renderer'; -import { Model } from '../renderer/scene'; +import { Pass } from '../../render-scene'; +import { Model } from '../../render-scene/scene'; export interface IBatchedItem { vbs: Buffer[]; diff --git a/cocos/core/pipeline/custom/builtin-pipelines.ts b/cocos/core/pipeline/custom/builtin-pipelines.ts index 445717b05d..3f1d89a78d 100644 --- a/cocos/core/pipeline/custom/builtin-pipelines.ts +++ b/cocos/core/pipeline/custom/builtin-pipelines.ts @@ -2,7 +2,7 @@ import { Material } from '../../../asset/assets'; import { intersect, Sphere } from '../../geometry'; import { ClearFlagBit, Color, Format, LoadOp, Rect, StoreOp, Viewport } from '../../../gfx'; import { macro } from '../../platform'; -import { Camera, CSMLevel, DirectionalLight, Light, LightType, ShadowType, SKYBOX_FLAG, SpotLight } from '../../renderer/scene'; +import { Camera, CSMLevel, DirectionalLight, Light, LightType, ShadowType, SKYBOX_FLAG, SpotLight } from '../../../render-scene/scene'; import { supportsR32FloatTexture } from '../define'; import { SRGBToLinear } from '../pipeline-funcs'; import { AccessType, AttachmentType, ComputeView, LightInfo, QueueHint, RasterView, ResourceResidency, SceneFlags } from './types'; diff --git a/cocos/core/pipeline/custom/executor.ts b/cocos/core/pipeline/custom/executor.ts index f5cbc430d2..2719b9f1ba 100644 --- a/cocos/core/pipeline/custom/executor.ts +++ b/cocos/core/pipeline/custom/executor.ts @@ -39,11 +39,11 @@ import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, BufferVie import { legacyCC } from '../../global-exports'; import { Vec3 } from '../../math/vec3'; import { Vec4 } from '../../math/vec4'; -import { BatchingSchemes } from '../../renderer'; -import { DirectionalLight } from '../../renderer/scene'; -import { Camera } from '../../renderer/scene/camera'; -import { LightType } from '../../renderer/scene/light'; -import { CSMLevel, ShadowType } from '../../renderer/scene/shadows'; +import { BatchingSchemes } from '../../../render-scene'; +import { DirectionalLight } from '../../../render-scene/scene'; +import { Camera } from '../../../render-scene/scene/camera'; +import { LightType } from '../../../render-scene/scene/light'; +import { CSMLevel, ShadowType } from '../../../render-scene/scene/shadows'; import { Root } from '../../root'; import { BatchedBuffer } from '../batched-buffer'; import { SetIndex, UBODeferredLight, UBOForwardLight, UBOLocal } from '../define'; diff --git a/cocos/core/pipeline/custom/pipeline.ts b/cocos/core/pipeline/custom/pipeline.ts index 032f3f250f..e5180f11cd 100644 --- a/cocos/core/pipeline/custom/pipeline.ts +++ b/cocos/core/pipeline/custom/pipeline.ts @@ -30,19 +30,19 @@ */ /* eslint-disable max-len */ import { Material } from '../../../asset/assets'; -import { Camera } from '../../renderer/scene/camera'; +import { Camera } from '../../../render-scene/scene/camera'; import { GeometryRenderer } from '../geometry-renderer'; import { Buffer, Color, CommandBuffer, DescriptorSet, DescriptorSetLayout, Device, DrawInfo, Format, InputAssembler, PipelineState, Rect, Sampler, Swapchain, Texture, UniformBlock, Viewport } from '../../../gfx'; import { GlobalDSManager } from '../global-descriptor-set-manager'; import { DescriptorBlockFlattened, DescriptorBlockIndex } from './layout-graph'; import { Mat4, Quat, Vec2, Vec4 } from '../../math'; -import { MacroRecord } from '../../renderer/core/pass-utils'; +import { MacroRecord } from '../../../render-scene/core/pass-utils'; import { PipelineSceneData } from '../pipeline-scene-data'; import { ComputeView, LightInfo, QueueHint, RasterView, ResourceResidency, SceneFlags, TaskType, UpdateFrequency } from './types'; import { CopyPair, MovePair } from './render-graph'; -import { RenderScene } from '../../renderer/core/render-scene'; -import { RenderWindow } from '../../renderer/core/render-window'; -import { Model } from '../../renderer/scene'; +import { RenderScene } from '../../../render-scene/core/render-scene'; +import { RenderWindow } from '../../../render-scene/core/render-window'; +import { Model } from '../../../render-scene/scene'; export abstract class PipelineRuntime { public abstract activate(swapchain: Swapchain): boolean; diff --git a/cocos/core/pipeline/custom/render-graph.ts b/cocos/core/pipeline/custom/render-graph.ts index 7779b8e7cc..00d6d38238 100644 --- a/cocos/core/pipeline/custom/render-graph.ts +++ b/cocos/core/pipeline/custom/render-graph.ts @@ -31,7 +31,7 @@ /* eslint-disable max-len */ import * as impl from './graph'; import { Material } from '../../../asset/assets'; -import { Camera } from '../../renderer/scene/camera'; +import { Camera } from '../../../render-scene/scene/camera'; import { AccessFlagBit, Buffer, ClearFlagBit, Color, Format, Framebuffer, SampleCount, Sampler, Swapchain, Texture, TextureFlagBit, Viewport } from '../../../gfx'; import { ComputeView, LightInfo, QueueHint, RasterView, ResourceDimension, ResourceFlags, ResourceResidency, SceneFlags } from './types'; diff --git a/cocos/core/pipeline/custom/types.ts b/cocos/core/pipeline/custom/types.ts index bd243362c9..dad24d5f56 100644 --- a/cocos/core/pipeline/custom/types.ts +++ b/cocos/core/pipeline/custom/types.ts @@ -30,7 +30,7 @@ */ /* eslint-disable max-len */ import { ClearFlagBit, Color, LoadOp, StoreOp } from '../../../gfx'; -import { Light } from '../../renderer/scene'; +import { Light } from '../../../render-scene/scene'; export const enum UpdateFrequency { PER_INSTANCE, diff --git a/cocos/core/pipeline/custom/web-pipeline.ts b/cocos/core/pipeline/custom/web-pipeline.ts index 4218d52e9b..5900c94674 100644 --- a/cocos/core/pipeline/custom/web-pipeline.ts +++ b/cocos/core/pipeline/custom/web-pipeline.ts @@ -31,15 +31,15 @@ import { ComputeView, LightInfo, LightingMode, QueueHint, RasterView, ResourceDi import { Blit, ClearView, ComputePass, CopyPair, CopyPass, Dispatch, ManagedResource, MovePair, MovePass, RasterPass, RenderData, RenderGraph, RenderGraphComponent, RenderGraphValue, RenderQueue, RenderSwapchain, ResourceDesc, ResourceGraph, ResourceGraphValue, ResourceStates, ResourceTraits, SceneData } from './render-graph'; import { ComputePassBuilder, ComputeQueueBuilder, CopyPassBuilder, LayoutGraphBuilder, MovePassBuilder, Pipeline, PipelineBuilder, RasterPassBuilder, RasterQueueBuilder, SceneTransversal } from './pipeline'; import { PipelineSceneData } from '../pipeline-scene-data'; -import { Model, Camera, ShadowType, CSMLevel, DirectionalLight, SpotLight, PCFType, Shadows } from '../../renderer/scene'; -import { Light, LightType } from '../../renderer/scene/light'; +import { Model, Camera, ShadowType, CSMLevel, DirectionalLight, SpotLight, PCFType, Shadows } from '../../../render-scene/scene'; +import { Light, LightType } from '../../../render-scene/scene/light'; import { legacyCC } from '../../global-exports'; import { LayoutGraphData } from './layout-graph'; import { Executor } from './executor'; -import { RenderWindow } from '../../renderer/core/render-window'; +import { RenderWindow } from '../../../render-scene/core/render-window'; import { assert } from '../../platform/debug'; import { macro } from '../../platform/macro'; -import { MacroRecord, RenderScene } from '../../renderer'; +import { MacroRecord, RenderScene } from '../../../render-scene'; import { GlobalDSManager } from '../global-descriptor-set-manager'; import { supportsR32FloatTexture } from '../define'; import { OS } from '../../../../pal/system-info/enum-type'; diff --git a/cocos/core/pipeline/custom/web-scene.ts b/cocos/core/pipeline/custom/web-scene.ts index 12faee61ca..4e0cdd9dbd 100644 --- a/cocos/core/pipeline/custom/web-scene.ts +++ b/cocos/core/pipeline/custom/web-scene.ts @@ -24,9 +24,9 @@ ****************************************************************************/ import { Frustum, intersect } from '../../geometry'; -import { Mat4, Vec3 } from '../../math'; -import { RenderScene } from '../../renderer'; -import { Camera, DirectionalLight, Model, Shadows, ShadowType, SKYBOX_FLAG, SubModel } from '../../renderer/scene'; +import { Vec3 } from '../../math'; +import { RenderScene } from '../../../render-scene'; +import { Camera, Model, ShadowType, SKYBOX_FLAG } from '../../../render-scene/scene'; import { IRenderObject, IRenderPass, UBOShadow } from '../define'; import { PipelineSceneData } from '../pipeline-scene-data'; import { SceneTask, SceneTransversal, SceneVisitor } from './pipeline'; diff --git a/cocos/core/pipeline/deferred/bloom-stage.ts b/cocos/core/pipeline/deferred/bloom-stage.ts index 79cc1a9659..8e033fed45 100644 --- a/cocos/core/pipeline/deferred/bloom-stage.ts +++ b/cocos/core/pipeline/deferred/bloom-stage.ts @@ -28,7 +28,7 @@ */ import { ccclass, displayOrder, serializable, type } from 'cc.decorator'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { SetIndex } from '../define'; import { RenderFlow, RenderPipeline } from '..'; import { Material } from '../../../asset/assets/material'; diff --git a/cocos/core/pipeline/deferred/deferred-pipeline.ts b/cocos/core/pipeline/deferred/deferred-pipeline.ts index e787c8c153..0613135537 100644 --- a/cocos/core/pipeline/deferred/deferred-pipeline.ts +++ b/cocos/core/pipeline/deferred/deferred-pipeline.ts @@ -40,7 +40,7 @@ import { Format, StoreOp, RenderPassInfo, Texture, AccessFlagBit, Framebuffer, TextureInfo, TextureType, TextureUsageBit, FramebufferInfo, Swapchain, GeneralBarrierInfo } from '../../../gfx'; import { UBOGlobal, UBOCamera, UBOShadow, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING } from '../define'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { errorID } from '../../platform/debug'; import { DeferredPipelineSceneData } from './deferred-pipeline-scene-data'; import { PipelineEventType } from '../pipeline-event'; diff --git a/cocos/core/pipeline/deferred/gbuffer-stage.ts b/cocos/core/pipeline/deferred/gbuffer-stage.ts index 8fd95cb270..8f25837bc0 100644 --- a/cocos/core/pipeline/deferred/gbuffer-stage.ts +++ b/cocos/core/pipeline/deferred/gbuffer-stage.ts @@ -28,7 +28,7 @@ */ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { SetIndex } from '../define'; import { getPhaseID } from '../pass-phase'; import { renderQueueClearFunc, RenderQueue, convertRenderQueue, renderQueueSortFunc } from '../render-queue'; @@ -38,7 +38,7 @@ import { RenderBatchedQueue } from '../render-batched-queue'; import { RenderInstancedQueue } from '../render-instanced-queue'; import { IRenderStageInfo, RenderStage } from '../render-stage'; import { DeferredStagePriority } from '../enum'; -import { BatchingSchemes } from '../../renderer/core/pass'; +import { BatchingSchemes } from '../../../render-scene/core/pass'; import { DeferredPipeline } from './deferred-pipeline'; import { RenderQueueDesc, RenderQueueSortMode } from '../pipeline-serialization'; import { MainFlow } from './main-flow'; diff --git a/cocos/core/pipeline/deferred/lighting-stage.ts b/cocos/core/pipeline/deferred/lighting-stage.ts index 747403d9c2..0e10cc50b8 100644 --- a/cocos/core/pipeline/deferred/lighting-stage.ts +++ b/cocos/core/pipeline/deferred/lighting-stage.ts @@ -28,7 +28,7 @@ */ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { UBODeferredLight, SetIndex, UBOForwardLight, UBOLocal } from '../define'; import { getPhaseID } from '../pass-phase'; import { Color, Rect, Buffer, BufferUsageBit, MemoryUsageBit, BufferInfo, BufferViewInfo, DescriptorSet, @@ -46,7 +46,7 @@ import { DeferredPipelineSceneData } from './deferred-pipeline-scene-data'; import { renderQueueClearFunc, RenderQueue, convertRenderQueue, renderQueueSortFunc } from '../render-queue'; import { RenderQueueDesc } from '../pipeline-serialization'; import { UIPhase } from '../ui-phase'; -import { Pass } from '../../renderer/core/pass'; +import { Pass } from '../../../render-scene/core/pass'; const colors: Color[] = [new Color(0, 0, 0, 1)]; diff --git a/cocos/core/pipeline/deferred/main-flow.ts b/cocos/core/pipeline/deferred/main-flow.ts index bf3db00ec5..d1ff7d0f9b 100644 --- a/cocos/core/pipeline/deferred/main-flow.ts +++ b/cocos/core/pipeline/deferred/main-flow.ts @@ -28,7 +28,7 @@ */ import { ccclass } from 'cc.decorator'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { PIPELINE_FLOW_MAIN } from '../define'; import { IRenderFlowInfo, RenderFlow } from '../render-flow'; import { DeferredFlowPriority } from '../enum'; diff --git a/cocos/core/pipeline/deferred/postprocess-stage.ts b/cocos/core/pipeline/deferred/postprocess-stage.ts index 8c896da109..100c63463c 100644 --- a/cocos/core/pipeline/deferred/postprocess-stage.ts +++ b/cocos/core/pipeline/deferred/postprocess-stage.ts @@ -27,7 +27,7 @@ * @category pipeline */ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { SetIndex, UBOLocal } from '../define'; import { Color, Rect, PipelineState, ClearFlagBit, DescriptorSetInfo, BufferInfo, BufferUsageBit, MemoryUsageBit } from '../../../gfx'; import { IRenderStageInfo, RenderStage } from '../render-stage'; diff --git a/cocos/core/pipeline/define.ts b/cocos/core/pipeline/define.ts index 1464286701..baccc95f49 100644 --- a/cocos/core/pipeline/define.ts +++ b/cocos/core/pipeline/define.ts @@ -23,9 +23,9 @@ THE SOFTWARE. */ -import { Pass } from '../renderer/core/pass'; -import { Model } from '../renderer/scene/model'; -import { SubModel } from '../renderer/scene/submodel'; +import { Pass } from '../../render-scene/core/pass'; +import { Model } from '../../render-scene/scene/model'; +import { SubModel } from '../../render-scene/scene/submodel'; import { Layers } from '../scene-graph/layers'; import { legacyCC } from '../global-exports'; import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit, UniformStorageBuffer, DescriptorSetLayoutBinding, diff --git a/cocos/core/pipeline/forward/forward-flow.ts b/cocos/core/pipeline/forward/forward-flow.ts index dd23aea696..0e8cf3c74d 100644 --- a/cocos/core/pipeline/forward/forward-flow.ts +++ b/cocos/core/pipeline/forward/forward-flow.ts @@ -29,9 +29,7 @@ import { IRenderFlowInfo, RenderFlow } from '../render-flow'; import { ForwardFlowPriority } from '../enum'; import { ForwardStage } from './forward-stage'; import { RenderPipeline } from '../render-pipeline'; -import { Camera } from '../../renderer/scene'; -import { PostProcessStage } from '../deferred/postprocess-stage'; -import { BloomStage } from '../deferred/bloom-stage'; +import { Camera } from '../../../render-scene/scene'; /** * @en The forward flow in forward render pipeline diff --git a/cocos/core/pipeline/forward/forward-pipeline.ts b/cocos/core/pipeline/forward/forward-pipeline.ts index 16c7d2697c..440ba6761b 100644 --- a/cocos/core/pipeline/forward/forward-pipeline.ts +++ b/cocos/core/pipeline/forward/forward-pipeline.ts @@ -33,7 +33,7 @@ import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPO import { Swapchain, RenderPass } from '../../../gfx'; import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr'; import { Texture2D } from '../../../asset/assets/texture-2d'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { errorID } from '../../platform/debug'; import { PipelineSceneData } from '../pipeline-scene-data'; diff --git a/cocos/core/pipeline/forward/forward-stage.ts b/cocos/core/pipeline/forward/forward-stage.ts index f609f28fb0..fc4a9bf46c 100644 --- a/cocos/core/pipeline/forward/forward-stage.ts +++ b/cocos/core/pipeline/forward/forward-stage.ts @@ -33,13 +33,13 @@ import { RenderInstancedQueue } from '../render-instanced-queue'; import { IRenderStageInfo, RenderStage } from '../render-stage'; import { ForwardStagePriority } from '../enum'; import { RenderAdditiveLightQueue } from '../render-additive-light-queue'; -import { BatchingSchemes } from '../../renderer/core/pass'; +import { BatchingSchemes } from '../../../render-scene/core/pass'; import { ForwardFlow } from './forward-flow'; import { ForwardPipeline } from './forward-pipeline'; import { RenderQueueDesc, RenderQueueSortMode } from '../pipeline-serialization'; import { PlanarShadowQueue } from '../planar-shadow-queue'; import { UIPhase } from '../ui-phase'; -import { Camera } from '../../renderer/scene'; +import { Camera } from '../../../render-scene/scene'; import { renderProfiler } from '../pipeline-funcs'; const colors: Color[] = [new Color(0, 0, 0, 1)]; diff --git a/cocos/core/pipeline/global-descriptor-set-manager.ts b/cocos/core/pipeline/global-descriptor-set-manager.ts index 4174177b29..ac090af8e5 100644 --- a/cocos/core/pipeline/global-descriptor-set-manager.ts +++ b/cocos/core/pipeline/global-descriptor-set-manager.ts @@ -25,7 +25,7 @@ import { Device, BufferUsageBit, MemoryUsageBit, BufferInfo, Filter, Address, Sampler, DescriptorSet, DescriptorSetInfo, Buffer, Texture, DescriptorSetLayoutInfo, DescriptorSetLayout, SamplerInfo } from '../../gfx'; -import { Light } from '../renderer/scene'; +import { Light } from '../../render-scene/scene'; import { UBOShadow, globalDescriptorSetLayout, PipelineGlobalBindings } from './define'; const _samplerLinearInfo = new SamplerInfo( diff --git a/cocos/core/pipeline/instanced-buffer.ts b/cocos/core/pipeline/instanced-buffer.ts index 52b1d8881f..441ff06f47 100644 --- a/cocos/core/pipeline/instanced-buffer.ts +++ b/cocos/core/pipeline/instanced-buffer.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Pass } from '../renderer'; -import { IInstancedAttributeBlock, SubModel } from '../renderer/scene'; +import { Pass } from '../../render-scene'; +import { IInstancedAttributeBlock, SubModel } from '../../render-scene/scene'; import { UNIFORM_LIGHTMAP_TEXTURE_BINDING } from './define'; import { BufferUsageBit, MemoryUsageBit, Device, Texture, InputAssembler, InputAssemblerInfo, Attribute, Buffer, BufferInfo, CommandBuffer, Shader, DescriptorSet } from '../../gfx'; diff --git a/cocos/core/pipeline/pipeline-funcs.ts b/cocos/core/pipeline/pipeline-funcs.ts index eb5f5e24ee..cd55671f92 100644 --- a/cocos/core/pipeline/pipeline-funcs.ts +++ b/cocos/core/pipeline/pipeline-funcs.ts @@ -27,7 +27,7 @@ import { CommandBuffer, Device, Rect, RenderPass, Viewport } from '../../gfx'; import { IVec4Like } from '../math'; import { PipelineStateManager } from './pipeline-state-manager'; import { SetIndex } from './define'; -import { Camera, Model } from '../renderer/scene'; +import { Camera, Model } from '../../render-scene/scene'; const profilerViewport = new Viewport(); const profilerScissor = new Rect(); diff --git a/cocos/core/pipeline/pipeline-scene-data.ts b/cocos/core/pipeline/pipeline-scene-data.ts index b8c2ae7a2c..2f5e1d85d9 100644 --- a/cocos/core/pipeline/pipeline-scene-data.ts +++ b/cocos/core/pipeline/pipeline-scene-data.ts @@ -19,17 +19,17 @@ THE SOFTWARE. */ -import { Fog } from '../renderer/scene/fog'; -import { Ambient } from '../renderer/scene/ambient'; -import { Skybox } from '../renderer/scene/skybox'; -import { Shadows } from '../renderer/scene/shadows'; -import { Octree } from '../renderer/scene/octree'; +import { Fog } from '../../render-scene/scene/fog'; +import { Ambient } from '../../render-scene/scene/ambient'; +import { Skybox } from '../../render-scene/scene/skybox'; +import { Shadows } from '../../render-scene/scene/shadows'; +import { Octree } from '../../render-scene/scene/octree'; import { IRenderObject } from './define'; import { Device, Framebuffer, InputAssembler, InputAssemblerInfo, Buffer, BufferInfo, BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../../gfx'; -import { Light } from '../renderer/scene/light'; +import { Light } from '../../render-scene/scene/light'; import { Material } from '../../asset/assets'; -import { Pass } from '../renderer/core/pass'; +import { Pass } from '../../render-scene/core/pass'; import { CSMLayers } from './shadow/csm-layers'; const GEOMETRY_RENDERER_TECHNIQUE_COUNT = 6; diff --git a/cocos/core/pipeline/pipeline-state-manager.ts b/cocos/core/pipeline/pipeline-state-manager.ts index c625b9ab8c..3a81008285 100644 --- a/cocos/core/pipeline/pipeline-state-manager.ts +++ b/cocos/core/pipeline/pipeline-state-manager.ts @@ -24,7 +24,7 @@ */ import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, PipelineStateInfo } from '../../gfx'; -import { Pass } from '../renderer/core/pass'; +import { Pass } from '../../render-scene/core/pass'; export class PipelineStateManager { private static _PSOHashMap: Map = new Map(); diff --git a/cocos/core/pipeline/pipeline-ubo.ts b/cocos/core/pipeline/pipeline-ubo.ts index 254edc028e..6a4e9a4aee 100644 --- a/cocos/core/pipeline/pipeline-ubo.ts +++ b/cocos/core/pipeline/pipeline-ubo.ts @@ -26,14 +26,14 @@ import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, supportsR32FloatTexture, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, UBOCSM } from './define'; import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet } from '../../gfx'; -import { Camera } from '../renderer/scene/camera'; +import { Camera } from '../../render-scene/scene/camera'; import { Mat4, Vec3, Vec4, Color, toRadian } from '../math'; import { PipelineRuntime } from './custom/pipeline'; import { legacyCC } from '../global-exports'; -import { CSMLevel, PCFType, Shadows, ShadowType } from '../renderer/scene/shadows'; -import { Light, LightType } from '../renderer/scene/light'; -import { DirectionalLight, SpotLight } from '../renderer/scene'; -import { RenderWindow } from '../renderer/core/render-window'; +import { CSMLevel, PCFType, Shadows, ShadowType } from '../../render-scene/scene/shadows'; +import { Light, LightType } from '../../render-scene/scene/light'; +import { DirectionalLight, SpotLight } from '../../render-scene/scene'; +import { RenderWindow } from '../../render-scene/core/render-window'; import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; import { Texture2D } from '../../asset/assets'; import { DebugViewCompositeType } from './debug-view'; diff --git a/cocos/core/pipeline/planar-shadow-queue.ts b/cocos/core/pipeline/planar-shadow-queue.ts index 954f04af0c..b0b46e4e34 100644 --- a/cocos/core/pipeline/planar-shadow-queue.ts +++ b/cocos/core/pipeline/planar-shadow-queue.ts @@ -27,9 +27,9 @@ import { AABB, intersect } from '../geometry'; import { SetIndex } from './define'; import { CommandBuffer, Device, RenderPass } from '../../gfx'; import { PipelineStateManager } from './pipeline-state-manager'; -import { Model, Camera } from '../renderer/scene'; +import { Model, Camera } from '../../render-scene/scene'; import { RenderInstancedQueue } from './render-instanced-queue'; -import { ShadowType } from '../renderer/scene/shadows'; +import { ShadowType } from '../../render-scene/scene/shadows'; import { Layers } from '../scene-graph/layers'; import { PipelineRuntime } from './custom/pipeline'; diff --git a/cocos/core/pipeline/render-additive-light-queue.ts b/cocos/core/pipeline/render-additive-light-queue.ts index ca9b4a9844..6a684e7ff1 100644 --- a/cocos/core/pipeline/render-additive-light-queue.ts +++ b/cocos/core/pipeline/render-additive-light-queue.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { BatchingSchemes, Pass } from '../renderer/core/pass'; -import { Model } from '../renderer/scene/model'; +import { BatchingSchemes, Pass } from '../../render-scene/core/pass'; +import { Model } from '../../render-scene/scene/model'; import { PipelineStateManager } from './pipeline-state-manager'; import { Vec3, nextPow2, Mat4, Color } from '../math'; import { intersect } from '../geometry'; @@ -33,14 +33,14 @@ import { Device, RenderPass, Buffer, BufferUsageBit, MemoryUsageBit, import { Pool } from '../memop'; import { RenderBatchedQueue } from './render-batched-queue'; import { RenderInstancedQueue } from './render-instanced-queue'; -import { SphereLight } from '../renderer/scene/sphere-light'; -import { SpotLight } from '../renderer/scene/spot-light'; -import { SubModel } from '../renderer/scene/submodel'; +import { SphereLight } from '../../render-scene/scene/sphere-light'; +import { SpotLight } from '../../render-scene/scene/spot-light'; +import { SubModel } from '../../render-scene/scene/submodel'; import { getPhaseID } from './pass-phase'; -import { Light, LightType } from '../renderer/scene/light'; +import { Light, LightType } from '../../render-scene/scene/light'; import { SetIndex, UBOForwardLight, UBOShadow, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, supportsR32FloatTexture } from './define'; -import { Camera, ShadowType } from '../renderer/scene'; +import { Camera, ShadowType } from '../../render-scene/scene'; import { GlobalDSManager } from './global-descriptor-set-manager'; import { PipelineUBO } from './pipeline-ubo'; import { PipelineRuntime } from './custom/pipeline'; diff --git a/cocos/core/pipeline/render-flow.ts b/cocos/core/pipeline/render-flow.ts index fa44f7e7b0..8666084a2e 100644 --- a/cocos/core/pipeline/render-flow.ts +++ b/cocos/core/pipeline/render-flow.ts @@ -27,7 +27,7 @@ import { ccclass, displayOrder, serializable, type } from 'cc.decorator'; import { RenderStage } from './render-stage'; import { RenderPipeline } from './render-pipeline'; import { legacyCC } from '../global-exports'; -import { Camera } from '../renderer/scene'; +import { Camera } from '../../render-scene/scene'; /** * @en Render flow information descriptor diff --git a/cocos/core/pipeline/render-pipeline.ts b/cocos/core/pipeline/render-pipeline.ts index c12611d37c..506e3d0317 100644 --- a/cocos/core/pipeline/render-pipeline.ts +++ b/cocos/core/pipeline/render-pipeline.ts @@ -33,10 +33,10 @@ import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, ClearFlag Texture, TextureInfo, TextureType, TextureUsageBit, Viewport, GeneralBarrierInfo, deviceManager, } from '../../gfx'; import { legacyCC } from '../global-exports'; -import { MacroRecord } from '../renderer/core/pass-utils'; -import { RenderWindow } from '../renderer/core/render-window'; -import { Camera, SKYBOX_FLAG } from '../renderer/scene/camera'; -import { Model } from '../renderer/scene/model'; +import { MacroRecord } from '../../render-scene/core/pass-utils'; +import { RenderWindow } from '../../render-scene/core/render-window'; +import { Camera, SKYBOX_FLAG } from '../../render-scene/scene/camera'; +import { Model } from '../../render-scene/scene/model'; import { GlobalDSManager } from './global-descriptor-set-manager'; import { GeometryRenderer } from './geometry-renderer'; import { PipelineSceneData } from './pipeline-scene-data'; diff --git a/cocos/core/pipeline/render-shadow-map-batched-queue.ts b/cocos/core/pipeline/render-shadow-map-batched-queue.ts index b841f0a3c1..d36a2eb493 100644 --- a/cocos/core/pipeline/render-shadow-map-batched-queue.ts +++ b/cocos/core/pipeline/render-shadow-map-batched-queue.ts @@ -23,19 +23,19 @@ THE SOFTWARE. */ -import { SubModel } from '../renderer/scene/submodel'; +import { SubModel } from '../../render-scene/scene/submodel'; import { SetIndex } from './define'; import { Device, RenderPass, Shader, CommandBuffer } from '../../gfx'; import { getPhaseID } from './pass-phase'; import { PipelineStateManager } from './pipeline-state-manager'; -import { Pass, BatchingSchemes } from '../renderer/core/pass'; +import { Pass, BatchingSchemes } from '../../render-scene/core/pass'; import { RenderInstancedQueue } from './render-instanced-queue'; import { RenderBatchedQueue } from './render-batched-queue'; -import { ShadowType } from '../renderer/scene/shadows'; -import { Light, LightType } from '../renderer/scene/light'; +import { ShadowType } from '../../render-scene/scene/shadows'; +import { Light, LightType } from '../../render-scene/scene/light'; import { intersect } from '../geometry'; -import { Model } from '../renderer/scene/model'; -import { Camera, DirectionalLight, SpotLight } from '../renderer/scene'; +import { Model } from '../../render-scene/scene/model'; +import { Camera, DirectionalLight, SpotLight } from '../../render-scene/scene'; import { shadowCulling } from './scene-culling'; import { PipelineRuntime } from './custom/pipeline'; diff --git a/cocos/core/pipeline/render-stage.ts b/cocos/core/pipeline/render-stage.ts index 802cdf44f0..5f36d9a6ff 100644 --- a/cocos/core/pipeline/render-stage.ts +++ b/cocos/core/pipeline/render-stage.ts @@ -28,7 +28,7 @@ import { legacyCC } from '../global-exports'; import { RenderPipeline } from './render-pipeline'; import { RenderFlow } from './render-flow'; import { RenderQueueDesc } from './pipeline-serialization'; -import { Camera } from '../renderer/scene'; +import { Camera } from '../../render-scene/scene'; /** * @en The render stage information descriptor diff --git a/cocos/core/pipeline/scene-culling.ts b/cocos/core/pipeline/scene-culling.ts index 52ca536887..9408df4b3e 100644 --- a/cocos/core/pipeline/scene-culling.ts +++ b/cocos/core/pipeline/scene-culling.ts @@ -24,13 +24,13 @@ */ import { intersect, Sphere } from '../geometry'; -import { Model } from '../renderer/scene/model'; -import { Camera, SKYBOX_FLAG } from '../renderer/scene/camera'; +import { Model } from '../../render-scene/scene/model'; +import { Camera, SKYBOX_FLAG } from '../../render-scene/scene/camera'; import { Vec3 } from '../math'; import { RenderPipeline } from './render-pipeline'; import { Pool } from '../memop'; import { IRenderObject, UBOShadow } from './define'; -import { ShadowType, Shadows, CSMOptimizationMode } from '../renderer/scene/shadows'; +import { ShadowType, CSMOptimizationMode } from '../../render-scene/scene/shadows'; import { PipelineSceneData } from './pipeline-scene-data'; import { ShadowLayerVolume } from './shadow/csm-layers'; diff --git a/cocos/core/pipeline/shadow/csm-layers.ts b/cocos/core/pipeline/shadow/csm-layers.ts index 5ca571e06a..b0450ddfaa 100644 --- a/cocos/core/pipeline/shadow/csm-layers.ts +++ b/cocos/core/pipeline/shadow/csm-layers.ts @@ -19,7 +19,7 @@ THE SOFTWARE. */ -import { DirectionalLight, Camera, Shadows, CSMLevel, CSMOptimizationMode } from '../../renderer/scene'; +import { DirectionalLight, Camera, Shadows, CSMLevel, CSMOptimizationMode } from '../../../render-scene/scene'; import { Mat4, Vec3, Vec2, Vec4 } from '../../math'; import { Frustum, AABB } from '../../geometry'; import { IRenderObject } from '../define'; diff --git a/cocos/core/pipeline/shadow/shadow-flow.ts b/cocos/core/pipeline/shadow/shadow-flow.ts index 141a3a953c..d429c8bb4a 100644 --- a/cocos/core/pipeline/shadow/shadow-flow.ts +++ b/cocos/core/pipeline/shadow/shadow-flow.ts @@ -35,10 +35,10 @@ import { RenderPass, LoadOp, StoreOp, import { RenderFlowTag } from '../pipeline-serialization'; import { ForwardPipeline } from '../forward/forward-pipeline'; import { RenderPipeline } from '..'; -import { PCFType, ShadowType } from '../../renderer/scene/shadows'; -import { Light, LightType } from '../../renderer/scene/light'; -import { Camera } from '../../renderer/scene'; -import { SpotLight } from '../../renderer/scene/spot-light'; +import { PCFType, ShadowType } from '../../../render-scene/scene/shadows'; +import { Light, LightType } from '../../../render-scene/scene/light'; +import { Camera } from '../../../render-scene/scene'; +import { SpotLight } from '../../../render-scene/scene/spot-light'; const _validLights: Light[] = []; diff --git a/cocos/core/pipeline/shadow/shadow-stage.ts b/cocos/core/pipeline/shadow/shadow-stage.ts index be0b07c266..a83ef09e36 100644 --- a/cocos/core/pipeline/shadow/shadow-stage.ts +++ b/cocos/core/pipeline/shadow/shadow-stage.ts @@ -30,9 +30,9 @@ import { ForwardStagePriority } from '../enum'; import { RenderShadowMapBatchedQueue } from '../render-shadow-map-batched-queue'; import { ForwardPipeline } from '../forward/forward-pipeline'; import { SetIndex } from '../define'; -import { Light, LightType } from '../../renderer/scene/light'; +import { Light, LightType } from '../../../render-scene/scene/light'; import { ShadowFlow } from './shadow-flow'; -import { Camera, CSMLevel, DirectionalLight } from '../../renderer/scene'; +import { Camera, CSMLevel, DirectionalLight } from '../../../render-scene/scene'; const colors: Color[] = [new Color(1, 1, 1, 1)]; diff --git a/cocos/core/pipeline/ui-phase.ts b/cocos/core/pipeline/ui-phase.ts index 58651eb372..4713efe653 100644 --- a/cocos/core/pipeline/ui-phase.ts +++ b/cocos/core/pipeline/ui-phase.ts @@ -26,7 +26,7 @@ import { RenderPass } from '../../gfx'; import { PipelineStateManager } from './pipeline-state-manager'; import { SetIndex } from './define'; -import { Camera } from '../renderer/scene/camera'; +import { Camera } from '../../render-scene/scene/camera'; import { RenderPipeline } from './render-pipeline'; import { getPhaseID } from './pass-phase'; diff --git a/cocos/core/root.ts b/cocos/core/root.ts index c0e47e80e0..2f4b1cf56d 100644 --- a/cocos/core/root.ts +++ b/cocos/core/root.ts @@ -26,15 +26,15 @@ import { Pool } from './memop'; import { RenderPipeline, createDefaultPipeline, DeferredPipeline } from './pipeline'; import { DebugView } from './pipeline/debug-view'; -import { Camera, Light, Model } from './renderer/scene'; +import { Camera, Light, Model } from '../render-scene/scene'; import type { DataPoolManager } from '../3d/skeletal-animation/data-pool-manager'; -import { LightType } from './renderer/scene/light'; -import { IRenderSceneInfo, RenderScene } from './renderer/core/render-scene'; -import { DirectionalLight } from './renderer/scene/directional-light'; -import { SphereLight } from './renderer/scene/sphere-light'; -import { SpotLight } from './renderer/scene/spot-light'; +import { LightType } from '../render-scene/scene/light'; +import { IRenderSceneInfo, RenderScene } from '../render-scene/core/render-scene'; +import { DirectionalLight } from '../render-scene/scene/directional-light'; +import { SphereLight } from '../render-scene/scene/sphere-light'; +import { SpotLight } from '../render-scene/scene/spot-light'; import { legacyCC } from './global-exports'; -import { RenderWindow, IRenderWindowInfo } from './renderer/core/render-window'; +import { RenderWindow, IRenderWindowInfo } from '../render-scene/core/render-window'; import { ColorAttachment, DepthStencilAttachment, RenderPassInfo, StoreOp, Device, Swapchain, Feature, deviceManager } from '../gfx'; import { warnID } from './platform/debug'; import { Pipeline, PipelineRuntime } from './pipeline/custom/pipeline'; diff --git a/cocos/core/scene-graph/scene-globals.jsb.ts b/cocos/core/scene-graph/scene-globals.jsb.ts index 8f270d74c5..81ac0a1198 100644 --- a/cocos/core/scene-graph/scene-globals.jsb.ts +++ b/cocos/core/scene-graph/scene-globals.jsb.ts @@ -36,7 +36,7 @@ import { CCFloat, CCInteger } from '../data'; import { TextureCube } from '../../asset/assets/texture-cube'; import { Enum } from '../value-types'; import { ccclass, displayOrder, rangeMin, rangeStep, slide } from '../data/decorators'; -import { EnvironmentLightingType } from '../renderer/scene'; +import { EnvironmentLightingType } from '../../render-scene/scene'; import { Material } from '../../asset/assets/material'; /** diff --git a/cocos/core/scene-graph/scene-globals.ts b/cocos/core/scene-graph/scene-globals.ts index d055f3c861..5164b9e5de 100644 --- a/cocos/core/scene-graph/scene-globals.ts +++ b/cocos/core/scene-graph/scene-globals.ts @@ -26,11 +26,11 @@ import { BAIDU } from 'internal:constants'; import { TextureCube } from '../../asset/assets/texture-cube'; import { CCFloat, CCInteger } from '../data/utils/attribute'; import { Color, Quat, Vec3, Vec2, Vec4 } from '../math'; -import { Ambient } from '../renderer/scene/ambient'; -import { Shadows, ShadowType, ShadowSize } from '../renderer/scene/shadows'; -import { Skybox, EnvironmentLightingType } from '../renderer/scene/skybox'; -import { Octree } from '../renderer/scene/octree'; -import { Fog, FogType } from '../renderer/scene/fog'; +import { Ambient } from '../../render-scene/scene/ambient'; +import { Shadows, ShadowType, ShadowSize } from '../../render-scene/scene/shadows'; +import { Skybox, EnvironmentLightingType } from '../../render-scene/scene/skybox'; +import { Octree } from '../../render-scene/scene/octree'; +import { Fog, FogType } from '../../render-scene/scene/fog'; import { Node } from './node'; import { legacyCC } from '../global-exports'; import { Root } from '../root'; diff --git a/cocos/core/scene-graph/scene.ts b/cocos/core/scene-graph/scene.ts index 46efbb1f1a..eabd0a1e58 100644 --- a/cocos/core/scene-graph/scene.ts +++ b/cocos/core/scene-graph/scene.ts @@ -27,7 +27,7 @@ import { ccclass, serializable, editable } from 'cc.decorator'; import { EDITOR, TEST } from 'internal:constants'; import { CCObject } from '../data/object'; import { assert, getError } from '../platform/debug'; -import { RenderScene } from '../renderer/core/render-scene'; +import { RenderScene } from '../../render-scene/core/render-scene'; import { Node } from './node'; import { legacyCC } from '../global-exports'; import { Component } from '../components/component'; diff --git a/cocos/dragon-bones/ArmatureDisplay.ts b/cocos/dragon-bones/ArmatureDisplay.ts index e47489e6b3..2766e471df 100644 --- a/cocos/dragon-bones/ArmatureDisplay.ts +++ b/cocos/dragon-bones/ArmatureDisplay.ts @@ -38,7 +38,7 @@ import { DragonBonesAsset } from './DragonBonesAsset'; import { DragonBonesAtlasAsset } from './DragonBonesAtlasAsset'; import { Graphics } from '../2d/components'; import { CCArmatureDisplay } from './CCArmatureDisplay'; -import { MaterialInstance } from '../core/renderer/core/material-instance'; +import { MaterialInstance } from '../render-scene/core/material-instance'; import { legacyCC } from '../core/global-exports'; import { ArmatureSystem } from './ArmatureSystem'; import { Batcher2D } from '../2d/renderer/batcher-2d'; diff --git a/cocos/dragon-bones/assembler/simple.ts b/cocos/dragon-bones/assembler/simple.ts index 2220ea2bcc..87469f3ec2 100644 --- a/cocos/dragon-bones/assembler/simple.ts +++ b/cocos/dragon-bones/assembler/simple.ts @@ -27,7 +27,7 @@ import { Armature, BlendMode } from '@cocos/dragonbones-js'; import { Color, Mat4, Node, director } from '../../core'; import { BlendFactor } from '../../gfx'; import { vfmtPosUvColor } from '../../2d/renderer/vertex-format'; -import { MaterialInstance } from '../../core/renderer/core/material-instance'; +import { MaterialInstance } from '../../render-scene/core/material-instance'; import { IAssembler } from '../../2d/renderer/base'; import { Batcher2D } from '../../2d/renderer/batcher-2d'; import { ArmatureFrame } from '../ArmatureCache'; diff --git a/cocos/particle/billboard.ts b/cocos/particle/billboard.ts index 26951f9e4d..36b4178280 100644 --- a/cocos/particle/billboard.ts +++ b/cocos/particle/billboard.ts @@ -31,7 +31,7 @@ import { Material, Texture2D } from '../asset/assets'; import { Component } from '../core/components/component'; import { Attribute, AttributeName, Format, PrimitiveMode } from '../gfx'; import { Color, toDegree, toRadian, Vec4 } from '../core/math'; -import { scene } from '../core/renderer'; +import { scene } from '../render-scene'; import { legacyCC } from '../core/global-exports'; @ccclass('cc.Billboard') diff --git a/cocos/particle/line.ts b/cocos/particle/line.ts index 5715b03480..17820fbce7 100644 --- a/cocos/particle/line.ts +++ b/cocos/particle/line.ts @@ -32,7 +32,7 @@ import { builtinResMgr } from '../asset/asset-manager'; import CurveRange from './animator/curve-range'; import GradientRange from './animator/gradient-range'; import { legacyCC } from '../core/global-exports'; -import { IMaterialInstanceInfo, MaterialInstance } from '../core/renderer/core/material-instance'; +import { IMaterialInstanceInfo, MaterialInstance } from '../render-scene/core/material-instance'; const _matInsInfo: IMaterialInstanceInfo = { parent: null!, diff --git a/cocos/particle/models/line-model.ts b/cocos/particle/models/line-model.ts index 796ddd46bf..d1368d9738 100644 --- a/cocos/particle/models/line-model.ts +++ b/cocos/particle/models/line-model.ts @@ -28,7 +28,7 @@ import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; import { DRAW_INFO_SIZE, Buffer, IndirectBuffer, Attribute, BufferInfo, DrawInfo, AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode } from '../../gfx'; import { Vec3 } from '../../core/math'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import CurveRange from '../animator/curve-range'; import GradientRange from '../animator/gradient-range'; import { Material } from '../../asset/assets'; diff --git a/cocos/particle/models/particle-batch-model.ts b/cocos/particle/models/particle-batch-model.ts index c4a5d5fa80..96aeb4196e 100644 --- a/cocos/particle/models/particle-batch-model.ts +++ b/cocos/particle/models/particle-batch-model.ts @@ -29,7 +29,7 @@ import { Mesh } from '../../3d/assets/mesh'; import { AttributeName, BufferUsageBit, FormatInfos, MemoryUsageBit, PrimitiveMode, Attribute, DRAW_INFO_SIZE, Buffer, IndirectBuffer, BufferInfo, DrawInfo, Feature, deviceManager } from '../../gfx'; import { Color } from '../../core/math/color'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import { Particle } from '../particle'; import { Material, RenderingSubMesh } from '../../asset/assets'; diff --git a/cocos/particle/particle-system.ts b/cocos/particle/particle-system.ts index f7605be0df..967f08850b 100644 --- a/cocos/particle/particle-system.ts +++ b/cocos/particle/particle-system.ts @@ -31,7 +31,7 @@ import { ModelRenderer } from '../core/components/model-renderer'; import { Material } from '../asset/assets/material'; import { Mat4, pseudoRandom, Quat, randomRangeInt, Vec2, Vec3 } from '../core/math'; import { INT_MAX } from '../core/math/bits'; -import { scene } from '../core/renderer'; +import { scene } from '../render-scene'; import ColorOverLifetimeModule from './animator/color-overtime'; import CurveRange, { Mode } from './animator/curve-range'; import ForceOvertimeModule from './animator/force-overtime'; @@ -52,7 +52,7 @@ import { PARTICLE_MODULE_PROPERTY } from './particle'; import { legacyCC } from '../core/global-exports'; import { TransformBit } from '../core/scene-graph/node-enum'; import { AABB, intersect } from '../core/geometry'; -import { Camera } from '../core/renderer/scene'; +import { Camera } from '../render-scene/scene'; import { ParticleCuller } from './particle-culler'; import { NoiseModule } from './animator/noise-module'; import { CCBoolean, CCFloat } from '../core'; diff --git a/cocos/particle/renderer/particle-system-renderer-base.ts b/cocos/particle/renderer/particle-system-renderer-base.ts index 77eb8e82f6..c7c67aa5b6 100644 --- a/cocos/particle/renderer/particle-system-renderer-base.ts +++ b/cocos/particle/renderer/particle-system-renderer-base.ts @@ -31,7 +31,7 @@ import { Material } from '../../asset/assets'; import { Particle, IParticleModule } from '../particle'; import { RenderMode } from '../enum'; import { legacyCC } from '../../core/global-exports'; -import { Pass } from '../../core/renderer'; +import { Pass } from '../../render-scene'; export interface IParticleSystemRenderer { onInit (ps: Component): void; diff --git a/cocos/particle/renderer/particle-system-renderer-cpu.ts b/cocos/particle/renderer/particle-system-renderer-cpu.ts index 5aa0f07917..cf9a11a323 100644 --- a/cocos/particle/renderer/particle-system-renderer-cpu.ts +++ b/cocos/particle/renderer/particle-system-renderer-cpu.ts @@ -29,14 +29,14 @@ import { Material } from '../../asset/assets'; import { AttributeName, Format, Attribute, FormatInfos } from '../../gfx'; import { Mat4, Vec2, Vec3, Vec4, pseudoRandom, Quat } from '../../core/math'; import { RecyclePool } from '../../core/memop'; -import { MaterialInstance, IMaterialInstanceInfo } from '../../core/renderer/core/material-instance'; -import { MacroRecord } from '../../core/renderer/core/pass-utils'; +import { MaterialInstance, IMaterialInstanceInfo } from '../../render-scene/core/material-instance'; +import { MacroRecord } from '../../render-scene/core/pass-utils'; import { AlignmentSpace, RenderMode, Space } from '../enum'; import { Particle, IParticleModule, PARTICLE_MODULE_ORDER, PARTICLE_MODULE_NAME } from '../particle'; import { ParticleSystemRendererBase } from './particle-system-renderer-base'; import { Component } from '../../core'; -import { Camera } from '../../core/renderer/scene/camera'; -import { Pass } from '../../core/renderer'; +import { Camera } from '../../render-scene/scene/camera'; +import { Pass } from '../../render-scene'; import { ParticleNoise } from '../noise'; import { NoiseModule } from '../animator/noise-module'; import { legacyCC } from '../../core/global-exports'; diff --git a/cocos/particle/renderer/particle-system-renderer-gpu.ts b/cocos/particle/renderer/particle-system-renderer-gpu.ts index 292f37558e..2db57193dd 100644 --- a/cocos/particle/renderer/particle-system-renderer-gpu.ts +++ b/cocos/particle/renderer/particle-system-renderer-gpu.ts @@ -29,15 +29,15 @@ import { Material, Texture2D } from '../../asset/assets'; import { Component } from '../../core/components'; import { AttributeName, Format, Attribute, API, deviceManager, FormatInfos } from '../../gfx'; import { Mat4, Vec2, Vec4, Quat, Vec3 } from '../../core/math'; -import { MaterialInstance, IMaterialInstanceInfo } from '../../core/renderer/core/material-instance'; -import { MacroRecord } from '../../core/renderer/core/pass-utils'; +import { MaterialInstance, IMaterialInstanceInfo } from '../../render-scene/core/material-instance'; +import { MacroRecord } from '../../render-scene/core/pass-utils'; import { AlignmentSpace, RenderMode, Space } from '../enum'; import { Particle, IParticleModule } from '../particle'; import { packGradientRange } from '../animator/gradient-range'; -import { Pass } from '../../core/renderer/core/pass'; +import { Pass } from '../../render-scene/core/pass'; import { packCurveRangeXYZ, packCurveRangeZ, packCurveRangeXYZW, packCurveRangeN, packCurveRangeXY } from '../animator/curve-range'; import { ParticleSystemRendererBase } from './particle-system-renderer-base'; -import { Camera } from '../../core/renderer/scene/camera'; +import { Camera } from '../../render-scene/scene/camera'; import { legacyCC } from '../../core/global-exports'; const _tempWorldTrans = new Mat4(); diff --git a/cocos/particle/renderer/trail.ts b/cocos/particle/renderer/trail.ts index d051f04e3e..05f5ce2584 100644 --- a/cocos/particle/renderer/trail.ts +++ b/cocos/particle/renderer/trail.ts @@ -31,7 +31,7 @@ import { AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, Pri Device, Attribute, Buffer, IndirectBuffer, BufferInfo, DrawInfo, DRAW_INFO_SIZE } from '../../gfx'; import { Color, Mat4, Quat, toRadian, Vec3 } from '../../core/math'; import { Pool } from '../../core/memop'; -import { scene } from '../../core/renderer'; +import { scene } from '../../render-scene'; import CurveRange from '../animator/curve-range'; import GradientRange from '../animator/gradient-range'; import { Space, TextureMode, TrailMode } from '../enum'; diff --git a/cocos/profiler/profiler.ts b/cocos/profiler/profiler.ts index f21be588e4..9176c7bfaf 100644 --- a/cocos/profiler/profiler.ts +++ b/cocos/profiler/profiler.ts @@ -34,7 +34,7 @@ import { Node } from '../core/scene-graph/node'; import { ICounterOption } from './counter'; import { PerfCounter } from './perf-counter'; import { legacyCC } from '../core/global-exports'; -import { Pass } from '../core/renderer'; +import { Pass } from '../render-scene'; import { preTransforms } from '../core/math/mat4'; import { Root } from '../core/root'; import { PipelineRuntime } from '../core/pipeline/custom/pipeline'; diff --git a/cocos/core/renderer/config.ts b/cocos/render-scene/config.ts similarity index 100% rename from cocos/core/renderer/config.ts rename to cocos/render-scene/config.ts diff --git a/cocos/core/renderer/core/constants.ts b/cocos/render-scene/core/constants.ts similarity index 100% rename from cocos/core/renderer/core/constants.ts rename to cocos/render-scene/core/constants.ts diff --git a/cocos/core/renderer/core/material-instance.jsb.ts b/cocos/render-scene/core/material-instance.jsb.ts similarity index 95% rename from cocos/core/renderer/core/material-instance.jsb.ts rename to cocos/render-scene/core/material-instance.jsb.ts index 32e13c0346..a6597c9f1b 100644 --- a/cocos/core/renderer/core/material-instance.jsb.ts +++ b/cocos/render-scene/core/material-instance.jsb.ts @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Material } from '../../assets'; -import { Renderer } from '../../components/renderer'; +import { Material } from '../../asset/assets/material'; +import { Renderer } from '../../core/components/renderer'; export const MaterialInstance = jsb.MaterialInstance; export type MaterialInstance = jsb.MaterialInstance; diff --git a/cocos/core/renderer/core/material-instance.ts b/cocos/render-scene/core/material-instance.ts similarity index 97% rename from cocos/core/renderer/core/material-instance.ts rename to cocos/render-scene/core/material-instance.ts index 414f8bfacc..9a14f89a76 100644 --- a/cocos/core/renderer/core/material-instance.ts +++ b/cocos/render-scene/core/material-instance.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { Material } from '../../../asset/assets/material'; +import { Material } from '../../asset/assets/material'; import { PassInstance } from './pass-instance'; import { MacroRecord } from './pass-utils'; import { PassOverrides } from './pass'; -import { Renderer } from '../../components/renderer'; +import { Renderer } from '../../core/components/renderer'; export interface IMaterialInstanceInfo { parent: Material; diff --git a/cocos/core/renderer/core/memory-pools.ts b/cocos/render-scene/core/memory-pools.ts similarity index 99% rename from cocos/core/renderer/core/memory-pools.ts rename to cocos/render-scene/core/memory-pools.ts index cabd2ea341..6f0459ee9a 100644 --- a/cocos/core/renderer/core/memory-pools.ts +++ b/cocos/render-scene/core/memory-pools.ts @@ -23,7 +23,6 @@ THE SOFTWARE. */ -import { PolygonShape } from '@cocos/box2d'; import { DEBUG } from 'internal:constants'; import { NativeBufferPool } from './native-pools'; diff --git a/cocos/core/renderer/core/native-pools.jsb.ts b/cocos/render-scene/core/native-pools.jsb.ts similarity index 100% rename from cocos/core/renderer/core/native-pools.jsb.ts rename to cocos/render-scene/core/native-pools.jsb.ts diff --git a/cocos/core/renderer/core/native-pools.ts b/cocos/render-scene/core/native-pools.ts similarity index 100% rename from cocos/core/renderer/core/native-pools.ts rename to cocos/render-scene/core/native-pools.ts diff --git a/cocos/core/renderer/core/pass-instance.ts b/cocos/render-scene/core/pass-instance.ts similarity index 98% rename from cocos/core/renderer/core/pass-instance.ts rename to cocos/render-scene/core/pass-instance.ts index 2cb9b21050..81df1f10cd 100644 --- a/cocos/core/renderer/core/pass-instance.ts +++ b/cocos/render-scene/core/pass-instance.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { EffectAsset } from '../../../asset/assets/effect-asset'; +import { EffectAsset } from '../../asset/assets/effect-asset'; import { MaterialInstance } from './material-instance'; import { BatchingSchemes, Pass, PassOverrides } from './pass'; import { overrideMacros, MacroRecord } from './pass-utils'; diff --git a/cocos/core/renderer/core/pass-utils.ts b/cocos/render-scene/core/pass-utils.ts similarity index 98% rename from cocos/core/renderer/core/pass-utils.ts rename to cocos/render-scene/core/pass-utils.ts index 04cc06644b..4d0a8570f8 100644 --- a/cocos/core/renderer/core/pass-utils.ts +++ b/cocos/render-scene/core/pass-utils.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Type } from '../../../gfx'; -import { Color, Mat3, Mat4, Vec2, Vec3, Vec4, Quat, IVec2Like, IVec3Like, IVec4Like, IMat3Like, IMat4Like } from '../../math'; +import { Type } from '../../gfx'; +import { Color, Mat3, Mat4, Vec2, Vec3, Vec4, Quat, IVec2Like, IVec3Like, IVec4Like, IMat3Like, IMat4Like } from '../../core/math'; const typeMask = 0xfc000000; // 6 bits => 64 types const bindingMask = 0x03f00000; // 6 bits => 64 bindings diff --git a/cocos/core/renderer/core/pass.jsb.ts b/cocos/render-scene/core/pass.jsb.ts similarity index 96% rename from cocos/core/renderer/core/pass.jsb.ts rename to cocos/render-scene/core/pass.jsb.ts index d22d9151e4..3465649225 100644 --- a/cocos/core/renderer/core/pass.jsb.ts +++ b/cocos/render-scene/core/pass.jsb.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ import { MacroRecord } from "./pass-utils"; -import { EffectAsset } from '../../assets/effect-asset'; +import { EffectAsset } from '../../asset/assets/effect-asset'; export interface IPassInfoFull extends EffectAsset.IPassStates { // generated part diff --git a/cocos/core/renderer/core/pass.ts b/cocos/render-scene/core/pass.ts similarity index 97% rename from cocos/core/renderer/core/pass.ts rename to cocos/render-scene/core/pass.ts index 5050a94018..a74fbecafa 100644 --- a/cocos/core/renderer/core/pass.ts +++ b/cocos/render-scene/core/pass.ts @@ -24,24 +24,24 @@ */ import { EDITOR } from 'internal:constants'; -import { Root } from '../../root'; -import { TextureBase } from '../../../asset/assets/texture-base'; -import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr'; -import { getPhaseID } from '../../pipeline/pass-phase'; -import { murmurhash2_32_gc } from '../../algorithm/murmurhash2_gc'; +import { Root } from '../../core/root'; +import { TextureBase } from '../../asset/assets/texture-base'; +import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; +import { getPhaseID } from '../../core/pipeline/pass-phase'; +import { murmurhash2_32_gc } from '../../core/algorithm/murmurhash2_gc'; import { BufferUsageBit, DynamicStateFlagBit, DynamicStateFlags, Feature, GetTypeSize, MemoryUsageBit, PrimitiveMode, Type, Color, BlendState, BlendTarget, Buffer, BufferInfo, BufferViewInfo, DepthStencilState, DescriptorSet, DescriptorSetInfo, DescriptorSetLayout, Device, RasterizerState, Sampler, Texture, Shader, PipelineLayout, deviceManager, -} from '../../../gfx'; -import { EffectAsset } from '../../../asset/assets/effect-asset'; +} from '../../gfx'; +import { EffectAsset } from '../../asset/assets/effect-asset'; import { IProgramInfo, programLib } from './program-lib'; import { MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType, getOffsetFromHandle, getTypeFromHandle, type2reader, type2writer, getCountFromHandle, } from './pass-utils'; -import { RenderPassStage, RenderPriority } from '../../pipeline/define'; -import { errorID } from '../../platform/debug'; -import { InstancedBuffer } from '../../pipeline/instanced-buffer'; -import { BatchedBuffer } from '../../pipeline/batched-buffer'; +import { RenderPassStage, RenderPriority } from '../../core/pipeline/define'; +import { errorID } from '../../core/platform/debug'; +import { InstancedBuffer } from '../../core/pipeline/instanced-buffer'; +import { BatchedBuffer } from '../../core/pipeline/batched-buffer'; export interface IPassInfoFull extends EffectAsset.IPassInfo { // generated part diff --git a/cocos/core/renderer/core/program-lib.jsb.ts b/cocos/render-scene/core/program-lib.jsb.ts similarity index 87% rename from cocos/core/renderer/core/program-lib.jsb.ts rename to cocos/render-scene/core/program-lib.jsb.ts index 368dd03304..8a1c5d92fd 100644 --- a/cocos/core/renderer/core/program-lib.jsb.ts +++ b/cocos/render-scene/core/program-lib.jsb.ts @@ -1,5 +1,5 @@ -import { API, } from '../../../gfx'; -import { legacyCC } from '../../global-exports'; +import { API, } from '../../gfx'; +import { legacyCC } from '../../core/global-exports'; export interface ITemplateInfo { gfxAttributes: Attribute[]; diff --git a/cocos/core/renderer/core/program-lib.ts b/cocos/render-scene/core/program-lib.ts similarity index 98% rename from cocos/core/renderer/core/program-lib.ts rename to cocos/render-scene/core/program-lib.ts index 6e97da30c3..7795ea8a02 100644 --- a/cocos/core/renderer/core/program-lib.ts +++ b/cocos/render-scene/core/program-lib.ts @@ -23,17 +23,17 @@ THE SOFTWARE. */ -import { EffectAsset } from '../../../asset/assets/effect-asset'; -import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../pipeline/define'; -import { PipelineRuntime } from '../../pipeline/custom/pipeline'; +import { EffectAsset } from '../../asset/assets/effect-asset'; +import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../core/pipeline/define'; +import { PipelineRuntime } from '../../core/pipeline/custom/pipeline'; import { genHandle, MacroRecord } from './pass-utils'; -import { legacyCC } from '../../global-exports'; +import { legacyCC } from '../../core/global-exports'; import { PipelineLayoutInfo, Device, Attribute, UniformBlock, ShaderInfo, Uniform, ShaderStage, DESCRIPTOR_SAMPLER_TYPE, DESCRIPTOR_BUFFER_TYPE, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, GetTypeSize, ShaderStageFlagBit, API, UniformSamplerTexture, PipelineLayout, - Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment } from '../../../gfx'; -import { debug } from '../../platform/debug'; + Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment } from '../../gfx'; +import { debug } from '../../core/platform/debug'; const _dsLayoutInfo = new DescriptorSetLayoutInfo(); diff --git a/cocos/core/renderer/core/render-scene.jsb.ts b/cocos/render-scene/core/render-scene.jsb.ts similarity index 94% rename from cocos/core/renderer/core/render-scene.jsb.ts rename to cocos/render-scene/core/render-scene.jsb.ts index d6ce366e69..f8e88da359 100644 --- a/cocos/core/renderer/core/render-scene.jsb.ts +++ b/cocos/render-scene/core/render-scene.jsb.ts @@ -23,8 +23,7 @@ THE SOFTWARE. */ -import { DrawBatch2D } from '../../../2d/renderer/draw-batch'; -import { Node } from '../../scene-graph'; +import { Node } from '../../core/scene-graph'; export interface IRenderSceneInfo { name: string; diff --git a/cocos/core/renderer/core/render-scene.ts b/cocos/render-scene/core/render-scene.ts similarity index 98% rename from cocos/core/renderer/core/render-scene.ts rename to cocos/render-scene/core/render-scene.ts index aa752f0ec1..6ee7793ee5 100644 --- a/cocos/core/renderer/core/render-scene.ts +++ b/cocos/render-scene/core/render-scene.ts @@ -22,15 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Root } from '../../root'; -import { Node } from '../../scene-graph'; +import { Root } from '../../core/root'; +import { Node } from '../../core/scene-graph'; import { Camera } from '../scene/camera'; import { DirectionalLight } from '../scene/directional-light'; import { Model } from '../scene/model'; import { SphereLight } from '../scene/sphere-light'; import { SpotLight } from '../scene/spot-light'; -import { TransformBit } from '../../scene-graph/node-enum'; -import { DrawBatch2D } from '../../../2d/renderer/draw-batch'; +import { TransformBit } from '../../core/scene-graph/node-enum'; +import { DrawBatch2D } from '../../2d/renderer/draw-batch'; export interface IRenderSceneInfo { name: string; diff --git a/cocos/core/renderer/core/render-window.jsb.ts b/cocos/render-scene/core/render-window.jsb.ts similarity index 100% rename from cocos/core/renderer/core/render-window.jsb.ts rename to cocos/render-scene/core/render-window.jsb.ts diff --git a/cocos/core/renderer/core/render-window.ts b/cocos/render-scene/core/render-window.ts similarity index 98% rename from cocos/core/renderer/core/render-window.ts rename to cocos/render-scene/core/render-window.ts index 4521424cbc..47fa32f126 100644 --- a/cocos/core/renderer/core/render-window.ts +++ b/cocos/render-scene/core/render-window.ts @@ -23,12 +23,12 @@ THE SOFTWARE. */ import { screenAdapter } from 'pal/screen-adapter'; -import { Orientation } from '../../../../pal/screen-adapter/enum-type'; +import { Orientation } from '../../../pal/screen-adapter/enum-type'; import { TextureType, TextureUsageBit, Format, RenderPass, Texture, Framebuffer, RenderPassInfo, Device, TextureInfo, FramebufferInfo, Swapchain, SurfaceTransform, -} from '../../../gfx'; -import { Root } from '../../root'; +} from '../../gfx'; +import { Root } from '../../core/root'; import { Camera } from '../scene'; export interface IRenderWindowInfo { diff --git a/cocos/core/renderer/core/sampler-lib.jsb.ts b/cocos/render-scene/core/sampler-lib.jsb.ts similarity index 96% rename from cocos/core/renderer/core/sampler-lib.jsb.ts rename to cocos/render-scene/core/sampler-lib.jsb.ts index ef30f56c9a..eae04b7a20 100644 --- a/cocos/core/renderer/core/sampler-lib.jsb.ts +++ b/cocos/render-scene/core/sampler-lib.jsb.ts @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { legacyCC } from "../../global-exports"; +import { legacyCC } from "../../core/global-exports"; const SamplerLib = nr.SamplerLib; diff --git a/cocos/core/renderer/core/texture-buffer-pool.ts b/cocos/render-scene/core/texture-buffer-pool.ts similarity index 99% rename from cocos/core/renderer/core/texture-buffer-pool.ts rename to cocos/render-scene/core/texture-buffer-pool.ts index c26d0c7ff1..e2ea29de81 100644 --- a/cocos/core/renderer/core/texture-buffer-pool.ts +++ b/cocos/render-scene/core/texture-buffer-pool.ts @@ -24,8 +24,8 @@ */ import { getTypedArrayConstructor, Format, FormatInfos, TextureType, TextureUsageBit, - Texture, TextureInfo, Device, BufferTextureCopy } from '../../../gfx'; -import { debug } from '../../platform/debug'; + Texture, TextureInfo, Device, BufferTextureCopy } from '../../gfx'; +import { debug } from '../../core/platform/debug'; export function nearestPOT (num: number): number { --num; diff --git a/cocos/core/renderer/deprecated.ts b/cocos/render-scene/deprecated.ts similarity index 96% rename from cocos/core/renderer/deprecated.ts rename to cocos/render-scene/deprecated.ts index 76ff0dc3a1..ee387428d6 100644 --- a/cocos/core/renderer/deprecated.ts +++ b/cocos/render-scene/deprecated.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ -import { replaceProperty, removeProperty } from '../utils/x-deprecated'; +import { replaceProperty, removeProperty } from '../core/utils/x-deprecated'; import { RenderScene } from './core/render-scene'; -import { Layers } from '../scene-graph/layers'; -import { legacyCC } from '../global-exports'; +import { Layers } from '../core/scene-graph/layers'; +import { legacyCC } from '../core/global-exports'; import { Pass } from './core/pass'; import { Camera } from './scene/camera'; import { Shadows } from './scene/shadows'; diff --git a/cocos/core/renderer/index.ts b/cocos/render-scene/index.ts similarity index 100% rename from cocos/core/renderer/index.ts rename to cocos/render-scene/index.ts diff --git a/cocos/core/renderer/scene/ambient.ts b/cocos/render-scene/scene/ambient.ts similarity index 96% rename from cocos/core/renderer/scene/ambient.ts rename to cocos/render-scene/scene/ambient.ts index 6e99d0c8d3..f994923c37 100644 --- a/cocos/core/renderer/scene/ambient.ts +++ b/cocos/render-scene/scene/ambient.ts @@ -23,9 +23,9 @@ THE SOFTWARE. */ -import { Vec4 } from '../../math'; -import { legacyCC } from '../../global-exports'; -import { AmbientInfo } from '../../scene-graph/scene-globals'; +import { Vec4 } from '../../core/math'; +import { legacyCC } from '../../core/global-exports'; +import { AmbientInfo } from '../../core/scene-graph/scene-globals'; /** * @en Ambient lighting representation in the render scene. diff --git a/cocos/core/renderer/scene/camera.jsb.ts b/cocos/render-scene/scene/camera.jsb.ts similarity index 97% rename from cocos/core/renderer/scene/camera.jsb.ts rename to cocos/render-scene/scene/camera.jsb.ts index 127d8bee7e..233cc73233 100644 --- a/cocos/core/renderer/scene/camera.jsb.ts +++ b/cocos/render-scene/scene/camera.jsb.ts @@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Ray } from '../../geometry'; +import { Ray } from '../../core/geometry'; import { RenderWindow } from '../core/render-window'; -import { ClearFlagBit } from '../../../gfx'; -import { _tempFloatArray, fillMat4WithTempFloatArray } from '../../scene-graph/utils.jsb'; -import { Mat4, Vec3 } from '../../math'; +import { ClearFlagBit } from '../../gfx'; +import { _tempFloatArray, fillMat4WithTempFloatArray } from '../../core/scene-graph/utils.jsb'; +import { Mat4, Vec3 } from '../../core/math'; declare const jsb: any; diff --git a/cocos/core/renderer/scene/camera.ts b/cocos/render-scene/scene/camera.ts similarity index 98% rename from cocos/core/renderer/scene/camera.ts rename to cocos/render-scene/scene/camera.ts index ec4f31abff..c509a48382 100644 --- a/cocos/core/renderer/scene/camera.ts +++ b/cocos/render-scene/scene/camera.ts @@ -23,17 +23,17 @@ THE SOFTWARE. */ import { EDITOR } from 'internal:constants'; -import { Frustum, Ray } from '../../geometry'; -import { SurfaceTransform, ClearFlagBit, Device, Color, ClearFlags } from '../../../gfx'; -import { lerp, Mat4, Rect, toRadian, Vec3, IVec4Like } from '../../math'; -import { CAMERA_DEFAULT_MASK } from '../../pipeline/define'; -import { Node } from '../../scene-graph'; +import { Frustum, Ray } from '../../core/geometry'; +import { SurfaceTransform, ClearFlagBit, Device, Color, ClearFlags } from '../../gfx'; +import { lerp, Mat4, Rect, toRadian, Vec3, IVec4Like } from '../../core/math'; +import { CAMERA_DEFAULT_MASK } from '../../core/pipeline/define'; +import { Node } from '../../core/scene-graph'; import { RenderScene } from '../core/render-scene'; -import { legacyCC } from '../../global-exports'; +import { legacyCC } from '../../core/global-exports'; import { RenderWindow } from '../core/render-window'; -import { preTransforms } from '../../math/mat4'; -import { warnID } from '../../platform/debug'; -import { GeometryRenderer } from '../../pipeline/geometry-renderer'; +import { preTransforms } from '../../core/math/mat4'; +import { warnID } from '../../core/platform/debug'; +import { GeometryRenderer } from '../../core/pipeline/geometry-renderer'; export enum CameraFOVAxis { VERTICAL, diff --git a/cocos/core/renderer/scene/directional-light.ts b/cocos/render-scene/scene/directional-light.ts similarity index 98% rename from cocos/core/renderer/scene/directional-light.ts rename to cocos/render-scene/scene/directional-light.ts index 81490ca736..c61dc0287f 100644 --- a/cocos/core/renderer/scene/directional-light.ts +++ b/cocos/render-scene/scene/directional-light.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { legacyCC } from '../../global-exports'; -import { Vec3 } from '../../math'; +import { legacyCC } from '../../core/global-exports'; +import { Vec3 } from '../../core/math'; import { Ambient } from './ambient'; import { Light, LightType } from './light'; -import { CSMLevel, CSMOptimizationMode, PCFType, Shadows, ShadowType } from './shadows'; +import { CSMLevel, CSMOptimizationMode, PCFType, Shadows } from './shadows'; const _forward = new Vec3(0, 0, -1); const _v3 = new Vec3(); diff --git a/cocos/core/renderer/scene/fog.ts b/cocos/render-scene/scene/fog.ts similarity index 92% rename from cocos/core/renderer/scene/fog.ts rename to cocos/render-scene/scene/fog.ts index 408c816fd9..27e42eb6e2 100644 --- a/cocos/core/renderer/scene/fog.ts +++ b/cocos/render-scene/scene/fog.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { Enum } from '../../value-types'; -import { Color, Vec4 } from '../../math'; -import { legacyCC } from '../../global-exports'; -import { FogInfo } from '../../scene-graph/scene-globals'; -import { SRGBToLinear } from '../../pipeline/pipeline-funcs'; +import { Enum } from '../../core/value-types'; +import { Color, Vec4 } from '../../core/math'; +import { legacyCC } from '../../core/global-exports'; +import { FogInfo } from '../../core/scene-graph/scene-globals'; +import { SRGBToLinear } from '../../core/pipeline/pipeline-funcs'; const _v4 = new Vec4(); diff --git a/cocos/core/renderer/scene/index.jsb.ts b/cocos/render-scene/scene/index.jsb.ts similarity index 97% rename from cocos/core/renderer/scene/index.jsb.ts rename to cocos/render-scene/scene/index.jsb.ts index 0244a815a6..ea57decd0f 100644 --- a/cocos/core/renderer/scene/index.jsb.ts +++ b/cocos/render-scene/scene/index.jsb.ts @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { legacyCC } from '../../global-exports'; -import { Vec3 } from '../../math'; -import { Enum } from '../../value-types'; +import { legacyCC } from '../../core/global-exports'; +import { Vec3 } from '../../core/math'; +import { Enum } from '../../core/value-types'; export type Ambient = jsb.Ambient; export const Ambient = jsb.Ambient; diff --git a/cocos/core/renderer/scene/index.ts b/cocos/render-scene/scene/index.ts similarity index 100% rename from cocos/core/renderer/scene/index.ts rename to cocos/render-scene/scene/index.ts diff --git a/cocos/core/renderer/scene/light.ts b/cocos/render-scene/scene/light.ts similarity index 97% rename from cocos/core/renderer/scene/light.ts rename to cocos/render-scene/scene/light.ts index a345172ab5..5d745be7b3 100644 --- a/cocos/core/renderer/scene/light.ts +++ b/cocos/render-scene/scene/light.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ -import { Vec3 } from '../../math'; -import { TransformBit } from '../../scene-graph/node-enum'; +import { Vec3 } from '../../core/math'; +import { TransformBit } from '../../core/scene-graph/node-enum'; import { RenderScene } from '../core/render-scene'; -import { Node } from '../../scene-graph'; +import { Node } from '../../core/scene-graph'; // Color temperature (in Kelvin) to RGB export function ColorTemperatureToRGB (rgb: Vec3, kelvin: number) { diff --git a/cocos/core/renderer/scene/model.jsb.ts b/cocos/render-scene/scene/model.jsb.ts similarity index 95% rename from cocos/core/renderer/scene/model.jsb.ts rename to cocos/render-scene/scene/model.jsb.ts index fa0c8e1948..6e7175de6b 100644 --- a/cocos/core/renderer/scene/model.jsb.ts +++ b/cocos/render-scene/scene/model.jsb.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Attribute, deviceManager } from '../../../gfx'; -import { Vec3 } from '../../math'; +import { Attribute, deviceManager } from '../../gfx'; +import { Vec3 } from '../../core/math'; export interface IInstancedAttributeBlock { buffer: Uint8Array; diff --git a/cocos/core/renderer/scene/model.ts b/cocos/render-scene/scene/model.ts similarity index 97% rename from cocos/core/renderer/scene/model.ts rename to cocos/render-scene/scene/model.ts index 8f47eb4a4d..b5c4bf2584 100644 --- a/cocos/core/renderer/scene/model.ts +++ b/cocos/render-scene/scene/model.ts @@ -24,20 +24,20 @@ */ // Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. -import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr'; -import { Material } from '../../../asset/assets/material'; -import { RenderingSubMesh } from '../../../asset/assets/rendering-sub-mesh'; -import { AABB } from '../../geometry/aabb'; -import { Node } from '../../scene-graph'; -import { Layers } from '../../scene-graph/layers'; +import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; +import { Material } from '../../asset/assets/material'; +import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; +import { AABB } from '../../core/geometry/aabb'; +import { Node } from '../../core/scene-graph'; +import { Layers } from '../../core/scene-graph/layers'; import { RenderScene } from '../core/render-scene'; -import { Texture2D } from '../../../asset/assets/texture-2d'; +import { Texture2D } from '../../asset/assets/texture-2d'; import { SubModel } from './submodel'; import { Pass, IMacroPatch, BatchingSchemes } from '../core/pass'; -import { Mat4, Vec3, Vec4 } from '../../math'; +import { Mat4, Vec3, Vec4 } from '../../core/math'; import { Attribute, DescriptorSet, Device, Buffer, BufferInfo, getTypedArrayConstructor, - BufferUsageBit, FormatInfos, MemoryUsageBit, Filter, Address, Feature, SamplerInfo, deviceManager } from '../../../gfx'; -import { INST_MAT_WORLD, UBOLocal, UBOWorldBound, UNIFORM_LIGHTMAP_TEXTURE_BINDING } from '../../pipeline/define'; + BufferUsageBit, FormatInfos, MemoryUsageBit, Filter, Address, Feature, SamplerInfo, deviceManager } from '../../gfx'; +import { INST_MAT_WORLD, UBOLocal, UBOWorldBound, UNIFORM_LIGHTMAP_TEXTURE_BINDING } from '../../core/pipeline/define'; const m4_1 = new Mat4(); diff --git a/cocos/core/renderer/scene/octree.ts b/cocos/render-scene/scene/octree.ts similarity index 95% rename from cocos/core/renderer/scene/octree.ts rename to cocos/render-scene/scene/octree.ts index 4f67dd7970..69f43e499c 100644 --- a/cocos/core/renderer/scene/octree.ts +++ b/cocos/render-scene/scene/octree.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Vec3 } from '../../math/vec3'; -import { OctreeInfo } from '../../scene-graph/scene-globals'; +import { Vec3 } from '../../core/math/vec3'; +import { OctreeInfo } from '../../core/scene-graph/scene-globals'; /** * @en The octree culling configuration of the render scene diff --git a/cocos/core/renderer/scene/shadows.ts b/cocos/render-scene/scene/shadows.ts similarity index 96% rename from cocos/core/renderer/scene/shadows.ts rename to cocos/render-scene/scene/shadows.ts index 34750b444b..5ce87409b0 100644 --- a/cocos/core/renderer/scene/shadows.ts +++ b/cocos/render-scene/scene/shadows.ts @@ -24,15 +24,15 @@ */ import { DEBUG } from 'internal:constants'; -import { Material } from '../../../asset/assets/material'; -import { Sphere } from '../../geometry'; -import { Color, Mat4, Vec3, Vec2 } from '../../math'; -import { legacyCC } from '../../global-exports'; -import { Enum } from '../../value-types'; -import type { ShadowsInfo } from '../../scene-graph/scene-globals'; +import { Material } from '../../asset/assets/material'; +import { Sphere } from '../../core/geometry'; +import { Color, Mat4, Vec3, Vec2 } from '../../core/math'; +import { legacyCC } from '../../core/global-exports'; +import { Enum } from '../../core/value-types'; +import type { ShadowsInfo } from '../../core/scene-graph/scene-globals'; import { IMacroPatch } from '../core/pass'; -import { Shader } from '../../../gfx'; -import { assert } from '../../platform/debug'; +import { Shader } from '../../gfx'; +import { assert } from '../../core/platform/debug'; /** * @zh 阴影贴图分辨率。 diff --git a/cocos/core/renderer/scene/skybox.ts b/cocos/render-scene/scene/skybox.ts similarity index 96% rename from cocos/core/renderer/scene/skybox.ts rename to cocos/render-scene/scene/skybox.ts index a1a18e9676..f78716cc2b 100644 --- a/cocos/core/renderer/scene/skybox.ts +++ b/cocos/render-scene/scene/skybox.ts @@ -23,19 +23,19 @@ THE SOFTWARE. */ -import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr'; -import { Material } from '../../../asset/assets/material'; -import { Mesh } from '../../../3d/assets/mesh'; -import { TextureCube } from '../../../asset/assets/texture-cube'; -import { UNIFORM_ENVIRONMENT_BINDING, UNIFORM_DIFFUSEMAP_BINDING } from '../../pipeline/define'; +import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; +import { Material } from '../../asset/assets/material'; +import { Mesh } from '../../3d/assets/mesh'; +import { TextureCube } from '../../asset/assets/texture-cube'; +import { UNIFORM_ENVIRONMENT_BINDING, UNIFORM_DIFFUSEMAP_BINDING } from '../../core/pipeline/define'; import { MaterialInstance } from '../core/material-instance'; import { Model } from './model'; -import { legacyCC } from '../../global-exports'; -import type { SkyboxInfo } from '../../scene-graph/scene-globals'; -import { Root } from '../../root'; -import { GlobalDSManager } from '../../pipeline/global-descriptor-set-manager'; -import { deviceManager } from '../../../gfx'; -import { Enum } from '../../value-types'; +import { legacyCC } from '../../core/global-exports'; +import type { SkyboxInfo } from '../../core/scene-graph/scene-globals'; +import { Root } from '../../core/root'; +import { GlobalDSManager } from '../../core/pipeline/global-descriptor-set-manager'; +import { deviceManager } from '../../gfx'; +import { Enum } from '../../core/value-types'; let skybox_mesh: Mesh | null = null; let skybox_material: Material | null = null; diff --git a/cocos/core/renderer/scene/sphere-light.ts b/cocos/render-scene/scene/sphere-light.ts similarity index 97% rename from cocos/core/renderer/scene/sphere-light.ts rename to cocos/render-scene/scene/sphere-light.ts index f87ce08692..c6c78ea4fc 100644 --- a/cocos/core/renderer/scene/sphere-light.ts +++ b/cocos/render-scene/scene/sphere-light.ts @@ -23,9 +23,9 @@ THE SOFTWARE. */ -import { AABB } from '../../geometry'; -import { legacyCC } from '../../global-exports'; -import { Vec3 } from '../../math'; +import { AABB } from '../../core/geometry'; +import { legacyCC } from '../../core/global-exports'; +import { Vec3 } from '../../core/math'; import { Light, LightType, nt2lm } from './light'; /** diff --git a/cocos/core/renderer/scene/spot-light.ts b/cocos/render-scene/scene/spot-light.ts similarity index 98% rename from cocos/core/renderer/scene/spot-light.ts rename to cocos/render-scene/scene/spot-light.ts index ca1fbe3501..5979a0acac 100644 --- a/cocos/core/renderer/scene/spot-light.ts +++ b/cocos/render-scene/scene/spot-light.ts @@ -23,9 +23,9 @@ THE SOFTWARE. */ -import { AABB, Frustum } from '../../geometry'; -import { legacyCC } from '../../global-exports'; -import { Mat4, Quat, Vec3 } from '../../math'; +import { AABB, Frustum } from '../../core/geometry'; +import { legacyCC } from '../../core/global-exports'; +import { Mat4, Quat, Vec3 } from '../../core/math'; import { Light, LightType, nt2lm } from './light'; import { PCFType } from './shadows'; diff --git a/cocos/core/renderer/scene/submodel.jsb.ts b/cocos/render-scene/scene/submodel.jsb.ts similarity index 100% rename from cocos/core/renderer/scene/submodel.jsb.ts rename to cocos/render-scene/scene/submodel.jsb.ts diff --git a/cocos/core/renderer/scene/submodel.ts b/cocos/render-scene/scene/submodel.ts similarity index 97% rename from cocos/core/renderer/scene/submodel.ts rename to cocos/render-scene/scene/submodel.ts index e0be6ad83a..132cbd38c0 100644 --- a/cocos/core/renderer/scene/submodel.ts +++ b/cocos/render-scene/scene/submodel.ts @@ -23,15 +23,15 @@ THE SOFTWARE. */ -import { RenderingSubMesh } from '../../../asset/assets/rendering-sub-mesh'; -import { RenderPriority, UNIFORM_REFLECTION_TEXTURE_BINDING, UNIFORM_REFLECTION_STORAGE_BINDING } from '../../pipeline/define'; +import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; +import { RenderPriority, UNIFORM_REFLECTION_TEXTURE_BINDING, UNIFORM_REFLECTION_STORAGE_BINDING } from '../../core/pipeline/define'; import { BatchingSchemes, IMacroPatch, Pass } from '../core/pass'; import { DescriptorSet, DescriptorSetInfo, Device, InputAssembler, Texture, TextureType, TextureUsageBit, TextureInfo, - Format, Sampler, Filter, Address, Shader, SamplerInfo, deviceManager } from '../../../gfx'; -import { legacyCC } from '../../global-exports'; -import { errorID } from '../../platform/debug'; -import { getPhaseID } from '../../pipeline/pass-phase'; -import { Root } from '../../root'; + Format, Sampler, Filter, Address, Shader, SamplerInfo, deviceManager } from '../../gfx'; +import { legacyCC } from '../../core/global-exports'; +import { errorID } from '../../core/platform/debug'; +import { getPhaseID } from '../../core/pipeline/pass-phase'; +import { Root } from '../../core/root'; const _dsInfo = new DescriptorSetInfo(null!); const MAX_PASS_COUNT = 8; diff --git a/cocos/core/renderer/utils.ts b/cocos/render-scene/utils.ts similarity index 97% rename from cocos/core/renderer/utils.ts rename to cocos/render-scene/utils.ts index 11a034bec6..fc8b8de4d0 100644 --- a/cocos/core/renderer/utils.ts +++ b/cocos/render-scene/utils.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Attribute, Buffer, BufferInfo, Device, InputAssemblerInfo, AttributeName, BufferUsageBit, Format, MemoryUsageBit } from '../../gfx'; -import { IGeometry } from '../../primitive/define'; +import { Attribute, Buffer, BufferInfo, Device, InputAssemblerInfo, AttributeName, BufferUsageBit, Format, MemoryUsageBit } from '../gfx'; +import { IGeometry } from '../primitive/define'; export function createIA (device: Device, data: IGeometry) { if (!data.positions) { diff --git a/cocos/spine/assembler/simple.ts b/cocos/spine/assembler/simple.ts index d1215cec7a..a12ca58c08 100644 --- a/cocos/spine/assembler/simple.ts +++ b/cocos/spine/assembler/simple.ts @@ -28,7 +28,7 @@ import spine from '../lib/spine-core.js'; import { IAssembler } from '../../2d/renderer/base'; import { Batcher2D } from '../../2d/renderer/batcher-2d'; import { FrameColor } from '../skeleton-cache'; -import { MaterialInstance } from '../../core/renderer'; +import { MaterialInstance } from '../../render-scene'; import { SkeletonTexture } from '../skeleton-texture'; import { getAttributeStride, vfmtPosUvColor4B, vfmtPosUvTwoColor4B } from '../../2d/renderer/vertex-format'; import { Skeleton, SpineMaterialType } from '../skeleton'; diff --git a/cocos/spine/skeleton.ts b/cocos/spine/skeleton.ts index 2a12d69520..729fd56460 100644 --- a/cocos/spine/skeleton.ts +++ b/cocos/spine/skeleton.ts @@ -35,7 +35,7 @@ import { displayName, displayOrder, editable, override, serializable, tooltip, t import { SkeletonData } from './skeleton-data'; import { VertexEffectDelegate } from './vertex-effect-delegate'; import { Graphics } from '../2d/components/graphics'; -import { MaterialInstance } from '../core/renderer'; +import { MaterialInstance } from '../render-scene'; import { js } from '../core/utils/js'; import { BlendFactor, BlendOp } from '../gfx'; import { legacyCC } from '../core/global-exports'; diff --git a/cocos/terrain/terrain.ts b/cocos/terrain/terrain.ts index bbabe04778..01de7caeb6 100644 --- a/cocos/terrain/terrain.ts +++ b/cocos/terrain/terrain.ts @@ -35,9 +35,9 @@ import { CCObject, isValid } from '../core/data/object'; import { director } from '../core/director'; import { AttributeName, BufferUsageBit, Format, MemoryUsageBit, PrimitiveMode, Attribute, Buffer, BufferInfo, deviceManager } from '../gfx'; import { clamp, Rect, Size, Vec2, Vec3, Vec4 } from '../core/math'; -import { MacroRecord } from '../core/renderer/core/pass-utils'; -import { Pass, scene } from '../core/renderer'; -import { Camera } from '../core/renderer/scene/camera'; +import { MacroRecord } from '../render-scene/core/pass-utils'; +import { Pass, scene } from '../render-scene'; +import { Camera } from '../render-scene/scene/camera'; import { Root } from '../core/root'; import { HeightField } from './height-field'; import { legacyCC } from '../core/global-exports'; diff --git a/exports/base.ts b/exports/base.ts index 10215e1151..2f23ba9c47 100644 --- a/exports/base.ts +++ b/exports/base.ts @@ -29,7 +29,8 @@ import '../predefine'; // tslint:disable-next-line: ordered-imports import '../cocos/core/legacy'; -import * as renderer from '../cocos/core/renderer'; +//TODO(PP): should rename it to render-scene +import * as renderer from '../cocos/render-scene'; import * as gfx from '../cocos/gfx'; // LOAD ENGINE CORE