diff --git a/cc.config.json b/cc.config.json index cf85e9763d..5bdf338f76 100644 --- a/cc.config.json +++ b/cc.config.json @@ -2,18 +2,25 @@ "$schema": "./cc.config.schema.json", "features": { - "base": { "modules": [ "base" ], "dependentAssets": [ - "ff9be190-20a4-4e48-b68c-76e3c7cff085", - "970b0598-bcb0-4714-91fb-2e81440dccd8", - "bcd64cc6-2dd9-43f6-abbe-66318d332032", - "d930590d-bb92-4cc8-8bd1-23cd027f9edf", - "a3cd009f-0ab0-420d-9278-b9fdab939bbc", - "9361fd90-ba52-4f84-aa93-6e878fd576ca" - ]}, - "gfx-webgl": { "modules": [ "gfx-webgl" ] }, - "gfx-webgl2": { "modules": [ "gfx-webgl2" ] }, - "3d": { - "modules": [ "3d" ], + "base": { + "modules": ["base"], + "dependentAssets": [ + "ff9be190-20a4-4e48-b68c-76e3c7cff085", + "970b0598-bcb0-4714-91fb-2e81440dccd8", + "bcd64cc6-2dd9-43f6-abbe-66318d332032", + "d930590d-bb92-4cc8-8bd1-23cd027f9edf", + "a3cd009f-0ab0-420d-9278-b9fdab939bbc", + "9361fd90-ba52-4f84-aa93-6e878fd576ca" + ] + }, + "gfx-webgl": { + "modules": ["gfx-webgl"] + }, + "gfx-webgl2": { + "modules": ["gfx-webgl2"] + }, + "3d": { + "modules": ["3d"], "dependentAssets": [ "1baf0fc9-befa-459c-8bdd-af1a450a0319", "511d2633-09a7-4bdd-ac42-f778032124b3", @@ -21,12 +28,16 @@ "28d6d6b8-3f66-4a73-9795-17a0852ba2d4", "ec8106fe-05bf-4e94-943c-e0d3b7bb5e45", "620b6bf3-0369-4560-837f-2a2c00b73c26" - ] + ] }, - "animation": { "modules": ["animation"] }, - "skeletal-animation": { "modules": ["animation", "skeletal-animation"] }, - "2d": { - "modules": [ "2d", "sorting" ], + "animation": { + "modules": ["animation"] + }, + "skeletal-animation": { + "modules": ["animation", "skeletal-animation"] + }, + "2d": { + "modules": ["2d", "sorting"], "dependentAssets": [ "60f7195c-ec2a-45eb-ba94-8955f60e81d0", "1c02ae6f-4492-4915-b8f8-7492a3b1e4cd", @@ -39,85 +50,117 @@ "f92806d7-1768-443f-afe8-12bcde84d0f0", "dd3a144d-ab7f-41f0-82b8-2e43a090d496", "f0416e68-0200-4b77-a926-4f9d16e494da" - ] + ] }, - "ui": { "modules": [ "ui", "2d" ] }, - "particle": { - "modules": [ "particle" ], - "dependentAssets": [ - "d1346436-ac96-4271-b863-1f4fdead95b0", - "971bdb23-3ff6-43eb-b422-1c30165a3663", - "17debcc3-0a6b-4b8a-b00b-dc58b885581e", + "ui": { + "modules": ["ui", "2d"] + }, + "particle": { + "modules": ["particle"], + "dependentAssets": [ + "d1346436-ac96-4271-b863-1f4fdead95b0", + "971bdb23-3ff6-43eb-b422-1c30165a3663", + "17debcc3-0a6b-4b8a-b00b-dc58b885581e", "711ebe11-f673-4cd9-9a83-63c60ba54c5b", "c0143906-9aed-447e-9436-2ae8512d1b6e", "14da1725-c4c2-42b4-ab08-ee0aeb6898b3", "081cab31-dccd-428e-8652-f2404cc81c47", - "78e0584a-4343-4727-8f37-e14e65c2a2db" + "78e0584a-4343-4727-8f37-e14e65c2a2db" ] }, - "particle-2d": { - "modules": [ "particle-2d" ], - "dependentModules": [ "2d" ] + "particle-2d": { + "modules": ["particle-2d"], + "dependentModules": ["2d"] }, - "physics-framework": { "modules": [ "physics-framework" ] }, - "physics-cannon": { "modules": [ "physics-cannon", "physics-framework" ] , - "dependentAssets": [ "ba21476f-2866-4f81-9c4d-6e359316e448" ]}, - "physics-physx": { "modules": [ "physics-physx", "physics-framework" ] , - "dependentAssets": [ "ba21476f-2866-4f81-9c4d-6e359316e448" ]}, - "physics-ammo": { "modules": [ "physics-ammo", "physics-framework", "wait-for-ammo-instantiation" ] , - "dependentAssets": [ "ba21476f-2866-4f81-9c4d-6e359316e448" ]}, - "physics-builtin": { "modules": [ "physics-builtin", "physics-framework" ] , - "dependentAssets": [ "ba21476f-2866-4f81-9c4d-6e359316e448" ]}, - "physics-2d-framework": { "modules": [ "physics-2d-framework" ] }, - "physics-2d-box2d": { "modules": [ "physics-2d-box2d", "physics-2d-framework" ] }, - "physics-2d-builtin": { "modules": [ "physics-2d-builtin", "physics-2d-framework" ] }, - "intersection-2d": { "modules": [ "intersection-2d" ] }, - "primitive": { "modules": [ "primitive" ] }, - "profiler": { - "modules": [ "profiler" ], - "dependentAssets": [ "871c3b6c-7379-419d-bda3-794b239ab90d" ] + "physics-framework": { + "modules": ["physics-framework"] }, - "occlusion-query": { - "modules": [], - "dependentAssets": [ "d9937e59-61fe-4ec6-92ab-7ac5a19c89b0" ] + "physics-cannon": { + "modules": ["physics-cannon", "physics-framework"], + "dependentAssets": ["ba21476f-2866-4f81-9c4d-6e359316e448"] }, - "geometry-renderer": { - "modules": [ "geometry-renderer" ], - "dependentAssets": [ "4bb480dd-8384-4bc9-987f-de67cc53052a" ] + "physics-physx": { + "modules": ["physics-physx", "physics-framework"], + "dependentAssets": ["ba21476f-2866-4f81-9c4d-6e359316e448"] }, - "debug-renderer": { - "modules": [], + "physics-ammo": { + "modules": ["physics-ammo", "physics-framework", "wait-for-ammo-instantiation"], + "dependentAssets": ["ba21476f-2866-4f81-9c4d-6e359316e448"] + }, + "physics-builtin": { + "modules": ["physics-builtin", "physics-framework"], + "dependentAssets": ["ba21476f-2866-4f81-9c4d-6e359316e448"] + }, + "physics-2d-framework": { + "modules": ["physics-2d-framework"] + }, + "physics-2d-box2d": { + "modules": ["physics-2d-box2d", "physics-2d-framework"] + }, + "physics-2d-builtin": { + "modules": ["physics-2d-builtin", "physics-2d-framework"] + }, + "intersection-2d": { + "modules": ["intersection-2d"] + }, + "primitive": { + "modules": ["primitive"] + }, + "profiler": { + "modules": ["profiler"], + "dependentAssets": ["871c3b6c-7379-419d-bda3-794b239ab90d"] + }, + "occlusion-query": { + "modules": [], + "dependentAssets": ["d9937e59-61fe-4ec6-92ab-7ac5a19c89b0"] + }, + "geometry-renderer": { + "modules": ["geometry-renderer"], + "dependentAssets": ["4bb480dd-8384-4bc9-987f-de67cc53052a"] + }, + "debug-renderer": { + "modules": [], "dependentAssets": [ - "0835f102-5471-47a3-9a76-01c07ac9cdb2", - "b5475517-23b9-4873-bc1a-968d96616081", - "0ed97c56-390e-4dd1-96b7-e7f2d93a98ed", + "0835f102-5471-47a3-9a76-01c07ac9cdb2", + "b5475517-23b9-4873-bc1a-968d96616081", + "0ed97c56-390e-4dd1-96b7-e7f2d93a98ed", "b23391b6-52eb-46a6-8da1-6244d9d315fb" - ] + ] }, - "audio": { "modules": [ "audio" ] }, - "video": { "modules": [ "video" ] }, - "xr": { "modules": [ "xr" ] }, - "terrain": { - "modules": [ "terrain" ], - "dependentAssets": [ "1d08ef62-a503-4ce2-8b9a-46c90873f7d3" ] + "audio": { + "modules": ["audio"] }, - "webview": { "modules": [ "webview" ] }, - "tween": { "modules": [ "tween" ] }, - "tiled-map": { - "modules": [ "tiled-map" ], - "dependentModules": [ "2d" ] + "video": { + "modules": ["video"] }, - "spine": { - "modules": [ "spine" ], - "dependentAssets":[ + "xr": { + "modules": ["xr"] + }, + "terrain": { + "modules": ["terrain"], + "dependentAssets": ["1d08ef62-a503-4ce2-8b9a-46c90873f7d3"] + }, + "webview": { + "modules": ["webview"] + }, + "tween": { + "modules": ["tween"] + }, + "tiled-map": { + "modules": ["tiled-map"], + "dependentModules": ["2d"] + }, + "spine": { + "modules": ["spine"], + "dependentAssets": [ "c27215d8-6835-4b68-bfbb-bdeac6100c04", "b5d6115f-0370-4d7c-aad3-c194cc71cf98" ], - "dependentModules": [ "2d" ] + "dependentModules": ["2d"] }, - "dragon-bones": { - "modules": [ "dragon-bones" ], - "dependentModules": [ "2d" ] + "dragon-bones": { + "modules": ["dragon-bones"], + "dependentModules": ["2d"] }, "marionette": { "modules": [], @@ -125,10 +168,11 @@ "MARIONETTE": true } }, - "custom-pipeline": { "modules": ["custom-pipeline"] } + "custom-pipeline": { + "modules": ["custom-pipeline"] + } }, - "moduleOverrides": [ - { + "moduleOverrides": [{ "test": "true", "isVirtualModule": true, "overrides": { @@ -138,8 +182,7 @@ { "test": "context.mode === 'BUILD'", "isVirtualModule": false, - "overrides": { - } + "overrides": {} }, { "test": "context.platform !== 'NATIVE'", @@ -152,10 +195,10 @@ "test": "context.platform === 'NATIVE'", "isVirtualModule": false, "overrides": { - "cocos/core/pipeline/index.ts": "cocos/core/pipeline/index.jsb.ts", - "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/rendering/index.ts": "cocos/rendering/index.jsb.ts", + "cocos/rendering/render-pipeline.ts": "cocos/rendering/render-pipeline.jsb.ts", + "cocos/rendering/geometry-renderer.ts": "cocos/rendering/geometry-renderer.jsb.ts", + "cocos/rendering/custom/index.ts": "cocos/rendering/custom/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", @@ -193,12 +236,12 @@ "cocos/asset/assets/texture-cube.ts": "cocos/asset/assets/texture-cube.jsb.ts", "cocos/asset/assets/material.ts": "cocos/asset/assets/material.jsb.ts", "cocos/asset/assets/rendering-sub-mesh.ts": "cocos/asset/assets/rendering-sub-mesh.jsb.ts", - "cocos/3d/assets/mesh.ts":"cocos/3d/assets/mesh.jsb.ts", - "cocos/3d/assets/skeleton.ts":"cocos/3d/assets/skeleton.jsb.ts", - "cocos/3d/models/morph-model.ts":"cocos/3d/models/morph-model.jsb.ts", - "cocos/3d/models/skinning-model.ts":"cocos/3d/models/skinning-model.jsb.ts", - "cocos/3d/models/baked-skinning-model.ts":"cocos/3d/models/baked-skinning-model.jsb.ts", - "cocos/3d/misc/create-mesh.ts":"cocos/3d/misc/create-mesh.jsb.ts" + "cocos/3d/assets/mesh.ts": "cocos/3d/assets/mesh.jsb.ts", + "cocos/3d/assets/skeleton.ts": "cocos/3d/assets/skeleton.jsb.ts", + "cocos/3d/models/morph-model.ts": "cocos/3d/models/morph-model.jsb.ts", + "cocos/3d/models/skinning-model.ts": "cocos/3d/models/skinning-model.jsb.ts", + "cocos/3d/models/baked-skinning-model.ts": "cocos/3d/models/baked-skinning-model.jsb.ts", + "cocos/3d/misc/create-mesh.ts": "cocos/3d/misc/create-mesh.jsb.ts" } }, { diff --git a/cocos/2d/components/ui-mesh-renderer.ts b/cocos/2d/components/ui-mesh-renderer.ts index e8b02feb58..154639a6e2 100644 --- a/cocos/2d/components/ui-mesh-renderer.ts +++ b/cocos/2d/components/ui-mesh-renderer.ts @@ -27,7 +27,7 @@ import { ccclass, help, executionOrder, menu, executeInEditMode } from 'cc.decorator'; import { DEBUG, JSB } from 'internal:constants'; import { ModelRenderer } from '../../core/components/model-renderer'; -import { RenderPriority } from '../../core/pipeline/define'; +import { RenderPriority } from '../../rendering/define'; import { IBatcher } from '../renderer/i-batcher'; import { Stage } from '../renderer/stencil-manager'; import { Component } from '../../core/components'; diff --git a/cocos/2d/framework/sprite-renderer.ts b/cocos/2d/framework/sprite-renderer.ts index 0a5521dff2..41979bbdd1 100644 --- a/cocos/2d/framework/sprite-renderer.ts +++ b/cocos/2d/framework/sprite-renderer.ts @@ -27,7 +27,7 @@ import { builtinResMgr } from '../../asset/asset-manager'; import { Material } from '../../asset/assets'; import { Color, ModelRenderer, Vec2 } from '../../core'; import { legacyCC } from '../../core/global-exports'; -import { ModelLocalBindings } from '../../core/pipeline/define'; +import { ModelLocalBindings } from '../../rendering/define'; import { Model } from '../../render-scene/scene'; import { Root } from '../../core/root'; import { TransformBit } from '../../core/scene-graph/node-enum'; diff --git a/cocos/2d/renderer/batcher-2d.ts b/cocos/2d/renderer/batcher-2d.ts index 64b71e635c..4704348a50 100644 --- a/cocos/2d/renderer/batcher-2d.ts +++ b/cocos/2d/renderer/batcher-2d.ts @@ -37,7 +37,7 @@ import { Node } from '../../core/scene-graph'; import { Stage, StencilManager } from './stencil-manager'; import { DrawBatch2D } from './draw-batch'; import { legacyCC } from '../../core/global-exports'; -import { ModelLocalBindings, UBOLocal } from '../../core/pipeline/define'; +import { ModelLocalBindings, UBOLocal } from '../../rendering/define'; import { SpriteFrame } from '../assets'; import { TextureBase } from '../../asset/assets/texture-base'; import { Mat4 } from '../../core/math'; diff --git a/cocos/3d/assets/morph-rendering.ts b/cocos/3d/assets/morph-rendering.ts index 93575ae7df..02d40d996b 100644 --- a/cocos/3d/assets/morph-rendering.ts +++ b/cocos/3d/assets/morph-rendering.ts @@ -30,7 +30,7 @@ import { Mesh } from './mesh'; import { Texture2D } from '../../asset/assets/texture-2d'; import { ImageAsset } from '../../asset/assets/image-asset'; import { UBOMorph, UNIFORM_NORMAL_MORPH_TEXTURE_BINDING, - UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../../core/pipeline/define'; + UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../../rendering/define'; import { warn } from '../../core/platform/debug'; import { Morph, SubMeshMorph } from './morph'; import { assertIsNonNullable, assertIsTrue } from '../../core/data/utils/asserts'; diff --git a/cocos/3d/models/baked-skinning-model.ts b/cocos/3d/models/baked-skinning-model.ts index 51691d81ac..df3ebe3a5b 100644 --- a/cocos/3d/models/baked-skinning-model.ts +++ b/cocos/3d/models/baked-skinning-model.ts @@ -28,7 +28,7 @@ import { Mesh } from '../assets/mesh'; import { Skeleton } from '../assets/skeleton'; 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 { INST_JOINT_ANIM_INFO, UBOSkinningAnimation, UBOSkinningTexture, UNIFORM_JOINT_TEXTURE_BINDING } from '../../rendering/define'; import { Node } from '../../core/scene-graph'; import { IMacroPatch, Pass } from '../../render-scene/core/pass'; import type { DataPoolManager } from '../skeletal-animation/data-pool-manager'; diff --git a/cocos/3d/models/skinning-model.ts b/cocos/3d/models/skinning-model.ts index 2ed86bf0d0..4d25f7a30f 100644 --- a/cocos/3d/models/skinning-model.ts +++ b/cocos/3d/models/skinning-model.ts @@ -30,7 +30,7 @@ import { Skeleton } from '../assets/skeleton'; import { AABB } from '../../core/geometry'; import { BufferUsageBit, MemoryUsageBit, DescriptorSet, Buffer, BufferInfo, Attribute, FormatFeatureBit, Format } from '../../gfx'; import { Mat4, Vec3 } from '../../core/math'; -import { UBOSkinning, UNIFORM_REALTIME_JOINT_TEXTURE_BINDING } from '../../core/pipeline/define'; +import { UBOSkinning, UNIFORM_REALTIME_JOINT_TEXTURE_BINDING } from '../../rendering/define'; import { Node } from '../../core/scene-graph/node'; import { ModelType } from '../../render-scene/scene/model'; import { uploadJointData } from '../skeletal-animation/skeletal-animation-utils'; diff --git a/cocos/3d/skeletal-animation/skeletal-animation-utils.ts b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts index 1162e6cd34..57f236cc03 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-utils.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts @@ -33,7 +33,7 @@ import { AABB } from '../../core/geometry'; import { BufferUsageBit, Format, FormatInfos, MemoryUsageBit, Device, Buffer, BufferInfo, FormatFeatureBit } from '../../gfx'; import { Mat4, Quat, Vec3 } from '../../core/math'; -import { UBOSkinningAnimation } from '../../core/pipeline/define'; +import { UBOSkinningAnimation } from '../../rendering/define'; import { Node } from '../../core/scene-graph'; import { ITextureBufferHandle, TextureBufferPool } from '../../render-scene/core/texture-buffer-pool'; import { jointTextureSamplerInfo } from '../misc/joint-texture-sampler-info'; diff --git a/cocos/asset/assets/effect-asset.ts b/cocos/asset/assets/effect-asset.ts index 12752ea404..d34f31036f 100644 --- a/cocos/asset/assets/effect-asset.ts +++ b/cocos/asset/assets/effect-asset.ts @@ -28,7 +28,7 @@ import { EDITOR } from 'internal:constants'; 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 { RenderPassStage } from '../../rendering/define'; import { MacroRecord } from '../../render-scene/core/pass-utils'; import { programLib } from '../../render-scene/core/program-lib'; import { Asset } from './asset'; diff --git a/cocos/asset/assets/material.ts b/cocos/asset/assets/material.ts index 8bd7ae49df..a718daa577 100644 --- a/cocos/asset/assets/material.ts +++ b/cocos/asset/assets/material.ts @@ -34,7 +34,7 @@ import { MacroRecord, MaterialProperty } from '../../render-scene/core/pass-util import { Color } from '../../core/math/color'; import { warnID } from '../../core/platform/debug'; import { Vec4 } from '../../core/math'; -import { SRGBToLinear } from '../../core/pipeline/pipeline-funcs'; +import { SRGBToLinear } from '../../rendering/pipeline-funcs'; import { Renderer } from '../../core/components/renderer'; const v4_1 = new Vec4(); diff --git a/cocos/core/components/camera-component.ts b/cocos/core/components/camera-component.ts index d84151a498..93e649a619 100644 --- a/cocos/core/components/camera-component.ts +++ b/cocos/core/components/camera-component.ts @@ -30,7 +30,7 @@ import { UITransform } from '../../2d/framework'; import { Component } from './component'; import { Ray } from '../geometry'; import { Color, Rect, toRadian, Vec3 } from '../math'; -import { CAMERA_DEFAULT_MASK } from '../pipeline/define'; +import { CAMERA_DEFAULT_MASK } from '../../rendering/define'; import { scene } from '../../render-scene'; import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter, CameraType, TrackingType } from '../../render-scene/scene/camera'; diff --git a/cocos/core/game.ts b/cocos/core/game.ts index e065801feb..4bef6470bc 100644 --- a/cocos/core/game.ts +++ b/cocos/core/game.ts @@ -39,14 +39,14 @@ import { sys } from './platform/sys'; import { macro } from './platform/macro'; import { legacyCC, VERSION } from './global-exports'; import { SplashScreen } from './splash-screen'; -import { RenderPipeline } from './pipeline/render-pipeline'; +import { RenderPipeline } from '../rendering'; import { Layers, Node } from './scene-graph'; import { garbageCollectionManager } from './data/garbage-collection'; import { screen } from './platform/screen'; import { builtinResMgr } from '../asset/asset-manager/builtin-res-mgr'; import { Settings, settings } from './settings'; import { Director, director } from './director'; -import { bindingMappingInfo } from './pipeline/define'; +import { bindingMappingInfo } from '../rendering/define'; import { assert } from './platform/debug'; import { IBundleOptions } from '../asset/asset-manager/shared'; import { ICustomJointTextureLayout } from '../3d/skeletal-animation/skeletal-animation-utils'; diff --git a/cocos/core/index.ts b/cocos/core/index.ts index 6f814a645c..cf18fb308c 100644 --- a/cocos/core/index.ts +++ b/cocos/core/index.ts @@ -50,13 +50,10 @@ export { Root } from './root'; export * from './scheduler'; export * from './director'; export * from './algorithm/murmurhash2_gc'; -export * from './pipeline'; export * from './scene-graph'; export * from './components'; export * from './curves'; export * from './settings'; -export * from './pipeline/custom/builtin-pipelines'; - export * from './curves/bezier'; export { easing }; diff --git a/cocos/core/root.jsb.ts b/cocos/core/root.jsb.ts index c280f3f60a..6204469417 100644 --- a/cocos/core/root.jsb.ts +++ b/cocos/core/root.jsb.ts @@ -3,9 +3,10 @@ import { warnID } from './platform/debug'; import legacyCC from '../../predefine'; import { DataPoolManager } from '../3d/skeletal-animation/data-pool-manager'; import { Device, deviceManager } from '../gfx'; -import { DebugView } from './pipeline/debug-view'; -import { buildDeferredLayout, buildForwardLayout } from './pipeline/custom/effect'; +import { DebugView } from '../rendering/debug-view'; +import { buildDeferredLayout, buildForwardLayout } from '../rendering/custom/effect'; import { settings, Settings } from './settings'; +import { ForwardPipeline } from '../rendering'; declare const nr: any; declare const jsb: any; @@ -203,7 +204,7 @@ rootProto.setRenderPipeline = function (pipeline) { } else { if (!pipeline) { // pipeline should not be created in C++, ._ctor need to be triggered - pipeline = new nr.ForwardPipeline(); + pipeline = new ForwardPipeline(); pipeline.init(); } ppl = oldSetPipeline.call(this, pipeline); diff --git a/cocos/core/root.ts b/cocos/core/root.ts index 2f4b1cf56d..34fb7c90c1 100644 --- a/cocos/core/root.ts +++ b/cocos/core/root.ts @@ -24,8 +24,8 @@ */ import { Pool } from './memop'; -import { RenderPipeline, createDefaultPipeline, DeferredPipeline } from './pipeline'; -import { DebugView } from './pipeline/debug-view'; +import { RenderPipeline, createDefaultPipeline, DeferredPipeline } from '../rendering'; +import { DebugView } from '../rendering/debug-view'; import { Camera, Light, Model } from '../render-scene/scene'; import type { DataPoolManager } from '../3d/skeletal-animation/data-pool-manager'; import { LightType } from '../render-scene/scene/light'; @@ -37,11 +37,11 @@ import { legacyCC } from './global-exports'; 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'; +import { Pipeline, PipelineRuntime } from '../rendering/custom/pipeline'; import { Batcher2D } from '../2d/renderer/batcher-2d'; -import { IPipelineEvent } from './pipeline/pipeline-event'; +import { IPipelineEvent } from '../rendering/pipeline-event'; import { settings, Settings } from './settings'; -import { localDescriptorSetLayout_ResizeMaxJoints } from './pipeline/define'; +import { localDescriptorSetLayout_ResizeMaxJoints } from '../rendering/define'; import { macro } from './platform/macro'; /** diff --git a/cocos/core/splash-screen.ts b/cocos/core/splash-screen.ts index b68c65b62a..8177e9a7a2 100644 --- a/cocos/core/splash-screen.ts +++ b/cocos/core/splash-screen.ts @@ -32,9 +32,9 @@ import { BufferInfo, Rect, Color, BufferTextureCopy, Framebuffer, CommandBuffer, BufferUsageBit, Format, MemoryUsageBit, TextureType, TextureUsageBit, Address, SurfaceTransform, Swapchain, } from '../gfx'; -import { PipelineStateManager } from './pipeline'; +import { PipelineStateManager } from '../rendering'; import { legacyCC } from './global-exports'; -import { SetIndex } from './pipeline/define'; +import { SetIndex } from '../rendering/define'; import { Mat4, Vec2 } from './math'; import { Settings, settings } from './settings'; import { sys } from './platform/sys'; diff --git a/cocos/profiler/profiler.ts b/cocos/profiler/profiler.ts index 9176c7bfaf..121f01a959 100644 --- a/cocos/profiler/profiler.ts +++ b/cocos/profiler/profiler.ts @@ -37,7 +37,7 @@ import { legacyCC } from '../core/global-exports'; import { Pass } from '../render-scene'; import { preTransforms } from '../core/math/mat4'; import { Root } from '../core/root'; -import { PipelineRuntime } from '../core/pipeline/custom/pipeline'; +import { PipelineRuntime } from '../rendering/custom/pipeline'; import { director, System, sys } from '../core'; import { Settings, settings } from '../core/settings'; diff --git a/cocos/render-scene/core/pass.ts b/cocos/render-scene/core/pass.ts index 511fea621f..ecc080321c 100644 --- a/cocos/render-scene/core/pass.ts +++ b/cocos/render-scene/core/pass.ts @@ -27,7 +27,7 @@ import { EDITOR } from 'internal:constants'; 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 { getPhaseID } from '../../rendering/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, @@ -38,10 +38,10 @@ import { IProgramInfo, programLib } from './program-lib'; import { MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType, getStringFromType, getOffsetFromHandle, getTypeFromHandle, type2reader, type2writer, getCountFromHandle, } from './pass-utils'; -import { RenderPassStage, RenderPriority } from '../../core/pipeline/define'; +import { RenderPassStage, RenderPriority } from '../../rendering/define'; import { errorID } from '../../core/platform/debug'; -import { InstancedBuffer } from '../../core/pipeline/instanced-buffer'; -import { BatchedBuffer } from '../../core/pipeline/batched-buffer'; +import { InstancedBuffer } from '../../rendering/instanced-buffer'; +import { BatchedBuffer } from '../../rendering/batched-buffer'; export interface IPassInfoFull extends EffectAsset.IPassInfo { // generated part diff --git a/cocos/render-scene/core/program-lib.ts b/cocos/render-scene/core/program-lib.ts index 7795ea8a02..008a53d260 100644 --- a/cocos/render-scene/core/program-lib.ts +++ b/cocos/render-scene/core/program-lib.ts @@ -24,8 +24,8 @@ */ import { EffectAsset } from '../../asset/assets/effect-asset'; -import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../core/pipeline/define'; -import { PipelineRuntime } from '../../core/pipeline/custom/pipeline'; +import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../rendering/define'; +import { PipelineRuntime } from '../../rendering/custom/pipeline'; import { genHandle, MacroRecord } from './pass-utils'; import { legacyCC } from '../../core/global-exports'; import { PipelineLayoutInfo, Device, Attribute, UniformBlock, ShaderInfo, diff --git a/cocos/render-scene/scene/camera.ts b/cocos/render-scene/scene/camera.ts index 9e7b449fb0..59b0b609e2 100644 --- a/cocos/render-scene/scene/camera.ts +++ b/cocos/render-scene/scene/camera.ts @@ -26,14 +26,14 @@ import { EDITOR } from 'internal:constants'; 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 { CAMERA_DEFAULT_MASK } from '../../rendering/define'; import { Node } from '../../core/scene-graph'; import { RenderScene } from '../core/render-scene'; import { legacyCC } from '../../core/global-exports'; import { RenderWindow } from '../core/render-window'; import { preTransforms } from '../../core/math/mat4'; import { warnID } from '../../core/platform/debug'; -import { GeometryRenderer } from '../../core/pipeline/geometry-renderer'; +import { GeometryRenderer } from '../../rendering/geometry-renderer'; export enum CameraFOVAxis { VERTICAL, diff --git a/cocos/render-scene/scene/fog.ts b/cocos/render-scene/scene/fog.ts index 27e42eb6e2..458979e15d 100644 --- a/cocos/render-scene/scene/fog.ts +++ b/cocos/render-scene/scene/fog.ts @@ -27,7 +27,7 @@ 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'; +import { SRGBToLinear } from '../../rendering/pipeline-funcs'; const _v4 = new Vec4(); diff --git a/cocos/render-scene/scene/model.ts b/cocos/render-scene/scene/model.ts index b5c4bf2584..df3e7763a0 100644 --- a/cocos/render-scene/scene/model.ts +++ b/cocos/render-scene/scene/model.ts @@ -37,7 +37,7 @@ import { Pass, IMacroPatch, BatchingSchemes } from '../core/pass'; 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 '../../core/pipeline/define'; +import { INST_MAT_WORLD, UBOLocal, UBOWorldBound, UNIFORM_LIGHTMAP_TEXTURE_BINDING } from '../../rendering/define'; const m4_1 = new Mat4(); diff --git a/cocos/render-scene/scene/skybox.ts b/cocos/render-scene/scene/skybox.ts index f78716cc2b..4ff112cc26 100644 --- a/cocos/render-scene/scene/skybox.ts +++ b/cocos/render-scene/scene/skybox.ts @@ -27,13 +27,13 @@ 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 { UNIFORM_ENVIRONMENT_BINDING, UNIFORM_DIFFUSEMAP_BINDING } from '../../rendering/define'; import { MaterialInstance } from '../core/material-instance'; import { Model } from './model'; 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 { GlobalDSManager } from '../../rendering/global-descriptor-set-manager'; import { deviceManager } from '../../gfx'; import { Enum } from '../../core/value-types'; diff --git a/cocos/render-scene/scene/submodel.ts b/cocos/render-scene/scene/submodel.ts index 132cbd38c0..16d56b4cdb 100644 --- a/cocos/render-scene/scene/submodel.ts +++ b/cocos/render-scene/scene/submodel.ts @@ -24,13 +24,13 @@ */ import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; -import { RenderPriority, UNIFORM_REFLECTION_TEXTURE_BINDING, UNIFORM_REFLECTION_STORAGE_BINDING } from '../../core/pipeline/define'; +import { RenderPriority, UNIFORM_REFLECTION_TEXTURE_BINDING, UNIFORM_REFLECTION_STORAGE_BINDING } from '../../rendering/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 '../../core/global-exports'; import { errorID } from '../../core/platform/debug'; -import { getPhaseID } from '../../core/pipeline/pass-phase'; +import { getPhaseID } from '../../rendering/pass-phase'; import { Root } from '../../core/root'; const _dsInfo = new DescriptorSetInfo(null!); diff --git a/cocos/core/pipeline/batched-buffer.ts b/cocos/rendering/batched-buffer.ts similarity index 97% rename from cocos/core/pipeline/batched-buffer.ts rename to cocos/rendering/batched-buffer.ts index d2b9e117d3..c71643b1c6 100644 --- a/cocos/core/pipeline/batched-buffer.ts +++ b/cocos/rendering/batched-buffer.ts @@ -24,12 +24,12 @@ */ import { BufferUsageBit, Format, MemoryUsageBit, Device, DescriptorSet, InputAssembler, - InputAssemblerInfo, Attribute, Buffer, BufferInfo, Shader } from '../../gfx'; -import { Mat4 } from '../math'; -import { SubModel } from '../../render-scene/scene/submodel'; + InputAssemblerInfo, Attribute, Buffer, BufferInfo, Shader } from '../gfx'; +import { Mat4 } from '../core/math'; +import { SubModel } from '../render-scene/scene/submodel'; import { UBOLocalBatched } from './define'; -import { Pass } from '../../render-scene'; -import { Model } from '../../render-scene/scene'; +import { Pass } from '../render-scene'; +import { Model } from '../render-scene/scene'; export interface IBatchedItem { vbs: Buffer[]; diff --git a/cocos/core/pipeline/category.json b/cocos/rendering/category.json similarity index 100% rename from cocos/core/pipeline/category.json rename to cocos/rendering/category.json diff --git a/cocos/core/pipeline/custom/builtin-pipelines.ts b/cocos/rendering/custom/builtin-pipelines.ts similarity index 98% rename from cocos/core/pipeline/custom/builtin-pipelines.ts rename to cocos/rendering/custom/builtin-pipelines.ts index 3f1d89a78d..d81bf50f9e 100644 --- a/cocos/core/pipeline/custom/builtin-pipelines.ts +++ b/cocos/rendering/custom/builtin-pipelines.ts @@ -1,8 +1,8 @@ -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 '../../../render-scene/scene'; +import { Material } from '../../asset/assets'; +import { intersect, Sphere } from '../../core/geometry'; +import { ClearFlagBit, Color, Format, LoadOp, Rect, StoreOp, Viewport } from '../../gfx'; +import { macro } from '../../core/platform'; +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/compiler.ts b/cocos/rendering/custom/compiler.ts similarity index 98% rename from cocos/core/pipeline/custom/compiler.ts rename to cocos/rendering/custom/compiler.ts index e1b4eef003..13cbe3a252 100644 --- a/cocos/core/pipeline/custom/compiler.ts +++ b/cocos/rendering/custom/compiler.ts @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -import { Buffer, Framebuffer, Texture, Viewport } from '../../../gfx'; -import { assert } from '../../platform/debug'; +import { Buffer, Framebuffer, Texture, Viewport } from '../../gfx'; +import { assert } from '../../core/platform/debug'; import { VectorGraphColorMap } from './effect'; import { DefaultVisitor, depthFirstSearch, ReferenceGraphView } from './graph'; import { LayoutGraphData } from './layout-graph'; diff --git a/cocos/core/pipeline/custom/debug.ts b/cocos/rendering/custom/debug.ts similarity index 99% rename from cocos/core/pipeline/custom/debug.ts rename to cocos/rendering/custom/debug.ts index 0ee76dd397..2af3363d0f 100644 --- a/cocos/core/pipeline/custom/debug.ts +++ b/cocos/rendering/custom/debug.ts @@ -1,6 +1,6 @@ /* eslint-disable max-len */ import { Viewport } from '../../gfx'; -import { assert } from '../../platform'; +import { assert } from '../../core/platform'; import { DefaultVisitor, ReferenceGraphView, ED, edge_descriptor, IncidenceGraph } from './graph'; import { Blit, ClearView, ComputePass, CopyPass, Dispatch, getRenderGraphValueName, MovePass, PresentPass, RasterPass, RaytracePass, RenderGraph, RenderGraphValue, RenderGraphVisitor, RenderQueue, SceneData } from './render-graph'; import { getQueueHintName } from './types'; diff --git a/cocos/core/pipeline/custom/effect.ts b/cocos/rendering/custom/effect.ts similarity index 98% rename from cocos/core/pipeline/custom/effect.ts rename to cocos/rendering/custom/effect.ts index 177fe6c025..e46b990357 100644 --- a/cocos/core/pipeline/custom/effect.ts +++ b/cocos/rendering/custom/effect.ts @@ -1,10 +1,10 @@ -import { legacyCC } from '../../global-exports'; -import { EffectAsset } from '../../../asset/assets'; +import { legacyCC } from '../../core/global-exports'; +import { EffectAsset } from '../../asset/assets'; import { CollectVisitor, WebDescriptorHierarchy } from './web-descriptor-hierarchy'; // eslint-disable-next-line max-len import { Descriptor, DescriptorBlock, DescriptorBlockFlattened, DescriptorBlockIndex, DescriptorDB, DescriptorTypeOrder, LayoutGraph, LayoutGraphValue } from './layout-graph'; import { LayoutGraphBuilder, Pipeline } from './pipeline'; -import { DescriptorType, ShaderStageFlagBit, Type, UniformBlock } from '../../../gfx'; +import { DescriptorType, ShaderStageFlagBit, Type, UniformBlock } from '../../gfx'; import { ParameterType, UpdateFrequency } from './types'; import { depthFirstSearch, GraphColor, MutableVertexPropertyMap } from './graph'; diff --git a/cocos/core/pipeline/custom/executor.ts b/cocos/rendering/custom/executor.ts similarity index 98% rename from cocos/core/pipeline/custom/executor.ts rename to cocos/rendering/custom/executor.ts index b67a7c7495..3be4fa7a98 100644 --- a/cocos/core/pipeline/custom/executor.ts +++ b/cocos/rendering/custom/executor.ts @@ -30,21 +30,21 @@ */ /* eslint-disable max-len */ import { getPhaseID, InstancedBuffer, PipelineStateManager } from '..'; -import { assert } from '../..'; -import intersect from '../../geometry/intersect'; -import { Sphere } from '../../geometry/sphere'; +import { assert } from '../../core'; +import intersect from '../../core/geometry/intersect'; +import { Sphere } from '../../core/geometry/sphere'; import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, BufferViewInfo, Color, ColorAttachment, CommandBuffer, DepthStencilAttachment, DescriptorSet, DescriptorSetInfo, Device, deviceManager, Format, Framebuffer, FramebufferInfo, GeneralBarrierInfo, InputAssemblerInfo, LoadOp, MemoryUsageBit, PipelineState, Rect, RenderPass, RenderPassInfo, Sampler, SamplerInfo, StoreOp, SurfaceTransform, Swapchain, Texture, TextureInfo, - TextureType, TextureUsageBit, Viewport } from '../../../gfx'; -import { legacyCC } from '../../global-exports'; -import { Vec3 } from '../../math/vec3'; -import { Vec4 } from '../../math/vec4'; -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'; + TextureType, TextureUsageBit, Viewport } from '../../gfx'; +import { legacyCC } from '../../core/global-exports'; +import { Vec3 } from '../../core/math/vec3'; +import { Vec4 } from '../../core/math/vec4'; +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 '../../core/root'; import { BatchedBuffer } from '../batched-buffer'; import { SetIndex, UBODeferredLight, UBOForwardLight, UBOLocal } from '../define'; import { PipelineSceneData } from '../pipeline-scene-data'; diff --git a/cocos/core/pipeline/custom/graph.ts b/cocos/rendering/custom/graph.ts similarity index 100% rename from cocos/core/pipeline/custom/graph.ts rename to cocos/rendering/custom/graph.ts diff --git a/cocos/core/pipeline/custom/index.jsb.ts b/cocos/rendering/custom/index.jsb.ts similarity index 97% rename from cocos/core/pipeline/custom/index.jsb.ts rename to cocos/rendering/custom/index.jsb.ts index 3d7115c0ea..c6fc398964 100644 --- a/cocos/core/pipeline/custom/index.jsb.ts +++ b/cocos/rendering/custom/index.jsb.ts @@ -25,7 +25,7 @@ declare const render: any; -import { legacyCC } from '../../global-exports'; +import { legacyCC } from '../../core/global-exports'; import { Pipeline, PipelineBuilder } from './pipeline'; import { buildDeferredLayout, buildForwardLayout } from './effect'; diff --git a/cocos/core/pipeline/custom/index.ts b/cocos/rendering/custom/index.ts similarity index 97% rename from cocos/core/pipeline/custom/index.ts rename to cocos/rendering/custom/index.ts index 3028c2bc92..9184c78d96 100644 --- a/cocos/core/pipeline/custom/index.ts +++ b/cocos/rendering/custom/index.ts @@ -26,7 +26,7 @@ import { Pipeline, PipelineBuilder } from './pipeline'; import { WebPipeline } from './web-pipeline'; import { buildDeferredLayout, buildForwardLayout } from './effect'; -import { macro } from '../../platform/macro'; +import { macro } from '../../core/platform/macro'; let _pipeline: WebPipeline | null = null; diff --git a/cocos/core/pipeline/custom/layout-graph.ts b/cocos/rendering/custom/layout-graph.ts similarity index 99% rename from cocos/core/pipeline/custom/layout-graph.ts rename to cocos/rendering/custom/layout-graph.ts index f64edd533a..06a80e5e54 100644 --- a/cocos/core/pipeline/custom/layout-graph.ts +++ b/cocos/rendering/custom/layout-graph.ts @@ -30,9 +30,9 @@ */ /* eslint-disable max-len */ import * as impl from './graph'; -import { DescriptorSet, DescriptorSetLayout, DescriptorSetLayoutInfo, ShaderStageFlagBit, Type, UniformBlock } from '../../../gfx'; +import { DescriptorSet, DescriptorSetLayout, DescriptorSetLayoutInfo, ShaderStageFlagBit, Type, UniformBlock } from '../../gfx'; import { ParameterType, UpdateFrequency } from './types'; -import { ccclass } from '../../data/decorators'; +import { ccclass } from '../../core/data/decorators'; export const enum DescriptorTypeOrder { UNIFORM_BUFFER, diff --git a/cocos/core/pipeline/custom/pipeline.ts b/cocos/rendering/custom/pipeline.ts similarity index 95% rename from cocos/core/pipeline/custom/pipeline.ts rename to cocos/rendering/custom/pipeline.ts index e5180f11cd..5416058508 100644 --- a/cocos/core/pipeline/custom/pipeline.ts +++ b/cocos/rendering/custom/pipeline.ts @@ -29,20 +29,20 @@ * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! ========================= */ /* eslint-disable max-len */ -import { Material } from '../../../asset/assets'; -import { Camera } from '../../../render-scene/scene/camera'; +import { Material } from '../../asset/assets'; +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 { 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 '../../../render-scene/core/pass-utils'; +import { Mat4, Quat, Vec2, Vec4 } from '../../core/math'; +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 '../../../render-scene/core/render-scene'; -import { RenderWindow } from '../../../render-scene/core/render-window'; -import { Model } from '../../../render-scene/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/rendering/custom/render-graph.ts similarity index 99% rename from cocos/core/pipeline/custom/render-graph.ts rename to cocos/rendering/custom/render-graph.ts index 25f31c7a61..4a28c210b7 100644 --- a/cocos/core/pipeline/custom/render-graph.ts +++ b/cocos/rendering/custom/render-graph.ts @@ -30,9 +30,9 @@ */ /* eslint-disable max-len */ import * as impl from './graph'; -import { Material } from '../../../asset/assets'; -import { Camera } from '../../../render-scene/scene/camera'; -import { AccessFlagBit, Buffer, ClearFlagBit, Color, Format, Framebuffer, SampleCount, Sampler, Swapchain, Texture, TextureFlagBit, Viewport } from '../../../gfx'; +import { Material } from '../../asset/assets'; +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'; export class ResourceDesc { diff --git a/cocos/core/pipeline/custom/types.ts b/cocos/rendering/custom/types.ts similarity index 98% rename from cocos/core/pipeline/custom/types.ts rename to cocos/rendering/custom/types.ts index dad24d5f56..79bf589a5a 100644 --- a/cocos/core/pipeline/custom/types.ts +++ b/cocos/rendering/custom/types.ts @@ -29,8 +29,8 @@ * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! ========================= */ /* eslint-disable max-len */ -import { ClearFlagBit, Color, LoadOp, StoreOp } from '../../../gfx'; -import { Light } from '../../../render-scene/scene'; +import { ClearFlagBit, Color, LoadOp, StoreOp } from '../../gfx'; +import { Light } from '../../render-scene/scene'; export const enum UpdateFrequency { PER_INSTANCE, diff --git a/cocos/core/pipeline/custom/utils.ts b/cocos/rendering/custom/utils.ts similarity index 97% rename from cocos/core/pipeline/custom/utils.ts rename to cocos/rendering/custom/utils.ts index 75b2197c49..e69a067a15 100644 --- a/cocos/core/pipeline/custom/utils.ts +++ b/cocos/rendering/custom/utils.ts @@ -1,6 +1,6 @@ // https://stackoverflow.com/questions/56714318/how-to-disable-multiple-rules-for-eslint-nextline?msclkid=5d4c2298ba7911eca34d0ab30591752e -import { Type } from '../../../gfx/base/define'; +import { Type } from '../../gfx/base/define'; // eslint-disable-next-line @typescript-eslint/no-unused-vars export function replacer (key: unknown, value: unknown) { diff --git a/cocos/core/pipeline/custom/web-descriptor-hierarchy.ts b/cocos/rendering/custom/web-descriptor-hierarchy.ts similarity index 99% rename from cocos/core/pipeline/custom/web-descriptor-hierarchy.ts rename to cocos/rendering/custom/web-descriptor-hierarchy.ts index 9a7ecc4e06..fe429b28e3 100644 --- a/cocos/core/pipeline/custom/web-descriptor-hierarchy.ts +++ b/cocos/rendering/custom/web-descriptor-hierarchy.ts @@ -24,13 +24,13 @@ THE SOFTWARE. ****************************************************************************/ -import { EffectAsset } from '../../../asset/assets'; +import { EffectAsset } from '../../asset/assets'; import { Descriptor, DescriptorBlock, DescriptorBlockIndex, DescriptorDB, DescriptorTypeOrder, LayoutGraph, LayoutGraphValue, RenderPhase } from './layout-graph'; -import { ShaderStageFlagBit, Type, Uniform, UniformBlock } from '../../../gfx'; +import { ShaderStageFlagBit, Type, Uniform, UniformBlock } from '../../gfx'; import { ParameterType, UpdateFrequency } from './types'; import { JOINT_UNIFORM_CAPACITY, RenderPassStage, SetIndex, UBOCamera, UBOCSM, UBOForwardLight, UBOGlobal, UBOLocal, UBOLocalBatched, UBOMorph, UBOShadow, UBOSkinning, UBOSkinningAnimation, UBOSkinningTexture, UBOUILocal, UBOWorldBound } from '../define'; import { DefaultVisitor, edge_descriptor } from './graph'; -import { ccclass } from '../../data/decorators'; +import { ccclass } from '../../core/data/decorators'; @ccclass('cc.WebDescriptorHierarchy') export class WebDescriptorHierarchy { diff --git a/cocos/core/pipeline/custom/web-layout-graph.ts b/cocos/rendering/custom/web-layout-graph.ts similarity index 99% rename from cocos/core/pipeline/custom/web-layout-graph.ts rename to cocos/rendering/custom/web-layout-graph.ts index 31f6ba81aa..677a2cf88e 100644 --- a/cocos/core/pipeline/custom/web-layout-graph.ts +++ b/cocos/rendering/custom/web-layout-graph.ts @@ -1,7 +1,7 @@ import { DEBUG } from 'internal:constants'; -import { ccclass } from '../../data/decorators'; +import { ccclass } from '../../core/data/decorators'; // eslint-disable-next-line max-len -import { DescriptorSetInfo, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, Device, ShaderStageFlagBit, Type, UniformBlock } from '../../../gfx'; +import { DescriptorSetInfo, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, Device, ShaderStageFlagBit, Type, UniformBlock } from '../../gfx'; import { VectorGraphColorMap } from './effect'; import { DefaultVisitor, depthFirstSearch } from './graph'; // eslint-disable-next-line max-len diff --git a/cocos/core/pipeline/custom/web-pipeline.ts b/cocos/rendering/custom/web-pipeline.ts similarity index 98% rename from cocos/core/pipeline/custom/web-pipeline.ts rename to cocos/rendering/custom/web-pipeline.ts index 5900c94674..16a4051110 100644 --- a/cocos/core/pipeline/custom/web-pipeline.ts +++ b/cocos/rendering/custom/web-pipeline.ts @@ -25,31 +25,31 @@ /* eslint-disable max-len */ import { systemInfo } from 'pal/system-info'; -import { Color, Buffer, DescriptorSetLayout, Device, Feature, Format, FormatFeatureBit, Sampler, Swapchain, Texture, ClearFlagBit, DescriptorSet, deviceManager, Viewport, API, CommandBuffer, Type, SamplerInfo, Filter, Address } from '../../../gfx/index'; -import { Mat4, Quat, Vec2, Vec3, Vec4 } from '../../math'; +import { Color, Buffer, DescriptorSetLayout, Device, Feature, Format, FormatFeatureBit, Sampler, Swapchain, Texture, ClearFlagBit, DescriptorSet, deviceManager, Viewport, API, CommandBuffer, Type, SamplerInfo, Filter, Address } from '../../gfx/index'; +import { Mat4, Quat, Vec2, Vec3, Vec4 } from '../../core/math'; import { ComputeView, LightInfo, LightingMode, QueueHint, RasterView, ResourceDimension, ResourceFlags, ResourceResidency, SceneFlags, UpdateFrequency } from './types'; 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 '../../../render-scene/scene'; -import { Light, LightType } from '../../../render-scene/scene/light'; -import { legacyCC } from '../../global-exports'; +import { Model, Camera, ShadowType, CSMLevel, DirectionalLight, SpotLight, PCFType, Shadows } from '../../render-scene/scene'; +import { Light, LightType } from '../../render-scene/scene/light'; +import { legacyCC } from '../../core/global-exports'; import { LayoutGraphData } from './layout-graph'; import { Executor } from './executor'; -import { RenderWindow } from '../../../render-scene/core/render-window'; -import { assert } from '../../platform/debug'; -import { macro } from '../../platform/macro'; -import { MacroRecord, RenderScene } from '../../../render-scene'; +import { RenderWindow } from '../../render-scene/core/render-window'; +import { assert } from '../../core/platform/debug'; +import { macro } from '../../core/platform/macro'; +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'; +import { OS } from '../../../pal/system-info/enum-type'; import { Compiler } from './compiler'; import { PipelineUBO } from '../pipeline-ubo'; -import { builtinResMgr } from '../../../asset/asset-manager'; -import { Texture2D } from '../../../asset/assets/texture-2d'; +import { builtinResMgr } from '../../asset/asset-manager'; +import { Texture2D } from '../../asset/assets/texture-2d'; import { WebLayoutGraphBuilder } from './web-layout-graph'; import { GeometryRenderer } from '../geometry-renderer'; -import { Material, TextureCube } from '../../../asset/assets'; +import { Material, TextureCube } from '../../asset/assets'; import { DeferredPipelineBuilder, ForwardPipelineBuilder } from './builtin-pipelines'; import { decideProfilerCamera } from '../pipeline-funcs'; import { DebugViewCompositeType } from '../debug-view'; diff --git a/cocos/core/pipeline/custom/web-scene-visitor.ts b/cocos/rendering/custom/web-scene-visitor.ts similarity index 97% rename from cocos/core/pipeline/custom/web-scene-visitor.ts rename to cocos/rendering/custom/web-scene-visitor.ts index 5aeb3f9b63..87629e5a96 100644 --- a/cocos/core/pipeline/custom/web-scene-visitor.ts +++ b/cocos/rendering/custom/web-scene-visitor.ts @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -import { PipelineState, DescriptorSet, InputAssembler, DrawInfo, Buffer, CommandBuffer, Rect, Viewport } from '../../../gfx'; +import { PipelineState, DescriptorSet, InputAssembler, DrawInfo, Buffer, CommandBuffer, Rect, Viewport } from '../../gfx'; import { PipelineSceneData } from '../pipeline-scene-data'; import { SceneVisitor } from './pipeline'; diff --git a/cocos/core/pipeline/custom/web-scene.ts b/cocos/rendering/custom/web-scene.ts similarity index 96% rename from cocos/core/pipeline/custom/web-scene.ts rename to cocos/rendering/custom/web-scene.ts index 4e0cdd9dbd..a1bef08f95 100644 --- a/cocos/core/pipeline/custom/web-scene.ts +++ b/cocos/rendering/custom/web-scene.ts @@ -23,10 +23,10 @@ THE SOFTWARE. ****************************************************************************/ -import { Frustum, intersect } from '../../geometry'; -import { Vec3 } from '../../math'; -import { RenderScene } from '../../../render-scene'; -import { Camera, Model, ShadowType, SKYBOX_FLAG } from '../../../render-scene/scene'; +import { Frustum, intersect } from '../../core/geometry'; +import { Vec3 } from '../../core/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/debug-view.ts b/cocos/rendering/debug-view.ts similarity index 98% rename from cocos/core/pipeline/debug-view.ts rename to cocos/rendering/debug-view.ts index ba24e9f532..0962354142 100644 --- a/cocos/core/pipeline/debug-view.ts +++ b/cocos/rendering/debug-view.ts @@ -24,10 +24,8 @@ */ import { JSB } from 'internal:constants'; -import { legacyCC } from '../global-exports'; -import { Root } from '../root'; -import { Enum } from '../value-types'; -import { director } from '..'; +import { legacyCC } from '../core/global-exports'; +import { Root } from '../core/root'; const enum RenderingDebugViewType { NONE, diff --git a/cocos/core/pipeline/deferred/bloom-stage.ts b/cocos/rendering/deferred/bloom-stage.ts similarity index 98% rename from cocos/core/pipeline/deferred/bloom-stage.ts rename to cocos/rendering/deferred/bloom-stage.ts index 8e033fed45..a7dea9c9be 100644 --- a/cocos/core/pipeline/deferred/bloom-stage.ts +++ b/cocos/rendering/deferred/bloom-stage.ts @@ -28,11 +28,11 @@ */ import { ccclass, displayOrder, serializable, type } from 'cc.decorator'; -import { Camera } from '../../../render-scene/scene'; +import { Camera } from '../../render-scene/scene'; import { SetIndex } from '../define'; import { RenderFlow, RenderPipeline } from '..'; -import { Material } from '../../../asset/assets/material'; -import { BufferInfo, BufferUsageBit, ClearFlagBit, Color, MemoryUsageBit, PipelineState, Rect, Buffer } from '../../../gfx'; +import { Material } from '../../asset/assets/material'; +import { BufferInfo, BufferUsageBit, ClearFlagBit, Color, MemoryUsageBit, PipelineState, Rect, Buffer } from '../../gfx'; import { PipelineStateManager } from '../pipeline-state-manager'; import { IRenderStageInfo, RenderStage } from '../render-stage'; import { CommonStagePriority } from '../enum'; diff --git a/cocos/core/pipeline/deferred/deferred-pipeline-scene-data.ts b/cocos/rendering/deferred/deferred-pipeline-scene-data.ts similarity index 97% rename from cocos/core/pipeline/deferred/deferred-pipeline-scene-data.ts rename to cocos/rendering/deferred/deferred-pipeline-scene-data.ts index d63d182454..fa5505fd3a 100644 --- a/cocos/core/pipeline/deferred/deferred-pipeline-scene-data.ts +++ b/cocos/rendering/deferred/deferred-pipeline-scene-data.ts @@ -23,12 +23,12 @@ THE SOFTWARE. */ -import { Device } from '../../../gfx'; +import { Device } from '../../gfx'; import { MAX_BLOOM_FILTER_PASS_NUM } from '../render-pipeline'; -import { Material } from '../../../asset/assets'; +import { Material } from '../../asset/assets'; import { PipelineSceneData } from '../pipeline-scene-data'; -import { macro } from '../../platform/macro'; -import { legacyCC } from '../../global-exports'; +import { macro } from '../../core/platform/macro'; +import { legacyCC } from '../../core/global-exports'; // Anti-aliasing type, other types will be gradually added in the future export enum AntiAliasing { diff --git a/cocos/core/pipeline/deferred/deferred-pipeline.ts b/cocos/rendering/deferred/deferred-pipeline.ts similarity index 97% rename from cocos/core/pipeline/deferred/deferred-pipeline.ts rename to cocos/rendering/deferred/deferred-pipeline.ts index 0613135537..8f9bc783fd 100644 --- a/cocos/core/pipeline/deferred/deferred-pipeline.ts +++ b/cocos/rendering/deferred/deferred-pipeline.ts @@ -29,8 +29,8 @@ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr'; -import { Texture2D } from '../../../asset/assets/texture-2d'; +import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; +import { Texture2D } from '../../asset/assets/texture-2d'; import { RenderPipeline, IRenderPipelineInfo, PipelineRenderData, PipelineInputAssemblerData } from '../render-pipeline'; import { MainFlow } from './main-flow'; import { RenderTextureConfig } from '../pipeline-serialization'; @@ -38,10 +38,10 @@ import { ShadowFlow } from '../shadow/shadow-flow'; import { Format, StoreOp, ColorAttachment, DepthStencilAttachment, RenderPass, LoadOp, RenderPassInfo, Texture, AccessFlagBit, Framebuffer, - TextureInfo, TextureType, TextureUsageBit, FramebufferInfo, Swapchain, GeneralBarrierInfo } from '../../../gfx'; + 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 '../../../render-scene/scene'; -import { errorID } from '../../platform/debug'; +import { Camera } from '../../render-scene/scene'; +import { errorID } from '../../core/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/rendering/deferred/gbuffer-stage.ts similarity index 97% rename from cocos/core/pipeline/deferred/gbuffer-stage.ts rename to cocos/rendering/deferred/gbuffer-stage.ts index 8f25837bc0..4f98d64a6f 100644 --- a/cocos/core/pipeline/deferred/gbuffer-stage.ts +++ b/cocos/rendering/deferred/gbuffer-stage.ts @@ -28,17 +28,17 @@ */ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; -import { Camera } from '../../../render-scene/scene'; +import { Camera } from '../../render-scene/scene'; import { SetIndex } from '../define'; import { getPhaseID } from '../pass-phase'; import { renderQueueClearFunc, RenderQueue, convertRenderQueue, renderQueueSortFunc } from '../render-queue'; -import { ClearFlagBit, Color, Rect } from '../../../gfx'; +import { ClearFlagBit, Color, Rect } from '../../gfx'; import { SRGBToLinear } from '../pipeline-funcs'; 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 '../../../render-scene/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/rendering/deferred/lighting-stage.ts similarity index 97% rename from cocos/core/pipeline/deferred/lighting-stage.ts rename to cocos/rendering/deferred/lighting-stage.ts index 0e10cc50b8..10aa72c688 100644 --- a/cocos/core/pipeline/deferred/lighting-stage.ts +++ b/cocos/rendering/deferred/lighting-stage.ts @@ -28,25 +28,25 @@ */ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; -import { Camera } from '../../../render-scene/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, - DescriptorSetLayout, DescriptorSetInfo, PipelineState, ClearFlagBit } from '../../../gfx'; + DescriptorSetLayout, DescriptorSetInfo, PipelineState, ClearFlagBit } from '../../gfx'; import { IRenderStageInfo, RenderStage } from '../render-stage'; import { DeferredStagePriority } from '../enum'; import { MainFlow } from './main-flow'; import { DeferredPipeline } from './deferred-pipeline'; import { PlanarShadowQueue } from '../planar-shadow-queue'; -import { Material } from '../../../asset/assets/material'; +import { Material } from '../../asset/assets/material'; import { PipelineStateManager } from '../pipeline-state-manager'; -import { intersect, Sphere } from '../../geometry'; -import { Vec3, Vec4 } from '../../math'; +import { intersect, Sphere } from '../../core/geometry'; +import { Vec3, Vec4 } from '../../core/math'; 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 '../../../render-scene/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/rendering/deferred/main-flow.ts similarity index 98% rename from cocos/core/pipeline/deferred/main-flow.ts rename to cocos/rendering/deferred/main-flow.ts index d1ff7d0f9b..e91319e890 100644 --- a/cocos/core/pipeline/deferred/main-flow.ts +++ b/cocos/rendering/deferred/main-flow.ts @@ -28,7 +28,7 @@ */ import { ccclass } from 'cc.decorator'; -import { Camera } from '../../../render-scene/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/rendering/deferred/postprocess-stage.ts similarity index 97% rename from cocos/core/pipeline/deferred/postprocess-stage.ts rename to cocos/rendering/deferred/postprocess-stage.ts index 100c63463c..8de2bafb64 100644 --- a/cocos/core/pipeline/deferred/postprocess-stage.ts +++ b/cocos/rendering/deferred/postprocess-stage.ts @@ -27,12 +27,12 @@ * @category pipeline */ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; -import { Camera } from '../../../render-scene/scene'; +import { Camera } from '../../render-scene/scene'; import { SetIndex, UBOLocal } from '../define'; -import { Color, Rect, PipelineState, ClearFlagBit, DescriptorSetInfo, BufferInfo, BufferUsageBit, MemoryUsageBit } from '../../../gfx'; +import { Color, Rect, PipelineState, ClearFlagBit, DescriptorSetInfo, BufferInfo, BufferUsageBit, MemoryUsageBit } from '../../gfx'; import { IRenderStageInfo, RenderStage } from '../render-stage'; import { CommonStagePriority } from '../enum'; -import { Material } from '../../../asset/assets/material'; +import { Material } from '../../asset/assets/material'; import { PipelineStateManager } from '../pipeline-state-manager'; import { RenderQueueDesc } from '../pipeline-serialization'; import { renderProfiler } from '../pipeline-funcs'; diff --git a/cocos/core/pipeline/define.ts b/cocos/rendering/define.ts similarity index 99% rename from cocos/core/pipeline/define.ts rename to cocos/rendering/define.ts index baccc95f49..19963a580e 100644 --- a/cocos/core/pipeline/define.ts +++ b/cocos/rendering/define.ts @@ -23,14 +23,14 @@ THE SOFTWARE. */ -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 { Pass } from '../render-scene/core/pass'; +import { Model } from '../render-scene/scene/model'; +import { SubModel } from '../render-scene/scene/submodel'; +import { Layers } from '../core/scene-graph/layers'; +import { legacyCC } from '../core/global-exports'; import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit, UniformStorageBuffer, DescriptorSetLayoutBinding, Uniform, UniformBlock, UniformSamplerTexture, UniformStorageImage, Device, FormatFeatureBit, Format, -} from '../../gfx'; +} from '../gfx'; export const PIPELINE_FLOW_MAIN = 'MainFlow'; export const PIPELINE_FLOW_FORWARD = 'ForwardFlow'; diff --git a/cocos/core/pipeline/deprecated.ts b/cocos/rendering/deprecated.ts similarity index 96% rename from cocos/core/pipeline/deprecated.ts rename to cocos/rendering/deprecated.ts index f97e0c6d0e..b7a522dfab 100644 --- a/cocos/core/pipeline/deprecated.ts +++ b/cocos/rendering/deprecated.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { markAsWarning } from '../utils'; +import { markAsWarning } from '../core/utils'; import { RenderPipeline } from './render-pipeline'; // deprecate RenderPipeline API diff --git a/cocos/core/pipeline/enum.ts b/cocos/rendering/enum.ts similarity index 100% rename from cocos/core/pipeline/enum.ts rename to cocos/rendering/enum.ts diff --git a/cocos/core/pipeline/forward/forward-flow.ts b/cocos/rendering/forward/forward-flow.ts similarity index 97% rename from cocos/core/pipeline/forward/forward-flow.ts rename to cocos/rendering/forward/forward-flow.ts index 0e8cf3c74d..55a9f3ece6 100644 --- a/cocos/core/pipeline/forward/forward-flow.ts +++ b/cocos/rendering/forward/forward-flow.ts @@ -29,7 +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 '../../../render-scene/scene'; +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/rendering/forward/forward-pipeline.ts similarity index 94% rename from cocos/core/pipeline/forward/forward-pipeline.ts rename to cocos/rendering/forward/forward-pipeline.ts index 440ba6761b..7cd79bccf7 100644 --- a/cocos/core/pipeline/forward/forward-pipeline.ts +++ b/cocos/rendering/forward/forward-pipeline.ts @@ -30,11 +30,11 @@ import { ForwardFlow } from './forward-flow'; import { RenderTextureConfig } from '../pipeline-serialization'; import { ShadowFlow } from '../shadow/shadow-flow'; import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING } from '../define'; -import { Swapchain, RenderPass } from '../../../gfx'; -import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr'; -import { Texture2D } from '../../../asset/assets/texture-2d'; -import { Camera } from '../../../render-scene/scene'; -import { errorID } from '../../platform/debug'; +import { Swapchain, RenderPass } from '../../gfx'; +import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; +import { Texture2D } from '../../asset/assets/texture-2d'; +import { Camera } from '../../render-scene/scene'; +import { errorID } from '../../core/platform/debug'; import { PipelineSceneData } from '../pipeline-scene-data'; const PIPELINE_TYPE = 0; diff --git a/cocos/core/pipeline/forward/forward-stage.ts b/cocos/rendering/forward/forward-stage.ts similarity index 97% rename from cocos/core/pipeline/forward/forward-stage.ts rename to cocos/rendering/forward/forward-stage.ts index fc4a9bf46c..278adbeb3f 100644 --- a/cocos/core/pipeline/forward/forward-stage.ts +++ b/cocos/rendering/forward/forward-stage.ts @@ -27,19 +27,19 @@ import { ccclass, displayOrder, type, serializable } from 'cc.decorator'; import { SetIndex } from '../define'; import { getPhaseID } from '../pass-phase'; import { renderQueueClearFunc, RenderQueue, convertRenderQueue, renderQueueSortFunc } from '../render-queue'; -import { ClearFlagBit, Color, Rect } from '../../../gfx'; +import { ClearFlagBit, Color, Rect } from '../../gfx'; import { RenderBatchedQueue } from '../render-batched-queue'; 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 '../../../render-scene/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 '../../../render-scene/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/geometry-renderer.jsb.ts b/cocos/rendering/geometry-renderer.jsb.ts similarity index 96% rename from cocos/core/pipeline/geometry-renderer.jsb.ts rename to cocos/rendering/geometry-renderer.jsb.ts index 65a7a128ac..25be2f2a69 100644 --- a/cocos/core/pipeline/geometry-renderer.jsb.ts +++ b/cocos/rendering/geometry-renderer.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'; export const GeometryRenderer = jsb.GeometryRenderer; legacyCC.GeometryRenderer = jsb.GeometryRenderer; diff --git a/cocos/core/pipeline/geometry-renderer.ts b/cocos/rendering/geometry-renderer.ts similarity index 98% rename from cocos/core/pipeline/geometry-renderer.ts rename to cocos/rendering/geometry-renderer.ts index 6da4dc63fb..7401ae6035 100644 --- a/cocos/core/pipeline/geometry-renderer.ts +++ b/cocos/rendering/geometry-renderer.ts @@ -23,22 +23,22 @@ THE SOFTWARE. */ -import { AABB } from '../geometry/aabb'; -import { Spline } from '../geometry/spline'; -import { Color } from '../math/color'; -import { Mat4 } from '../math/mat4'; -import { Vec3 } from '../math/vec3'; -import { Vec4 } from '../math/vec4'; +import { AABB } from '../core/geometry/aabb'; +import { Spline } from '../core/geometry/spline'; +import { Color } from '../core/math/color'; +import { Mat4 } from '../core/math/mat4'; +import { Vec3 } from '../core/math/vec3'; +import { Vec4 } from '../core/math/vec4'; import { SetIndex } from './define'; import { PipelineStateManager } from './pipeline-state-manager'; import { Attribute, AttributeName, Buffer, BufferInfo, BufferUsageBit, CommandBuffer, Device, DrawInfo, Format, InputAssembler, - InputAssemblerInfo, MemoryUsageBit, RenderPass } from '../../gfx'; -import { warnID } from '../platform/debug'; -import { Frustum } from '../geometry/frustum'; -import { toRadian } from '../math/utils'; + InputAssemblerInfo, MemoryUsageBit, RenderPass } from '../gfx'; +import { warnID } from '../core/platform/debug'; +import { Frustum } from '../core/geometry/frustum'; +import { toRadian } from '../core/math/utils'; import { PipelineSceneData } from './pipeline-scene-data'; -import { legacyCC } from '../global-exports'; +import { legacyCC } from '../core/global-exports'; const _min = new Vec3(); const _max = new Vec3(); diff --git a/cocos/core/pipeline/global-descriptor-set-manager.ts b/cocos/rendering/global-descriptor-set-manager.ts similarity index 98% rename from cocos/core/pipeline/global-descriptor-set-manager.ts rename to cocos/rendering/global-descriptor-set-manager.ts index ac090af8e5..54108039e9 100644 --- a/cocos/core/pipeline/global-descriptor-set-manager.ts +++ b/cocos/rendering/global-descriptor-set-manager.ts @@ -24,8 +24,8 @@ */ import { Device, BufferUsageBit, MemoryUsageBit, BufferInfo, Filter, Address, Sampler, DescriptorSet, - DescriptorSetInfo, Buffer, Texture, DescriptorSetLayoutInfo, DescriptorSetLayout, SamplerInfo } from '../../gfx'; -import { Light } from '../../render-scene/scene'; + DescriptorSetInfo, Buffer, Texture, DescriptorSetLayoutInfo, DescriptorSetLayout, SamplerInfo } from '../gfx'; +import { Light } from '../render-scene/scene'; import { UBOShadow, globalDescriptorSetLayout, PipelineGlobalBindings } from './define'; const _samplerLinearInfo = new SamplerInfo( diff --git a/cocos/core/pipeline/index.jsb.ts b/cocos/rendering/index.jsb.ts similarity index 98% rename from cocos/core/pipeline/index.jsb.ts rename to cocos/rendering/index.jsb.ts index 26d7b5ac80..12693de0a8 100644 --- a/cocos/core/pipeline/index.jsb.ts +++ b/cocos/rendering/index.jsb.ts @@ -26,8 +26,7 @@ declare const nr: any; import { getPhaseID } from './pass-phase'; -import { setClassName } from '../../core/utils/js'; -import { PipelineEventType } from './pipeline-event'; +import { setClassName } from '../core/utils/js'; import * as pipeline from './define'; export { pipeline }; diff --git a/cocos/core/pipeline/index.ts b/cocos/rendering/index.ts similarity index 100% rename from cocos/core/pipeline/index.ts rename to cocos/rendering/index.ts diff --git a/cocos/core/pipeline/instanced-buffer.ts b/cocos/rendering/instanced-buffer.ts similarity index 97% rename from cocos/core/pipeline/instanced-buffer.ts rename to cocos/rendering/instanced-buffer.ts index 441ff06f47..18ecdd9629 100644 --- a/cocos/core/pipeline/instanced-buffer.ts +++ b/cocos/rendering/instanced-buffer.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { Pass } from '../../render-scene'; -import { IInstancedAttributeBlock, SubModel } from '../../render-scene/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'; + Attribute, Buffer, BufferInfo, CommandBuffer, Shader, DescriptorSet } from '../gfx'; export interface IInstancedItem { count: number; diff --git a/cocos/core/pipeline/pass-phase.jsb.ts b/cocos/rendering/pass-phase.jsb.ts similarity index 100% rename from cocos/core/pipeline/pass-phase.jsb.ts rename to cocos/rendering/pass-phase.jsb.ts diff --git a/cocos/core/pipeline/pass-phase.ts b/cocos/rendering/pass-phase.ts similarity index 100% rename from cocos/core/pipeline/pass-phase.ts rename to cocos/rendering/pass-phase.ts diff --git a/cocos/core/pipeline/pipeline-event.ts b/cocos/rendering/pipeline-event.ts similarity index 97% rename from cocos/core/pipeline/pipeline-event.ts rename to cocos/rendering/pipeline-event.ts index a3ebb59a03..929a47ef8b 100644 --- a/cocos/core/pipeline/pipeline-event.ts +++ b/cocos/rendering/pipeline-event.ts @@ -1,4 +1,4 @@ -import { EventTarget } from '../event/event-target'; +import { EventTarget } from '../core/event/event-target'; export enum PipelineEventType { /** diff --git a/cocos/core/pipeline/pipeline-funcs.ts b/cocos/rendering/pipeline-funcs.ts similarity index 97% rename from cocos/core/pipeline/pipeline-funcs.ts rename to cocos/rendering/pipeline-funcs.ts index cd55671f92..c30b8f6ac4 100644 --- a/cocos/core/pipeline/pipeline-funcs.ts +++ b/cocos/rendering/pipeline-funcs.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { CommandBuffer, Device, Rect, RenderPass, Viewport } from '../../gfx'; -import { IVec4Like } from '../math'; +import { CommandBuffer, Device, Rect, RenderPass, Viewport } from '../gfx'; +import { IVec4Like } from '../core/math'; import { PipelineStateManager } from './pipeline-state-manager'; import { SetIndex } from './define'; -import { Camera, Model } from '../../render-scene/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/rendering/pipeline-scene-data.ts similarity index 94% rename from cocos/core/pipeline/pipeline-scene-data.ts rename to cocos/rendering/pipeline-scene-data.ts index 2f5e1d85d9..de0e592b50 100644 --- a/cocos/core/pipeline/pipeline-scene-data.ts +++ b/cocos/rendering/pipeline-scene-data.ts @@ -19,17 +19,17 @@ THE SOFTWARE. */ -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 { 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 '../../render-scene/scene/light'; -import { Material } from '../../asset/assets'; -import { Pass } from '../../render-scene/core/pass'; + BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../gfx'; +import { Light } from '../render-scene/scene/light'; +import { Material } from '../asset/assets'; +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-serialization.ts b/cocos/rendering/pipeline-serialization.ts similarity index 95% rename from cocos/core/pipeline/pipeline-serialization.ts rename to cocos/rendering/pipeline-serialization.ts index d0f0bb2fe2..a97dd977d6 100644 --- a/cocos/core/pipeline/pipeline-serialization.ts +++ b/cocos/rendering/pipeline-serialization.ts @@ -24,11 +24,11 @@ */ import { ccclass, type, serializable, editable } from 'cc.decorator'; -import { CCString } from '../data/utils/attribute'; -import { AccessFlagBit, Format, LoadOp, StoreOp, TextureType, TextureUsageBit } from '../../gfx'; -import { ccenum } from '../value-types/enum'; -import { RenderTexture } from '../../asset/assets/render-texture'; -import { Material } from '../../asset/assets/material'; +import { CCString } from '../core/data/utils/attribute'; +import { AccessFlagBit, Format, LoadOp, StoreOp, TextureType, TextureUsageBit } from '../gfx'; +import { ccenum } from '../core/value-types/enum'; +import { RenderTexture } from '../asset/assets/render-texture'; +import { Material } from '../asset/assets/material'; ccenum(TextureType); ccenum(TextureUsageBit); diff --git a/cocos/core/pipeline/pipeline-state-manager.ts b/cocos/rendering/pipeline-state-manager.ts similarity index 95% rename from cocos/core/pipeline/pipeline-state-manager.ts rename to cocos/rendering/pipeline-state-manager.ts index 3a81008285..56c26ac03d 100644 --- a/cocos/core/pipeline/pipeline-state-manager.ts +++ b/cocos/rendering/pipeline-state-manager.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ -import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, PipelineStateInfo } from '../../gfx'; -import { Pass } from '../../render-scene/core/pass'; +import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, PipelineStateInfo } from '../gfx'; +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/rendering/pipeline-ubo.ts similarity index 97% rename from cocos/core/pipeline/pipeline-ubo.ts rename to cocos/rendering/pipeline-ubo.ts index cd3d4db84b..d637c72651 100644 --- a/cocos/core/pipeline/pipeline-ubo.ts +++ b/cocos/rendering/pipeline-ubo.ts @@ -25,17 +25,17 @@ 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 '../../render-scene/scene/camera'; -import { Mat4, Vec3, Vec4, Color, toRadian } from '../math'; +import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet } from '../gfx'; +import { Camera } from '../render-scene/scene/camera'; +import { Mat4, Vec3, Vec4, Color, toRadian } from '../core/math'; import { PipelineRuntime } from './custom/pipeline'; -import { legacyCC } from '../global-exports'; -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 { legacyCC } from '../core/global-exports'; +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'; const _matShadowView = new Mat4(); diff --git a/cocos/core/pipeline/planar-shadow-queue.ts b/cocos/rendering/planar-shadow-queue.ts similarity index 94% rename from cocos/core/pipeline/planar-shadow-queue.ts rename to cocos/rendering/planar-shadow-queue.ts index b0b46e4e34..a6c0b01c76 100644 --- a/cocos/core/pipeline/planar-shadow-queue.ts +++ b/cocos/rendering/planar-shadow-queue.ts @@ -23,14 +23,14 @@ THE SOFTWARE. */ -import { AABB, intersect } from '../geometry'; +import { AABB, intersect } from '../core/geometry'; import { SetIndex } from './define'; -import { CommandBuffer, Device, RenderPass } from '../../gfx'; +import { CommandBuffer, Device, RenderPass } from '../gfx'; import { PipelineStateManager } from './pipeline-state-manager'; -import { Model, Camera } from '../../render-scene/scene'; +import { Model, Camera } from '../render-scene/scene'; import { RenderInstancedQueue } from './render-instanced-queue'; -import { ShadowType } from '../../render-scene/scene/shadows'; -import { Layers } from '../scene-graph/layers'; +import { ShadowType } from '../render-scene/scene/shadows'; +import { Layers } from '../core/scene-graph/layers'; import { PipelineRuntime } from './custom/pipeline'; const _ab = new AABB(); diff --git a/cocos/core/pipeline/render-additive-light-queue.ts b/cocos/rendering/render-additive-light-queue.ts similarity index 97% rename from cocos/core/pipeline/render-additive-light-queue.ts rename to cocos/rendering/render-additive-light-queue.ts index 6a684e7ff1..c171dcccf6 100644 --- a/cocos/core/pipeline/render-additive-light-queue.ts +++ b/cocos/rendering/render-additive-light-queue.ts @@ -23,24 +23,24 @@ THE SOFTWARE. */ -import { BatchingSchemes, Pass } from '../../render-scene/core/pass'; -import { Model } from '../../render-scene/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'; +import { Vec3, nextPow2, Mat4, Color } from '../core/math'; +import { intersect } from '../core/geometry'; import { Device, RenderPass, Buffer, BufferUsageBit, MemoryUsageBit, - BufferInfo, BufferViewInfo, CommandBuffer } from '../../gfx'; -import { Pool } from '../memop'; + BufferInfo, BufferViewInfo, CommandBuffer } from '../gfx'; +import { Pool } from '../core/memop'; import { RenderBatchedQueue } from './render-batched-queue'; import { RenderInstancedQueue } from './render-instanced-queue'; -import { SphereLight } from '../../render-scene/scene/sphere-light'; -import { SpotLight } from '../../render-scene/scene/spot-light'; -import { SubModel } from '../../render-scene/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 '../../render-scene/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 '../../render-scene/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-batched-queue.ts b/cocos/rendering/render-batched-queue.ts similarity index 99% rename from cocos/core/pipeline/render-batched-queue.ts rename to cocos/rendering/render-batched-queue.ts index dd67bb200c..3393077192 100644 --- a/cocos/core/pipeline/render-batched-queue.ts +++ b/cocos/rendering/render-batched-queue.ts @@ -25,7 +25,7 @@ import { BatchedBuffer } from './batched-buffer'; import { PipelineStateManager } from './pipeline-state-manager'; -import { RenderPass, Device, CommandBuffer, DescriptorSet } from '../../gfx'; +import { RenderPass, Device, CommandBuffer, DescriptorSet } from '../gfx'; import { SetIndex } from './define'; /** diff --git a/cocos/core/pipeline/render-flow.ts b/cocos/rendering/render-flow.ts similarity index 98% rename from cocos/core/pipeline/render-flow.ts rename to cocos/rendering/render-flow.ts index 8666084a2e..58e4e39602 100644 --- a/cocos/core/pipeline/render-flow.ts +++ b/cocos/rendering/render-flow.ts @@ -26,8 +26,8 @@ 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 '../../render-scene/scene'; +import { legacyCC } from '../core/global-exports'; +import { Camera } from '../render-scene/scene'; /** * @en Render flow information descriptor diff --git a/cocos/core/pipeline/render-instanced-queue.ts b/cocos/rendering/render-instanced-queue.ts similarity index 99% rename from cocos/core/pipeline/render-instanced-queue.ts rename to cocos/rendering/render-instanced-queue.ts index f7934679c6..414b0fe780 100644 --- a/cocos/core/pipeline/render-instanced-queue.ts +++ b/cocos/rendering/render-instanced-queue.ts @@ -24,7 +24,7 @@ */ import { InstancedBuffer } from './instanced-buffer'; -import { Device, RenderPass, PipelineState, CommandBuffer, DescriptorSet } from '../../gfx'; +import { Device, RenderPass, PipelineState, CommandBuffer, DescriptorSet } from '../gfx'; import { PipelineStateManager } from './pipeline-state-manager'; import { SetIndex } from './define'; diff --git a/cocos/core/pipeline/render-pipeline.jsb.ts b/cocos/rendering/render-pipeline.jsb.ts similarity index 96% rename from cocos/core/pipeline/render-pipeline.jsb.ts rename to cocos/rendering/render-pipeline.jsb.ts index 2b47d4c340..e4dd60c72d 100644 --- a/cocos/core/pipeline/render-pipeline.jsb.ts +++ b/cocos/rendering/render-pipeline.jsb.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../global-exports'; +import { legacyCC } from '../core/global-exports'; export const RenderPipeline = nr.RenderPipeline; // Do not delete, for the class detection of editor legacyCC.RenderPipeline = RenderPipeline; diff --git a/cocos/core/pipeline/render-pipeline.ts b/cocos/rendering/render-pipeline.ts similarity index 98% rename from cocos/core/pipeline/render-pipeline.ts rename to cocos/rendering/render-pipeline.ts index 506e3d0317..c420eff101 100644 --- a/cocos/core/pipeline/render-pipeline.ts +++ b/cocos/rendering/render-pipeline.ts @@ -26,17 +26,17 @@ import { ccclass, displayOrder, serializable, type } from 'cc.decorator'; import { systemInfo } from 'pal/system-info'; import { sceneCulling, validPunctualLightsCulling } from './scene-culling'; -import { Asset } from '../../asset/assets/asset'; +import { Asset } from '../asset/assets/asset'; import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, ClearFlagBit, ClearFlags, ColorAttachment, CommandBuffer, DepthStencilAttachment, DescriptorSet, Device, Feature, Format, FormatFeatureBit, Framebuffer, FramebufferInfo, InputAssembler, InputAssemblerInfo, LoadOp, MemoryUsageBit, Rect, RenderPass, RenderPassInfo, Sampler, StoreOp, SurfaceTransform, Swapchain, Texture, TextureInfo, TextureType, TextureUsageBit, Viewport, GeneralBarrierInfo, deviceManager, -} from '../../gfx'; -import { legacyCC } from '../global-exports'; -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'; +} from '../gfx'; +import { legacyCC } from '../core/global-exports'; +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'; @@ -44,8 +44,8 @@ import { PipelineUBO } from './pipeline-ubo'; import { RenderFlow } from './render-flow'; import { IPipelineEvent, PipelineEventProcessor, PipelineEventType } from './pipeline-event'; import { decideProfilerCamera } from './pipeline-funcs'; -import { OS } from '../../../pal/system-info/enum-type'; -import { macro } from '../platform/macro'; +import { OS } from '../../pal/system-info/enum-type'; +import { macro } from '../core/platform/macro'; import { UBOSkinning } from './define'; import { PipelineRuntime } from './custom/pipeline'; diff --git a/cocos/core/pipeline/render-queue.ts b/cocos/rendering/render-queue.ts similarity index 97% rename from cocos/core/pipeline/render-queue.ts rename to cocos/rendering/render-queue.ts index d651e8d685..e6f78368b1 100644 --- a/cocos/core/pipeline/render-queue.ts +++ b/cocos/rendering/render-queue.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { RecyclePool } from '../memop'; -import { CachedArray } from '../memop/cached-array'; +import { RecyclePool } from '../core/memop'; +import { CachedArray } from '../core/memop/cached-array'; import { IRenderObject, IRenderPass, IRenderQueueDesc, SetIndex } from './define'; import { PipelineStateManager } from './pipeline-state-manager'; -import { RenderPass, Device, CommandBuffer } from '../../gfx'; +import { RenderPass, Device, CommandBuffer } from '../gfx'; import { RenderQueueDesc, RenderQueueSortMode } from './pipeline-serialization'; import { getPhaseID } from './pass-phase'; diff --git a/cocos/core/pipeline/render-shadow-map-batched-queue.ts b/cocos/rendering/render-shadow-map-batched-queue.ts similarity index 93% rename from cocos/core/pipeline/render-shadow-map-batched-queue.ts rename to cocos/rendering/render-shadow-map-batched-queue.ts index d36a2eb493..1414f4e079 100644 --- a/cocos/core/pipeline/render-shadow-map-batched-queue.ts +++ b/cocos/rendering/render-shadow-map-batched-queue.ts @@ -23,19 +23,19 @@ THE SOFTWARE. */ -import { SubModel } from '../../render-scene/scene/submodel'; +import { SubModel } from '../render-scene/scene/submodel'; import { SetIndex } from './define'; -import { Device, RenderPass, Shader, CommandBuffer } from '../../gfx'; +import { Device, RenderPass, Shader, CommandBuffer } from '../gfx'; import { getPhaseID } from './pass-phase'; import { PipelineStateManager } from './pipeline-state-manager'; -import { Pass, BatchingSchemes } from '../../render-scene/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 '../../render-scene/scene/shadows'; -import { Light, LightType } from '../../render-scene/scene/light'; -import { intersect } from '../geometry'; -import { Model } from '../../render-scene/scene/model'; -import { Camera, DirectionalLight, SpotLight } from '../../render-scene/scene'; +import { ShadowType } from '../render-scene/scene/shadows'; +import { Light, LightType } from '../render-scene/scene/light'; +import { intersect } from '../core/geometry'; +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/rendering/render-stage.ts similarity index 97% rename from cocos/core/pipeline/render-stage.ts rename to cocos/rendering/render-stage.ts index 5f36d9a6ff..574121a07c 100644 --- a/cocos/core/pipeline/render-stage.ts +++ b/cocos/rendering/render-stage.ts @@ -24,11 +24,11 @@ */ import { ccclass, displayOrder, serializable } from 'cc.decorator'; -import { legacyCC } from '../global-exports'; +import { legacyCC } from '../core/global-exports'; import { RenderPipeline } from './render-pipeline'; import { RenderFlow } from './render-flow'; import { RenderQueueDesc } from './pipeline-serialization'; -import { Camera } from '../../render-scene/scene'; +import { Camera } from '../render-scene/scene'; /** * @en The render stage information descriptor diff --git a/cocos/core/pipeline/scene-culling.ts b/cocos/rendering/scene-culling.ts similarity index 95% rename from cocos/core/pipeline/scene-culling.ts rename to cocos/rendering/scene-culling.ts index 9408df4b3e..df2605d0ae 100644 --- a/cocos/core/pipeline/scene-culling.ts +++ b/cocos/rendering/scene-culling.ts @@ -23,14 +23,14 @@ THE SOFTWARE. */ -import { intersect, Sphere } from '../geometry'; -import { Model } from '../../render-scene/scene/model'; -import { Camera, SKYBOX_FLAG } from '../../render-scene/scene/camera'; -import { Vec3 } from '../math'; +import { intersect, Sphere } from '../core/geometry'; +import { Model } from '../render-scene/scene/model'; +import { Camera, SKYBOX_FLAG } from '../render-scene/scene/camera'; +import { Vec3 } from '../core/math'; import { RenderPipeline } from './render-pipeline'; -import { Pool } from '../memop'; +import { Pool } from '../core/memop'; import { IRenderObject, UBOShadow } from './define'; -import { ShadowType, CSMOptimizationMode } from '../../render-scene/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/rendering/shadow/csm-layers.ts similarity index 98% rename from cocos/core/pipeline/shadow/csm-layers.ts rename to cocos/rendering/shadow/csm-layers.ts index b0450ddfaa..408f5c64ea 100644 --- a/cocos/core/pipeline/shadow/csm-layers.ts +++ b/cocos/rendering/shadow/csm-layers.ts @@ -19,13 +19,13 @@ THE SOFTWARE. */ -import { DirectionalLight, Camera, Shadows, CSMLevel, CSMOptimizationMode } from '../../../render-scene/scene'; -import { Mat4, Vec3, Vec2, Vec4 } from '../../math'; -import { Frustum, AABB } from '../../geometry'; +import { DirectionalLight, Camera, Shadows, CSMLevel, CSMOptimizationMode } from '../../render-scene/scene'; +import { Mat4, Vec3, Vec2, Vec4 } from '../../core/math'; +import { Frustum, AABB } from '../../core/geometry'; import { IRenderObject } from '../define'; -import { legacyCC } from '../../global-exports'; +import { legacyCC } from '../../core/global-exports'; import { PipelineSceneData } from '../pipeline-scene-data'; -import { CachedArray } from '../../memop/cached-array'; +import { CachedArray } from '../../core/memop/cached-array'; const _mat4Trans = new Mat4(); const _matShadowTrans = new Mat4(); diff --git a/cocos/core/pipeline/shadow/shadow-flow.ts b/cocos/rendering/shadow/shadow-flow.ts similarity index 97% rename from cocos/core/pipeline/shadow/shadow-flow.ts rename to cocos/rendering/shadow/shadow-flow.ts index d429c8bb4a..ac365f2afd 100644 --- a/cocos/core/pipeline/shadow/shadow-flow.ts +++ b/cocos/rendering/shadow/shadow-flow.ts @@ -31,14 +31,14 @@ import { ShadowStage } from './shadow-stage'; import { RenderPass, LoadOp, StoreOp, Format, Texture, TextureType, TextureUsageBit, ColorAttachment, DepthStencilAttachment, RenderPassInfo, TextureInfo, FramebufferInfo, Swapchain, - Framebuffer, DescriptorSet, API } from '../../../gfx'; + Framebuffer, DescriptorSet, API } from '../../gfx'; import { RenderFlowTag } from '../pipeline-serialization'; import { ForwardPipeline } from '../forward/forward-pipeline'; import { RenderPipeline } from '..'; -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'; +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/rendering/shadow/shadow-stage.ts similarity index 96% rename from cocos/core/pipeline/shadow/shadow-stage.ts rename to cocos/rendering/shadow/shadow-stage.ts index a83ef09e36..6ee5bc2214 100644 --- a/cocos/core/pipeline/shadow/shadow-stage.ts +++ b/cocos/rendering/shadow/shadow-stage.ts @@ -24,15 +24,15 @@ */ import { ccclass } from 'cc.decorator'; -import { Color, Rect, Framebuffer, DescriptorSet } from '../../../gfx'; +import { Color, Rect, Framebuffer, DescriptorSet } from '../../gfx'; import { IRenderStageInfo, RenderStage } from '../render-stage'; 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 '../../../render-scene/scene/light'; +import { Light, LightType } from '../../render-scene/scene/light'; import { ShadowFlow } from './shadow-flow'; -import { Camera, CSMLevel, DirectionalLight } from '../../../render-scene/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/rendering/ui-phase.ts similarity index 96% rename from cocos/core/pipeline/ui-phase.ts rename to cocos/rendering/ui-phase.ts index 4713efe653..83a7d172f6 100644 --- a/cocos/core/pipeline/ui-phase.ts +++ b/cocos/rendering/ui-phase.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ -import { RenderPass } from '../../gfx'; +import { RenderPass } from '../gfx'; import { PipelineStateManager } from './pipeline-state-manager'; import { SetIndex } from './define'; -import { Camera } from '../../render-scene/scene/camera'; +import { Camera } from '../render-scene/scene/camera'; import { RenderPipeline } from './render-pipeline'; import { getPhaseID } from './pass-phase'; diff --git a/cocos/terrain/terrain.ts b/cocos/terrain/terrain.ts index 01de7caeb6..f2e31aa30c 100644 --- a/cocos/terrain/terrain.ts +++ b/cocos/terrain/terrain.ts @@ -45,7 +45,9 @@ import { TerrainLod, TerrainLodKey, TERRAIN_LOD_LEVELS, TERRAIN_LOD_MAX_DISTANCE import { TerrainAsset, TerrainLayerInfo, TERRAIN_HEIGHT_BASE, TERRAIN_HEIGHT_FACTORY, TERRAIN_BLOCK_TILE_COMPLEXITY, TERRAIN_BLOCK_VERTEX_SIZE, TERRAIN_BLOCK_VERTEX_COMPLEXITY, TERRAIN_MAX_LAYER_COUNT, TERRAIN_HEIGHT_FMIN, TERRAIN_HEIGHT_FMAX, TERRAIN_MAX_BLEND_LAYERS, TERRAIN_DATA_VERSION5 } from './terrain-asset'; -import { CCBoolean, CCFloat, Node, PipelineEventType } from '../core'; +import { CCBoolean, CCFloat, Node } from '../core'; +import { PipelineEventType } from '../rendering'; + /** * @en Terrain info diff --git a/editor/exports/offline-mappings.ts b/editor/exports/offline-mappings.ts index cd1047a041..14e83eb82b 100644 --- a/editor/exports/offline-mappings.ts +++ b/editor/exports/offline-mappings.ts @@ -5,7 +5,7 @@ import { Filter, Format, FormatInfos, FormatType, GetTypeSize, PolygonMode, PrimitiveMode, ShadeModel, ShaderStageFlagBit, StencilOp, Type, DescriptorType, SamplerInfo, MemoryAccessBit, } from '../../cocos/gfx/base/define'; -import { RenderPassStage, RenderPriority, SetIndex } from '../../cocos/core/pipeline/define'; +import { RenderPassStage, RenderPriority, SetIndex } from '../../cocos/rendering/define'; import { murmurhash2_32_gc } from '../../cocos/core/algorithm/murmurhash2_gc'; import { Sampler } from '../../cocos/gfx/base/states/sampler'; diff --git a/exports/base.ts b/exports/base.ts index 2f23ba9c47..ec11472ba4 100644 --- a/exports/base.ts +++ b/exports/base.ts @@ -33,9 +33,13 @@ import '../cocos/core/legacy'; import * as renderer from '../cocos/render-scene'; import * as gfx from '../cocos/gfx'; + // LOAD ENGINE CORE export * from '../cocos/core'; +export * from '../cocos/rendering'; +export * from '../cocos/rendering/custom/builtin-pipelines'; + export { gfx }; export * from '../cocos/asset/assets'; diff --git a/exports/custom-pipeline.ts b/exports/custom-pipeline.ts index 36445bf55e..2abeaf450e 100644 --- a/exports/custom-pipeline.ts +++ b/exports/custom-pipeline.ts @@ -1,4 +1,4 @@ -import { createCustomPipeline } from '../cocos/core/pipeline/custom'; +import { createCustomPipeline } from '../cocos/rendering/custom'; import { legacyCC } from '../cocos/core/global-exports'; legacyCC.internal.createCustomPipeline = createCustomPipeline; diff --git a/exports/geometry-renderer.ts b/exports/geometry-renderer.ts index c98c14b08c..61ffe8eb10 100644 --- a/exports/geometry-renderer.ts +++ b/exports/geometry-renderer.ts @@ -1 +1 @@ -export * from '../cocos/core/pipeline/geometry-renderer'; +export * from '../cocos/rendering/geometry-renderer'; diff --git a/native/cocos/application/ApplicationManager.h b/native/cocos/application/ApplicationManager.h index 849cbabd3c..b74d92c87f 100644 --- a/native/cocos/application/ApplicationManager.h +++ b/native/cocos/application/ApplicationManager.h @@ -76,7 +76,7 @@ private: #define CC_GET_SYSTEM_WINDOW(id) CC_GET_PLATFORM_INTERFACE(cc::ISystemWindowManager)->getWindow(id) #define CC_GET_MAIN_SYSTEM_WINDOW() CC_GET_SYSTEM_WINDOW(cc::ISystemWindow::mainWindowId) // Assuming the 1st created window is the main system window for now! -#define CC_GET_XR_INTERFACE() BasePlatform::getPlatform()->getInterface() +#define CC_GET_XR_INTERFACE() BasePlatform::getPlatform()->getInterface() /** * @brief Called at the user-defined main entry diff --git a/native/cocos/application/BaseGame.cpp b/native/cocos/application/BaseGame.cpp index d35a2b9b09..637aec3652 100644 --- a/native/cocos/application/BaseGame.cpp +++ b/native/cocos/application/BaseGame.cpp @@ -25,9 +25,9 @@ #include "BaseGame.h" #include -#include "renderer/pipeline/GlobalDescriptorSetManager.h" -#include "platform/interfaces/modules/ISystemWindowManager.h" #include "ApplicationManager.h" +#include "platform/interfaces/modules/ISystemWindowManager.h" +#include "renderer/pipeline/GlobalDescriptorSetManager.h" extern "C" void cc_load_all_plugins(); // NOLINT @@ -49,12 +49,12 @@ int BaseGame::init() { : _windowInfo.flags; std::call_once(_windowCreateFlag, [&]() { ISystemWindowInfo info; - info.title = _windowInfo.title; - info.x = _windowInfo.x == -1 ? 50 : _windowInfo.x; // 50 meams move window a little for now - info.y = _windowInfo.y == -1 ? 50 : _windowInfo.y; // same above - info.width = _windowInfo.width; + info.title = _windowInfo.title; + info.x = _windowInfo.x == -1 ? 50 : _windowInfo.x; // 50 meams move window a little for now + info.y = _windowInfo.y == -1 ? 50 : _windowInfo.y; // same above + info.width = _windowInfo.width; info.height = _windowInfo.height; - info.flags = _windowInfo.flags; + info.flags = _windowInfo.flags; ISystemWindowManager* windowMgr = CC_GET_PLATFORM_INTERFACE(ISystemWindowManager); windowMgr->createWindow(info); diff --git a/native/cocos/application/CocosApplication.cpp b/native/cocos/application/CocosApplication.cpp index 0fa3790774..e226c7757c 100644 --- a/native/cocos/application/CocosApplication.cpp +++ b/native/cocos/application/CocosApplication.cpp @@ -27,6 +27,7 @@ #include "base/Macros.h" +#include "ApplicationManager.h" #include "cocos/bindings/event/CustomEventTypes.h" #include "cocos/bindings/event/EventDispatcher.h" #include "cocos/bindings/jswrapper/SeApi.h" @@ -36,7 +37,6 @@ #include "cocos/engine/BaseEngine.h" #include "cocos/platform/interfaces/modules/IScreen.h" #include "cocos/platform/interfaces/modules/ISystemWindowManager.h" -#include "ApplicationManager.h" namespace cc { diff --git a/native/cocos/bindings/event/EventDispatcher.cpp b/native/cocos/bindings/event/EventDispatcher.cpp index 309c0bb392..670830e976 100644 --- a/native/cocos/bindings/event/EventDispatcher.cpp +++ b/native/cocos/bindings/event/EventDispatcher.cpp @@ -412,7 +412,6 @@ void EventDispatcher::dispatchDestroyWindowEvent() { #endif } - void EventDispatcher::dispatchDestroyWindowEvent(cc::ISystemWindow *window) { #if CC_PLATFORM == CC_PLATFORM_WINDOWS EventDispatcher::dispatchCustomEvent(EVENT_DESTROY_WINDOW, 1, reinterpret_cast(window->getWindowHandle())); diff --git a/native/cocos/bindings/event/EventDispatcher.h b/native/cocos/bindings/event/EventDispatcher.h index 03c4e5a851..c5cdb15948 100644 --- a/native/cocos/bindings/event/EventDispatcher.h +++ b/native/cocos/bindings/event/EventDispatcher.h @@ -331,7 +331,7 @@ public: static void dispatchControllerEvent(const ControllerEvent &controllerEvent); static void dispatchTickEvent(float dt); static void dispatchResizeEvent(int width, int height); - static void dispatchResizeEvent(const WindowEvent& windowEvent); + static void dispatchResizeEvent(const WindowEvent &windowEvent); static void dispatchOrientationChangeEvent(int orientation); static void dispatchEnterBackgroundEvent(); static void dispatchEnterForegroundEvent(); diff --git a/native/cocos/bindings/manual/jsb_cocos_manual.cpp b/native/cocos/bindings/manual/jsb_cocos_manual.cpp index 90f01c7d7a..d0bf119695 100644 --- a/native/cocos/bindings/manual/jsb_cocos_manual.cpp +++ b/native/cocos/bindings/manual/jsb_cocos_manual.cpp @@ -30,9 +30,9 @@ #include "cocos/bindings/manual/jsb_conversions.h" #include "cocos/bindings/manual/jsb_global_init.h" -#include "storage/local-storage/LocalStorage.h" #include "application/ApplicationManager.h" #include "platform/interfaces/modules/ISystemWindowManager.h" +#include "storage/local-storage/LocalStorage.h" extern se::Object *__jsb_cc_FileUtils_proto; // NOLINT(readability-redundant-declaration, readability-identifier-naming) diff --git a/native/cocos/core/Root.cpp b/native/cocos/core/Root.cpp index 8dd0d0a34b..23dd70625d 100644 --- a/native/cocos/core/Root.cpp +++ b/native/cocos/core/Root.cpp @@ -28,10 +28,9 @@ #include "application/ApplicationManager.h" #include "core/event/CallbacksInvoker.h" #include "core/event/EventTypesToJS.h" -#include "application/ApplicationManager.h" +#include "platform/interfaces/modules/IScreen.h" #include "platform/interfaces/modules/ISystemWindow.h" #include "platform/interfaces/modules/ISystemWindowManager.h" -#include "platform/interfaces/modules/IScreen.h" #include "platform/java/modules/XRInterface.h" #include "profiler/Profiler.h" #include "renderer/gfx-base/GFXDef.h" @@ -75,7 +74,7 @@ Root::~Root() { instance = nullptr; } -void Root::initialize(gfx::Swapchain * /*swapchain*/) { +void Root::initialize(gfx::Swapchain * /*swapchain*/) { auto *windowMgr = CC_GET_PLATFORM_INTERFACE(ISystemWindowManager); const auto &windows = windowMgr->getWindows(); for (const auto &pair : windows) { @@ -113,7 +112,7 @@ scene::RenderWindow *Root::createRenderWindowFromSystemWindow(ISystemWindow *win const auto &size = window->getViewSize(); gfx::SwapchainInfo info; - info.width = static_cast(size.x) * pixelRatio; + info.width = static_cast(size.x) * pixelRatio; info.height = static_cast(size.y) * pixelRatio; info.windowHandle = reinterpret_cast(handle); info.windowId = window->getWindowId(); diff --git a/native/cocos/engine/Engine.cpp b/native/cocos/engine/Engine.cpp index 672a443623..e47d6eec9c 100644 --- a/native/cocos/engine/Engine.cpp +++ b/native/cocos/engine/Engine.cpp @@ -62,7 +62,6 @@ #include "platform/UniversalPlatform.h" #include "platform/interfaces/modules/ISystemWindow.h" #include "platform/interfaces/modules/ISystemWindowManager.h" -#include "platform/UniversalPlatform.h" #if CC_USE_DEBUG_RENDERER #include "profiler/DebugRenderer.h" #endif diff --git a/native/cocos/platform/SDLHelper.cpp b/native/cocos/platform/SDLHelper.cpp index 73b3942fe5..782f036c46 100644 --- a/native/cocos/platform/SDLHelper.cpp +++ b/native/cocos/platform/SDLHelper.cpp @@ -216,8 +216,8 @@ void SDLHelper::dispatchSDLEvent(IEventDispatch *delegate, uint32_t windowId, co cc::MouseEvent mouse; cc::KeyboardEvent keyboard; - touch.windowId = windowId; - mouse.windowId = windowId; + touch.windowId = windowId; + mouse.windowId = windowId; keyboard.windowId = windowId; SDL_Window *window = SDL_GetWindowFromID(sdlEvent.window.windowID); @@ -328,7 +328,7 @@ void SDLHelper::dispatchSDLEvent(IEventDispatch *delegate, uint32_t windowId, co } SDL_Window *SDLHelper::createWindow(const char *title, - int w, int h, int flags) { + int w, int h, int flags) { SDL_Rect screenRect; if (SDL_GetDisplayUsableBounds(0, &screenRect) != 0) { return nullptr; @@ -339,8 +339,8 @@ SDL_Window *SDLHelper::createWindow(const char *title, } SDL_Window *SDLHelper::createWindow(const char *title, - int x, int y, int w, - int h, int flags) { + int x, int y, int w, + int h, int flags) { // Create window int sdlFlags = windowFlagsToSDLWindowFlag(flags); SDL_Window *handle = SDL_CreateWindow(title, x, y, w, h, sdlFlags); @@ -362,7 +362,7 @@ void SDLHelper::swapWindow(SDL_Window *window) { } #if (CC_PLATFORM == CC_PLATFORM_LINUX) -uintptr_t SDLHelper::getDisplay(SDL_Window* window) { +uintptr_t SDLHelper::getDisplay(SDL_Window *window) { SDL_SysWMinfo wmInfo; SDL_VERSION(&wmInfo.version); SDL_GetWindowWMInfo(window, &wmInfo); diff --git a/native/cocos/platform/SDLHelper.h b/native/cocos/platform/SDLHelper.h index f7871cc4ea..ff3efbee16 100644 --- a/native/cocos/platform/SDLHelper.h +++ b/native/cocos/platform/SDLHelper.h @@ -46,10 +46,10 @@ public: static void swapWindow(SDL_Window* window); static SDL_Window* createWindow(const char* title, - int w, int h, int flags); + int w, int h, int flags); static SDL_Window* createWindow(const char* title, - int x, int y, int w, - int h, int flags); + int x, int y, int w, + int h, int flags); static uintptr_t getWindowHandle(SDL_Window* window); #if (CC_PLATFORM == CC_PLATFORM_LINUX) diff --git a/native/cocos/platform/android/AndroidPlatform.cpp b/native/cocos/platform/android/AndroidPlatform.cpp index dd616fe154..1a7482535f 100644 --- a/native/cocos/platform/android/AndroidPlatform.cpp +++ b/native/cocos/platform/android/AndroidPlatform.cpp @@ -23,8 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include +#include "platform/android/AndroidPlatform.h" #include +#include #include "application/ApplicationManager.h" #include "base/Log.h" #include "base/memory/Memory.h" @@ -34,7 +35,6 @@ #include "modules/Screen.h" #include "modules/System.h" #include "platform/BasePlatform.h" -#include "platform/android/AndroidPlatform.h" #include "platform/android/FileUtils-android.h" #include "platform/java/jni/JniImp.h" #include "platform/java/jni/glue/JniNativeGlue.h" @@ -46,9 +46,9 @@ #include "platform/java/modules/Vibrator.h" #include "platform/java/modules/XRInterface.h" +#include "base/StringUtil.h" #include "bindings/event/EventDispatcher.h" #include "paddleboat.h" -#include "base/StringUtil.h" #define ABORT_GAME \ { \ @@ -318,7 +318,7 @@ public: _launched = true; ISystemWindowInfo info; - info.width = ANativeWindow_getWidth(nativeWindow); + info.width = ANativeWindow_getWidth(nativeWindow); info.height = ANativeWindow_getHeight(nativeWindow); info.externalHandle = nativeWindow; _androidPlatform->getInterface()->createWindow(info); diff --git a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp index 876f9f0689..97e034a8c0 100644 --- a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp +++ b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp @@ -28,13 +28,13 @@ #include #include #include +#include "application/ApplicationManager.h" #include "base/memory/Memory.h" +#include "bindings/event/CustomEventTypes.h" #include "platform/android/AndroidPlatform.h" #include "platform/java/jni/glue/JniNativeGlue.h" #include "platform/java/modules/SystemWindow.h" #include "platform/java/modules/SystemWindowManager.h" -#include "application/ApplicationManager.h" -#include "bindings/event/CustomEventTypes.h" namespace { struct cc::TouchEvent touchEvent; @@ -79,18 +79,18 @@ uint32_t getWindowIdFromWindowCache(jlong windowCacheHandle) { extern "C" { -JNIEXPORT jlong Java_com_cocos_lib_CocosSurfaceView_constructNative(JNIEnv *env, jobject /*thiz*/) {//NOLINT JNI function name +JNIEXPORT jlong Java_com_cocos_lib_CocosSurfaceView_constructNative(JNIEnv *env, jobject /*thiz*/) { //NOLINT JNI function name auto *cache = ccnew NativeWindowCache(); cache->env = env; return reinterpret_cast(cache); } -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_destructNative(JNIEnv */*env*/, jobject /*thiz*/, jlong handle) {//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_destructNative(JNIEnv * /*env*/, jobject /*thiz*/, jlong handle) { //NOLINT JNI function name auto *windowCache = reinterpret_cast(handle); CC_SAFE_DELETE(windowCache); } -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSizeChangedNative(JNIEnv */*env*/, jobject /*thiz*/, jlong handle, jint width, jint height) {//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSizeChangedNative(JNIEnv * /*env*/, jobject /*thiz*/, jlong handle, jint width, jint height) { //NOLINT JNI function name cc::WindowEvent ev; ev.windowId = getWindowIdFromWindowCache(handle); ev.type = cc::WindowEvent::Type::SIZE_CHANGED; @@ -100,7 +100,7 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSizeChangedNative(J platform->dispatchEvent(ev); } -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceRedrawNeededNative(JNIEnv */*env*/, jobject /*thiz*/, jlong handle) {//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceRedrawNeededNative(JNIEnv * /*env*/, jobject /*thiz*/, jlong handle) { //NOLINT JNI function name // } @@ -125,14 +125,14 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceCreatedNativ platform->dispatchEvent(event); } else { cc::ISystemWindowInfo info; - info.width = ANativeWindow_getWidth(nativeWindow); + info.width = ANativeWindow_getWidth(nativeWindow); info.height = ANativeWindow_getHeight(nativeWindow); info.externalHandle = nativeWindow; cc::ISystemWindow *window = windowMgr->createWindow(info); } } -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceChangedNative(JNIEnv *env,//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceChangedNative(JNIEnv *env, //NOLINT JNI function name jobject /*thiz*/, jlong handle, jobject surface, @@ -182,12 +182,11 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceDestroyedNat event.name = EVENT_DESTROY_WINDOW; event.args->ptrVal = reinterpret_cast(nativeWindow); platform->dispatchEvent(event); - } // NOLINTNEXTLINE JNIEXPORT void JNICALL -Java_com_cocos_lib_CocosTouchHandler_handleActionDown(JNIEnv *env,//NOLINT JNI function name +Java_com_cocos_lib_CocosTouchHandler_handleActionDown(JNIEnv *env, //NOLINT JNI function name jobject obj, jlong windowCacheHandle, jint id, @@ -205,7 +204,7 @@ Java_com_cocos_lib_CocosTouchHandler_handleActionDown(JNIEnv *env,//NOLINT JNI f } // NOLINTNEXTLINE -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionUp(JNIEnv *env,//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionUp(JNIEnv *env, //NOLINT JNI function name jobject obj, jlong windowCacheHandle, jint id, @@ -223,7 +222,7 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionUp(JNIEn } // NOLINTNEXTLINE -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNIEnv *env,//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNIEnv *env, //NOLINT JNI function name jobject obj, jlong windowCacheHandle, jintArray ids, @@ -251,7 +250,7 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNI } // NOLINTNEXTLINE -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionCancel(JNIEnv *env,//NOLINT JNI function name +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionCancel(JNIEnv *env, //NOLINT JNI function name jobject obj, jlong windowCacheHandle, jintArray ids, diff --git a/native/cocos/platform/interfaces/modules/ISystemWindowManager.h b/native/cocos/platform/interfaces/modules/ISystemWindowManager.h index 0813461be9..830a7a0ec5 100644 --- a/native/cocos/platform/interfaces/modules/ISystemWindowManager.h +++ b/native/cocos/platform/interfaces/modules/ISystemWindowManager.h @@ -28,8 +28,8 @@ namespace cc { class ISystemWindow; -class OSEvent; - +class OSEvent; + struct ISystemWindowInfo { ccstd::string title; int32_t x{-1}; @@ -38,11 +38,11 @@ struct ISystemWindowInfo { int32_t height{-1}; int32_t flags{-1}; void *externalHandle{nullptr}; -}; - +}; + // key: window id using SystemWindowMap = ccstd::unordered_map>; - + /** * Responsible for creating, finding ISystemWindow object and message handling */ @@ -52,34 +52,34 @@ public: * Initialize the NativeWindow environment * @return 0 Succeed -1 Failed */ - virtual int init() = 0; + virtual int init() = 0; /** * Process messages at the PAL layer */ - virtual void processEvent(bool *quit) = 0; + virtual void processEvent(bool *quit) = 0; /** * Swap window back buffer */ - virtual void swapWindows() = 0; + virtual void swapWindows() = 0; /** * Create an ISystemWindow object * @param info window description * @return The created ISystemWindow object,if failed then return nullptr */ - virtual ISystemWindow *createWindow(const ISystemWindowInfo &info) = 0; + virtual ISystemWindow *createWindow(const ISystemWindowInfo &info) = 0; /** * Find an ISystemWindow object * @param windowId unique ID of window */ - virtual ISystemWindow *getWindow(uint32_t windowId) const = 0; - + virtual ISystemWindow *getWindow(uint32_t windowId) const = 0; + /** * Retrive all windows - */ + */ virtual const SystemWindowMap &getWindows() const = 0; }; -} +} // namespace cc diff --git a/native/cocos/platform/ios/IOSPlatform.h b/native/cocos/platform/ios/IOSPlatform.h index e84836bc7d..3798e46839 100644 --- a/native/cocos/platform/ios/IOSPlatform.h +++ b/native/cocos/platform/ios/IOSPlatform.h @@ -56,7 +56,7 @@ public: void onPause() override; void onResume() override; void onClose() override; - + ISystemWindow *createNativeWindow(uint32_t windowId, void *externalHandle) override; private: diff --git a/native/cocos/platform/ios/modules/SystemWindow.h b/native/cocos/platform/ios/modules/SystemWindow.h index 4237156fdf..9d3e2a9724 100644 --- a/native/cocos/platform/ios/modules/SystemWindow.h +++ b/native/cocos/platform/ios/modules/SystemWindow.h @@ -33,9 +33,9 @@ namespace cc { class SystemWindow : public ISystemWindow { public: - SystemWindow(uint32_t windowId, void *externalHandle); + SystemWindow(uint32_t windowId, void* externalHandle); ~SystemWindow() override; - + void closeWindow() override; uintptr_t getWindowHandle() const override; @@ -45,14 +45,14 @@ public: */ void setCursorEnabled(bool value) override; void copyTextToClipboard(const std::string& text) override; - + uint32_t getWindowId() const override { return _windowId; } - UIWindow *getUIWindow() const { return _window; } + UIWindow* getUIWindow() const { return _window; } private: int32_t _width{0}; int32_t _height{0}; - + uint32_t _windowId{0}; void* _externalHandle{nullptr}; UIWindow* _window{nullptr}; diff --git a/native/cocos/platform/ios/modules/SystemWindowManager.h b/native/cocos/platform/ios/modules/SystemWindowManager.h index 9e5f012eb5..ac2ce19b58 100644 --- a/native/cocos/platform/ios/modules/SystemWindowManager.h +++ b/native/cocos/platform/ios/modules/SystemWindowManager.h @@ -45,7 +45,7 @@ public: ISystemWindow *createWindow(const ISystemWindowInfo &info) override; ISystemWindow *getWindow(uint32_t windowId) const override; const SystemWindowMap &getWindows() const override { return _windows; } - + ISystemWindow *getWindowFromUIWindow(UIWindow *window) const; private: diff --git a/native/cocos/platform/java/modules/SystemWindow.cpp b/native/cocos/platform/java/modules/SystemWindow.cpp index 210935e388..9df4727b11 100644 --- a/native/cocos/platform/java/modules/SystemWindow.cpp +++ b/native/cocos/platform/java/modules/SystemWindow.cpp @@ -45,9 +45,7 @@ namespace { namespace cc { SystemWindow::SystemWindow(uint32_t windowId, void *externalHandle) -: _windowHandle(externalHandle) -, _windowId(windowId) -{ +: _windowHandle(externalHandle), _windowId(windowId) { } void SystemWindow::setCursorEnabled(bool value) { diff --git a/native/cocos/platform/linux/modules/SystemWindow.cpp b/native/cocos/platform/linux/modules/SystemWindow.cpp index bd80047b8d..2bad5dcfa3 100644 --- a/native/cocos/platform/linux/modules/SystemWindow.cpp +++ b/native/cocos/platform/linux/modules/SystemWindow.cpp @@ -75,7 +75,7 @@ bool SystemWindow::createWindow(const char *title, return false; } - _width = w; + _width = w; _height = h; _windowHandle = SDLHelper::getWindowHandle(_window); diff --git a/native/cocos/platform/linux/modules/SystemWindow.h b/native/cocos/platform/linux/modules/SystemWindow.h index d8cb47f12a..95263b35c7 100644 --- a/native/cocos/platform/linux/modules/SystemWindow.h +++ b/native/cocos/platform/linux/modules/SystemWindow.h @@ -36,7 +36,7 @@ class CC_DLL SystemWindow : public ISystemWindow { friend class SystemWindowManager; public: - explicit SystemWindow(uint32_t windowId, void *externalHandle); + explicit SystemWindow(uint32_t windowId, void* externalHandle); ~SystemWindow() override; void swapWindow(); diff --git a/native/cocos/platform/linux/modules/SystemWindowManager.cpp b/native/cocos/platform/linux/modules/SystemWindowManager.cpp index ed5c2fc56a..cc3f045981 100644 --- a/native/cocos/platform/linux/modules/SystemWindowManager.cpp +++ b/native/cocos/platform/linux/modules/SystemWindowManager.cpp @@ -24,15 +24,15 @@ ****************************************************************************/ #include "SystemWindowManager.h" +#include "SDL2/SDL_events.h" #include "platform/BasePlatform.h" #include "platform/SDLHelper.h" #include "platform/interfaces/modules/ISystemWindowManager.h" #include "platform/linux/modules/SystemWindow.h" -#include "SDL2/SDL_events.h" namespace cc { SystemWindowManager::SystemWindowManager(IEventDispatch *delegate) - : _eventDispatcher(delegate) { +: _eventDispatcher(delegate) { } int SystemWindowManager::init() { diff --git a/native/cocos/platform/linux/modules/SystemWindowManager.h b/native/cocos/platform/linux/modules/SystemWindowManager.h index f0111824ce..c26c44567f 100644 --- a/native/cocos/platform/linux/modules/SystemWindowManager.h +++ b/native/cocos/platform/linux/modules/SystemWindowManager.h @@ -54,4 +54,4 @@ private: SystemWindowMap _windows; IEventDispatch *_eventDispatcher{nullptr}; }; -} +} // namespace cc diff --git a/native/cocos/platform/mac/MacPlatform.h b/native/cocos/platform/mac/MacPlatform.h index 2cbfc26e4c..9b8c1dbcdd 100644 --- a/native/cocos/platform/mac/MacPlatform.h +++ b/native/cocos/platform/mac/MacPlatform.h @@ -45,9 +45,9 @@ public: * @brief Start base platform initialization. */ int32_t run(int argc, const char **argv) override; - + ISystemWindow *createNativeWindow(uint32_t windowId, void *externalHandle) override; - + /** * @brief Implement the main logic of the base platform. */ diff --git a/native/cocos/platform/mac/modules/SystemWindow.h b/native/cocos/platform/mac/modules/SystemWindow.h index 340e51a745..10d4a74d07 100644 --- a/native/cocos/platform/mac/modules/SystemWindow.h +++ b/native/cocos/platform/mac/modules/SystemWindow.h @@ -25,15 +25,15 @@ #pragma once +#include #include #include "platform/interfaces/modules/ISystemWindow.h" -#include namespace cc { class SystemWindow : public ISystemWindow { public: - explicit SystemWindow(uint32_t windowId, void *externalHandle); + explicit SystemWindow(uint32_t windowId, void* externalHandle); ~SystemWindow() override; bool createWindow(const char* title, @@ -49,10 +49,10 @@ public: _width = w; _height = h; } - + uint32_t getWindowId() const override; - NSWindow *getNSWindow() const { return _window; } - + NSWindow* getNSWindow() const { return _window; } + /* @brief enable/disable(lock) the cursor, default is enabled */ @@ -62,7 +62,7 @@ public: private: int32_t _width{0}; int32_t _height{0}; - + uint32_t _windowId{0}; uintptr_t _windowHandle{0}; NSWindow* _window{nullptr}; diff --git a/native/cocos/platform/mac/modules/SystemWindowManager.h b/native/cocos/platform/mac/modules/SystemWindowManager.h index 9e2585e578..81838880dd 100644 --- a/native/cocos/platform/mac/modules/SystemWindowManager.h +++ b/native/cocos/platform/mac/modules/SystemWindowManager.h @@ -25,9 +25,9 @@ #pragma once +#include #include "base/std/container/unordered_map.h" #include "platform/interfaces/modules/ISystemWindowManager.h" -#include struct SDL_Window; @@ -46,7 +46,7 @@ public: ISystemWindow *createWindow(const ISystemWindowInfo &info) override; ISystemWindow *getWindow(uint32_t windowId) const override; const SystemWindowMap &getWindows() const override { return _windows; } - + ISystemWindow *getWindowFromNSWindow(NSWindow *window) const; private: diff --git a/native/cocos/platform/win32/WindowsPlatform.cpp b/native/cocos/platform/win32/WindowsPlatform.cpp index 8268ccfad5..75e446f94c 100644 --- a/native/cocos/platform/win32/WindowsPlatform.cpp +++ b/native/cocos/platform/win32/WindowsPlatform.cpp @@ -41,8 +41,8 @@ #include "modules/Screen.h" #include "modules/SystemWindow.h" #endif -#include "modules/Vibrator.h" #include "base/memory/Memory.h" +#include "modules/Vibrator.h" namespace { /** diff --git a/native/cocos/platform/win32/modules/SystemWindow.cpp b/native/cocos/platform/win32/modules/SystemWindow.cpp index 05875662dc..88c5683f5e 100644 --- a/native/cocos/platform/win32/modules/SystemWindow.cpp +++ b/native/cocos/platform/win32/modules/SystemWindow.cpp @@ -71,7 +71,7 @@ bool SystemWindow::createWindow(const char *title, return false; } - _width = w; + _width = w; _height = h; _windowHandle = SDLHelper::getWindowHandle(_window); diff --git a/native/cocos/platform/win32/modules/SystemWindow.h b/native/cocos/platform/win32/modules/SystemWindow.h index a420f5991a..3bf2ce6695 100644 --- a/native/cocos/platform/win32/modules/SystemWindow.h +++ b/native/cocos/platform/win32/modules/SystemWindow.h @@ -37,7 +37,7 @@ class CC_DLL SystemWindow : public ISystemWindow { friend class SystemWindowManager; public: - explicit SystemWindow(uint32_t windowId, void *externalHandle); + explicit SystemWindow(uint32_t windowId, void* externalHandle); ~SystemWindow() override; void swapWindow(); diff --git a/native/cocos/platform/win32/modules/SystemWindowManager.cpp b/native/cocos/platform/win32/modules/SystemWindowManager.cpp index 5f56bc0d32..125c50a7e0 100644 --- a/native/cocos/platform/win32/modules/SystemWindowManager.cpp +++ b/native/cocos/platform/win32/modules/SystemWindowManager.cpp @@ -24,16 +24,16 @@ ****************************************************************************/ #include "SystemWindowManager.h" +#include "SDL2/SDL_events.h" #include "platform/BasePlatform.h" #include "platform/SDLHelper.h" #include "platform/interfaces/modules/ISystemWindowManager.h" #include "platform/win32/modules/SystemWindow.h" -#include "SDL2/SDL_events.h" namespace cc { SystemWindowManager::SystemWindowManager(IEventDispatch *delegate) - : _eventDispatcher(delegate) { +: _eventDispatcher(delegate) { } int SystemWindowManager::init() { diff --git a/native/cocos/renderer/gfx-base/GFXDevice.h b/native/cocos/renderer/gfx-base/GFXDevice.h index 0e7ec7d72a..7cb0892666 100644 --- a/native/cocos/renderer/gfx-base/GFXDevice.h +++ b/native/cocos/renderer/gfx-base/GFXDevice.h @@ -190,7 +190,6 @@ protected: ccstd::unordered_map> _textureBarriers; ccstd::unordered_map> _bufferBarriers; - private: ccstd::vector _swapchains; // weak reference }; diff --git a/native/cocos/renderer/gfx-vulkan/VKSwapchain.cpp b/native/cocos/renderer/gfx-vulkan/VKSwapchain.cpp index 38ac24f7d0..ba7123f03e 100644 --- a/native/cocos/renderer/gfx-vulkan/VKSwapchain.cpp +++ b/native/cocos/renderer/gfx-vulkan/VKSwapchain.cpp @@ -33,9 +33,9 @@ #include "VKUtils.h" #include "application/ApplicationManager.h" -#include "platform/interfaces/modules/IXRInterface.h" #include "platform/interfaces/modules/ISystemWindow.h" #include "platform/interfaces/modules/ISystemWindowManager.h" +#include "platform/interfaces/modules/IXRInterface.h" #if CC_SWAPPY_ENABLED #include "platform/android/AndroidPlatform.h" diff --git a/native/cocos/renderer/pipeline/custom/NativeExecutor.cpp b/native/cocos/renderer/pipeline/custom/NativeExecutor.cpp index 3d963643ba..3ab8a10e43 100644 --- a/native/cocos/renderer/pipeline/custom/NativeExecutor.cpp +++ b/native/cocos/renderer/pipeline/custom/NativeExecutor.cpp @@ -88,7 +88,7 @@ uint32_t getRasterPassPreserveCount(const RasterPass& pass) { } PersistentRenderPassAndFramebuffer createRenderPassAndFramebuffer(RenderGraphVisitorContext& ctx, - const RasterPass& pass) { + const RasterPass& pass) { PersistentRenderPassAndFramebuffer data(pass.get_allocator()); gfx::RenderPassInfo rpInfo; uint32_t numDepthStencil = 0; @@ -165,10 +165,8 @@ PersistentRenderPassAndFramebuffer createRenderPassAndFramebuffer(RenderGraphVis struct RenderGraphVisitor : boost::dfs_visitor<> { void preBarriers() const { - } void postBarriers() const { - } void begin(const RasterPass& pass) const { @@ -275,11 +273,9 @@ struct RenderGraphVisitor : boost::dfs_visitor<> { } RenderGraphVisitorContext& ctx; - }; void executeRenderGraph(const RenderGraph& renderGraph) { - } } // namespace render diff --git a/native/cocos/renderer/pipeline/custom/NativePipelineImpl.cpp b/native/cocos/renderer/pipeline/custom/NativePipelineImpl.cpp index 1a87a09b27..b104fc9d94 100644 --- a/native/cocos/renderer/pipeline/custom/NativePipelineImpl.cpp +++ b/native/cocos/renderer/pipeline/custom/NativePipelineImpl.cpp @@ -306,7 +306,7 @@ gfx::DescriptorSet *NativePipeline::getDescriptorSet() const { } ccstd::vector NativePipeline::getCommandBuffers() const { - return { 1, device->getCommandBuffer() }; + return {1, device->getCommandBuffer()}; } namespace {