move cocos/core/pipeline to cocos/rendering (#12797)

* move cocos/core/pipeline to cocos/rendering
This commit is contained in:
minggo
2022-09-16 16:10:26 +08:00
committed by GitHub
parent 914bc2aadd
commit bd0fcc67c4
124 changed files with 490 additions and 457 deletions
+134 -91
View File
@@ -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"
}
},
{
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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';
@@ -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';
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -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';
+2 -2
View File
@@ -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';
-3
View File
@@ -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 };
+4 -3
View File
@@ -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);
+5 -5
View File
@@ -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';
/**
+2 -2
View File
@@ -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';
+1 -1
View File
@@ -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';
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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,
+2 -2
View File
@@ -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,
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -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();
+2 -2
View File
@@ -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';
+2 -2
View File
@@ -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!);
@@ -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[];
@@ -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';
@@ -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';
@@ -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';
@@ -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';
@@ -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';
@@ -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';
@@ -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;
@@ -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,
@@ -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;
@@ -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 {
@@ -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,
@@ -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) {
@@ -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 {
@@ -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
@@ -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';
@@ -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';
@@ -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';
@@ -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,
@@ -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';
@@ -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 {
@@ -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';
@@ -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';
@@ -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)];
@@ -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';
@@ -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';
@@ -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';
@@ -23,7 +23,7 @@
THE SOFTWARE.
*/
import { markAsWarning } from '../utils';
import { markAsWarning } from '../core/utils';
import { RenderPipeline } from './render-pipeline';
// deprecate RenderPipeline API
@@ -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
@@ -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;
@@ -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)];
@@ -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;
@@ -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();
@@ -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(
@@ -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 };
@@ -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;
@@ -1,4 +1,4 @@
import { EventTarget } from '../event/event-target';
import { EventTarget } from '../core/event/event-target';
export enum PipelineEventType {
/**
@@ -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();
@@ -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;
@@ -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);
@@ -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<number, PipelineState> = new Map<number, PipelineState>();
@@ -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();
@@ -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();
@@ -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';
@@ -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';
/**
@@ -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
@@ -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';
@@ -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;
@@ -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';
@@ -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';
@@ -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';
@@ -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
@@ -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';
@@ -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();
@@ -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[] = [];
@@ -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)];
@@ -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';
+3 -1
View File
@@ -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
+1 -1
View File
@@ -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';
+4
View File
@@ -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';
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -1 +1 @@
export * from '../cocos/core/pipeline/geometry-renderer';
export * from '../cocos/rendering/geometry-renderer';
@@ -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<IXRInterface>()
#define CC_GET_XR_INTERFACE() BasePlatform::getPlatform()->getInterface<IXRInterface>()
/**
* @brief Called at the user-defined main entry
+7 -7
View File
@@ -25,9 +25,9 @@
#include "BaseGame.h"
#include <string>
#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);
@@ -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 {
@@ -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<void *>(window->getWindowHandle()));
@@ -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();
@@ -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)
+3 -4
View File
@@ -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<uint32_t>(size.x) * pixelRatio;
info.width = static_cast<uint32_t>(size.x) * pixelRatio;
info.height = static_cast<uint32_t>(size.y) * pixelRatio;
info.windowHandle = reinterpret_cast<void *>(handle);
info.windowId = window->getWindowId();
-1
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More