move cocos/core/renderer to cocos/render-scene (#12729)

* move cocos/core/renderer to cocos/render-scene

* fix compiling error on native
This commit is contained in:
minggo
2022-09-09 18:19:06 +08:00
committed by GitHub
parent 6de3d10128
commit 4261ccae76
123 changed files with 299 additions and 302 deletions
+11 -11
View File
@@ -156,17 +156,17 @@
"cocos/core/pipeline/render-pipeline.ts": "cocos/core/pipeline/render-pipeline.jsb.ts",
"cocos/core/pipeline/geometry-renderer.ts": "cocos/core/pipeline/geometry-renderer.jsb.ts",
"cocos/core/pipeline/custom/index.ts": "cocos/core/pipeline/custom/index.jsb.ts",
"cocos/core/renderer/core/native-pools.ts": "cocos/core/renderer/core/native-pools.jsb.ts",
"cocos/core/renderer/core/material-instance.ts": "cocos/core/renderer/core/material-instance.jsb.ts",
"cocos/core/renderer/core/pass.ts": "cocos/core/renderer/core/pass.jsb.ts",
"cocos/core/renderer/core/program-lib.ts": "cocos/core/renderer/core/program-lib.jsb.ts",
"cocos/core/renderer/core/render-window.ts": "cocos/core/renderer/core/render-window.jsb.ts",
"cocos/core/renderer/core/sampler-lib.ts": "cocos/core/renderer/core/sampler.jsb.ts",
"cocos/core/renderer/scene/camera.ts": "cocos/core/renderer/scene/camera.jsb.ts",
"cocos/core/renderer/scene/model.ts": "cocos/core/renderer/scene/model.jsb.ts",
"cocos/core/renderer/core/render-scene.ts": "cocos/core/renderer/core/render-scene.jsb.ts",
"cocos/core/renderer/scene/submodel.ts": "cocos/core/renderer/scene/submodel.jsb.ts",
"cocos/core/renderer/scene/index.ts": "cocos/core/renderer/scene/index.jsb.ts",
"cocos/render-scene/core/native-pools.ts": "cocos/render-scene/core/native-pools.jsb.ts",
"cocos/render-scene/core/material-instance.ts": "cocos/render-scene/core/material-instance.jsb.ts",
"cocos/render-scene/core/pass.ts": "cocos/render-scene/core/pass.jsb.ts",
"cocos/render-scene/core/program-lib.ts": "cocos/render-scene/core/program-lib.jsb.ts",
"cocos/render-scene/core/render-window.ts": "cocos/render-scene/core/render-window.jsb.ts",
"cocos/render-scene/core/sampler-lib.ts": "cocos/render-scene/core/sampler.jsb.ts",
"cocos/render-scene/scene/camera.ts": "cocos/render-scene/scene/camera.jsb.ts",
"cocos/render-scene/scene/model.ts": "cocos/render-scene/scene/model.jsb.ts",
"cocos/render-scene/core/render-scene.ts": "cocos/render-scene/core/render-scene.jsb.ts",
"cocos/render-scene/scene/submodel.ts": "cocos/render-scene/scene/submodel.jsb.ts",
"cocos/render-scene/scene/index.ts": "cocos/render-scene/scene/index.jsb.ts",
"cocos/2d/renderer/native-2d.ts": "cocos/2d/renderer/native-2d.jsb.ts",
"cocos/gfx/base/pipeline-state.ts": "cocos/gfx/base/pipeline-state.jsb.ts",
"cocos/gfx/index.ts": "cocos/gfx/index.jsb.ts",
+1 -1
View File
@@ -30,7 +30,7 @@ import { builtinResMgr } from '../../asset/asset-manager';
import { InstanceMaterialType, UIRenderer } from '../framework/ui-renderer';
import { director } from '../../core/director';
import { Color } from '../../core/math';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { IAssembler } from '../renderer/base';
import { IBatcher } from '../renderer/i-batcher';
import { LineCap, LineJoin } from '../assembler/graphics/types';
+1 -1
View File
@@ -28,7 +28,7 @@ import { Material } from '../../asset/assets';
import { Color, ModelRenderer, Vec2 } from '../../core';
import { legacyCC } from '../../core/global-exports';
import { ModelLocalBindings } from '../../core/pipeline/define';
import { Model } from '../../core/renderer/scene';
import { Model } from '../../render-scene/scene';
import { Root } from '../../core/root';
import { TransformBit } from '../../core/scene-graph/node-enum';
import { SpriteFrame } from '../assets/sprite-frame';
+2 -2
View File
@@ -24,7 +24,7 @@
*/
import { JSB } from 'internal:constants';
import { Camera, Model } from '../../core/renderer/scene';
import { Camera, Model } from '../../render-scene/scene';
import type { UIStaticBatch } from '../components/ui-static-batch';
import { Material } from '../../asset/assets/material';
import { RenderRoot2D, UIRenderer } from '../framework';
@@ -50,7 +50,7 @@ import { BaseRenderData, MeshRenderData } from './render-data';
import { UIMeshRenderer } from '../components/ui-mesh-renderer';
import { NativeBatcher2d, NativeUIMeshBuffer } from './native-2d';
import { MeshBuffer } from './mesh-buffer';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { builtinResMgr } from '../../asset/asset-manager';
import { RenderingSubMesh } from '../../asset/assets';
+2 -2
View File
@@ -26,10 +26,10 @@
import { Material } from '../../asset/assets/material';
import { Texture, Sampler, InputAssembler, DescriptorSet, Shader } from '../../gfx';
import { Node } from '../../core/scene-graph';
import { Model } from '../../core/renderer/scene/model';
import { Model } from '../../render-scene/scene/model';
import { Layers } from '../../core/scene-graph/layers';
import { legacyCC } from '../../core/global-exports';
import { Pass } from '../../core/renderer/core/pass';
import { Pass } from '../../render-scene/core/pass';
import { IBatcher } from './i-batcher';
const UI_VIS_FLAG = Layers.Enum.NONE | Layers.Enum.UI_3D;
+2 -2
View File
@@ -2,8 +2,8 @@ import { CachedArray, Node } from '../../core';
import { TextureBase } from '../../asset/assets/texture-base';
import { Device } from '../../gfx';
import { Attribute } from '../../gfx/base/define';
import { Camera } from '../../core/renderer/scene/camera';
import { Model } from '../../core/renderer/scene/model';
import { Camera } from '../../render-scene/scene/camera';
import { Model } from '../../render-scene/scene/model';
import { SpriteFrame } from '../assets/sprite-frame';
import { UIStaticBatch } from '../components/ui-static-batch';
import { UIRenderer, RenderRoot2D } from '../framework';
+1 -1
View File
@@ -1,7 +1,7 @@
import { Material } from '../../asset/assets';
import { Attribute, Device, Sampler, Texture } from '../../gfx';
import { Node } from '../../core/scene-graph';
import { Model } from '../../core/renderer/scene';
import { Model } from '../../render-scene/scene';
export declare class NativeRenderDrawInfo {
constructor();
+1 -1
View File
@@ -3,7 +3,7 @@ import { IRenderData } from './render-data';
import { NativeRenderDrawInfo } from './native-2d';
import { Node } from '../../core';
import { Sampler, Texture } from '../../gfx';
import { Model } from '../../core/renderer/scene';
import { Model } from '../../render-scene/scene';
import { Material } from '../../asset/assets';
export enum AttrUInt8ArrayView {
+1 -1
View File
@@ -35,7 +35,7 @@ import { warn } from '../../core/platform/debug';
import { Morph, SubMeshMorph } from './morph';
import { assertIsNonNullable, assertIsTrue } from '../../core/data/utils/asserts';
import { log2, nextPow2 } from '../../core/math/bits';
import { IMacroPatch } from '../../core/renderer';
import { IMacroPatch } from '../../render-scene';
import { legacyCC } from '../../core/global-exports';
import { PixelFormat } from '../../asset/assets/asset-enum';
+1 -1
View File
@@ -30,7 +30,7 @@ import { Texture2D } from '../../asset/assets';
import { Material } from '../../asset/assets/material';
import { Mesh } from '../assets/mesh';
import { Vec4 } from '../../core/math';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { MorphModel } from '../models/morph-model';
import { Root } from '../../core/root';
import { TransformBit } from '../../core/scene-graph/node-enum';
@@ -26,9 +26,9 @@
import { ccclass, range, slide, type, editable, visible, help, executeInEditMode,
menu, tooltip, serializable, formerlySerializedAs } from 'cc.decorator';
import { Light } from './light-component';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { legacyCC } from '../../core/global-exports';
import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../core/renderer/scene';
import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../render-scene/scene';
import { Root } from '../../core/root';
import { property } from '../../core/data/class-decorator';
import { CCBoolean, CCFloat } from '../../core/data/utils/attribute';
+1 -1
View File
@@ -27,7 +27,7 @@ import { ccclass, tooltip, range, slide, type, displayOrder, serializable, edita
import { Component } from '../../core/components/component';
import { Color, Vec3 } from '../../core/math';
import { Enum } from '../../core/value-types';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { Root } from '../../core/root';
import { legacyCC } from '../../core/global-exports';
+2 -2
View File
@@ -24,10 +24,10 @@
*/
import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs } from 'cc.decorator';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { Light, PhotometricTerm } from './light-component';
import { legacyCC } from '../../core/global-exports';
import { Camera } from '../../core/renderer/scene';
import { Camera } from '../../render-scene/scene';
import { Root } from '../../core/root';
/**
+2 -2
View File
@@ -26,11 +26,11 @@
import { ccclass, range, slide, type, editable, displayOrder, help, executeInEditMode,
menu, tooltip, serializable, formerlySerializedAs, visible } from 'cc.decorator';
import { toRadian } from '../../core/math';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { Light, PhotometricTerm } from './light-component';
import { legacyCC } from '../../core/global-exports';
import { Root } from '../../core/root';
import { Camera, PCFType, ShadowType } from '../../core/renderer/scene';
import { Camera, PCFType, ShadowType } from '../../render-scene/scene';
import { property } from '../../core/data/class-decorator';
import { CCBoolean, CCFloat } from '../../core/data/utils/attribute';
+2 -2
View File
@@ -30,9 +30,9 @@ import { AABB } from '../../core/geometry';
import { BufferUsageBit, MemoryUsageBit, Attribute, DescriptorSet, Buffer, BufferInfo } from '../../gfx';
import { INST_JOINT_ANIM_INFO, UBOSkinningAnimation, UBOSkinningTexture, UNIFORM_JOINT_TEXTURE_BINDING } from '../../core/pipeline/define';
import { Node } from '../../core/scene-graph';
import { IMacroPatch, Pass } from '../../core/renderer/core/pass';
import { IMacroPatch, Pass } from '../../render-scene/core/pass';
import type { DataPoolManager } from '../skeletal-animation/data-pool-manager';
import { ModelType } from '../../core/renderer/scene/model';
import { ModelType } from '../../render-scene/scene/model';
import { IAnimInfo, IJointTextureHandle } from '../skeletal-animation/skeletal-animation-utils';
import { MorphModel } from './morph-model';
import { legacyCC } from '../../core/global-exports';
+2 -2
View File
@@ -23,12 +23,12 @@
THE SOFTWARE.
*/
import { Model } from '../../core/renderer/scene/model';
import { Model } from '../../render-scene/scene/model';
import { MorphRenderingInstance } from '../assets/morph-rendering';
import { Material } from '../../asset/assets/material';
import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh';
import { DescriptorSet } from '../../gfx';
import { IMacroPatch } from '../../core/renderer';
import { IMacroPatch } from '../../render-scene';
/**
* @en
+2 -2
View File
@@ -32,11 +32,11 @@ import { BufferUsageBit, MemoryUsageBit, DescriptorSet, Buffer, BufferInfo, Attr
import { Mat4, Vec3 } from '../../core/math';
import { UBOSkinning, UNIFORM_REALTIME_JOINT_TEXTURE_BINDING } from '../../core/pipeline/define';
import { Node } from '../../core/scene-graph/node';
import { ModelType } from '../../core/renderer/scene/model';
import { ModelType } from '../../render-scene/scene/model';
import { uploadJointData } from '../skeletal-animation/skeletal-animation-utils';
import { MorphModel } from './morph-model';
import { deleteTransform, getTransform, getWorldMatrix, IJointTransform } from '../../animation/skeletal-animation-utils';
import { IMacroPatch, BatchingSchemes, Pass } from '../../core/renderer';
import { IMacroPatch, BatchingSchemes, Pass } from '../../render-scene';
import { warnID } from '../../core/platform/debug';
import { director } from '../../core';
import { PixelFormat } from '../../asset/assets/asset-enum';
@@ -35,7 +35,7 @@ import { BufferUsageBit, Format, FormatInfos,
import { Mat4, Quat, Vec3 } from '../../core/math';
import { UBOSkinningAnimation } from '../../core/pipeline/define';
import { Node } from '../../core/scene-graph';
import { ITextureBufferHandle, TextureBufferPool } from '../../core/renderer/core/texture-buffer-pool';
import { ITextureBufferHandle, TextureBufferPool } from '../../render-scene/core/texture-buffer-pool';
import { jointTextureSamplerInfo } from '../misc/joint-texture-sampler-info';
// change here and cc-skinning.chunk to use other skinning algorithms
@@ -29,8 +29,8 @@ import { Material } from '../../asset/assets/material';
import { SpriteFrame } from '../../2d/assets/sprite-frame';
import { TextureBase } from '../../asset/assets/texture-base';
import { deviceManager, Type } from '../../gfx';
import { Pass } from '../../core/renderer/core/pass';
import { getDefaultFromType } from '../../core/renderer/core/pass-utils';
import { Pass } from '../../render-scene/core/pass';
import { getDefaultFromType } from '../../render-scene/core/pass-utils';
import { IValueProxy, IValueProxyFactory } from '../value-proxy';
import { warn } from '../../core/platform/debug';
+2 -2
View File
@@ -29,8 +29,8 @@ import { Root } from '../../core/root';
import { BlendState, DepthStencilState, RasterizerState,
DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format, deviceManager } from '../../gfx';
import { RenderPassStage } from '../../core/pipeline/define';
import { MacroRecord } from '../../core/renderer/core/pass-utils';
import { programLib } from '../../core/renderer/core/program-lib';
import { MacroRecord } from '../../render-scene/core/pass-utils';
import { programLib } from '../../render-scene/core/program-lib';
import { Asset } from './asset';
import { legacyCC } from '../../core/global-exports';
import { warnID } from '../../core/platform/debug';
+2 -2
View File
@@ -29,8 +29,8 @@ import { EffectAsset } from './effect-asset';
import { Texture, Type } from '../../gfx';
import { TextureBase } from './texture-base';
import { legacyCC } from '../../core/global-exports';
import { IPassInfoFull, Pass, PassOverrides } from '../../core/renderer/core/pass';
import { MacroRecord, MaterialProperty } from '../../core/renderer/core/pass-utils';
import { IPassInfoFull, Pass, PassOverrides } from '../../render-scene/core/pass';
import { MacroRecord, MaterialProperty } from '../../render-scene/core/pass-utils';
import { Color } from '../../core/math/color';
import { warnID } from '../../core/platform/debug';
import { Vec4 } from '../../core/math';
+1 -1
View File
@@ -28,7 +28,7 @@ import { EDITOR, TEST } from 'internal:constants';
import { clamp } from '../../core/math/utils';
import { Texture, ColorAttachment, DepthStencilAttachment, GeneralBarrierInfo, AccessFlagBit, RenderPassInfo, Format, deviceManager } from '../../gfx';
import { legacyCC } from '../../core/global-exports';
import { RenderWindow, IRenderWindowInfo } from '../../core/renderer/core/render-window';
import { RenderWindow, IRenderWindowInfo } from '../../render-scene/core/render-window';
import { Root } from '../../core/root';
import { TextureBase } from './texture-base';
import { BufferTextureCopy } from '../../gfx/base/define';
+3 -3
View File
@@ -31,16 +31,16 @@ import { Component } from './component';
import { Ray } from '../geometry';
import { Color, Rect, toRadian, Vec3 } from '../math';
import { CAMERA_DEFAULT_MASK } from '../pipeline/define';
import { scene } from '../renderer';
import { scene } from '../../render-scene';
import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter,
CameraType, TrackingType } from '../renderer/scene/camera';
CameraType, TrackingType } from '../../render-scene/scene/camera';
import { Root } from '../root';
import { Node } from '../scene-graph/node';
import { Layers } from '../scene-graph/layers';
import { Enum } from '../value-types';
import { TransformBit } from '../scene-graph/node-enum';
import { legacyCC } from '../global-exports';
import { RenderWindow } from '../renderer/core/render-window';
import { RenderWindow } from '../../render-scene/core/render-window';
import { ClearFlagBit } from '../../gfx';
const _temp_vec3_1 = new Vec3();
+1 -1
View File
@@ -30,7 +30,7 @@ import { Script } from '../../asset/assets/scripts';
import { CCObject } from '../data/object';
import IDGenerator from '../utils/id-generator';
import { getClassName, value } from '../utils/js';
import { RenderScene } from '../renderer/core/render-scene';
import { RenderScene } from '../../render-scene/core/render-scene';
import { Rect } from '../math';
import * as RF from '../data/utils/requiring-frame';
import { Node } from '../scene-graph';
+1 -1
View File
@@ -26,7 +26,7 @@
import {
ccclass, serializable,
} from 'cc.decorator';
import { scene } from '../renderer';
import { scene } from '../../render-scene';
import { Layers } from '../scene-graph/layers';
import { Renderer } from './renderer';
+1 -1
View File
@@ -29,7 +29,7 @@ import {
} from 'cc.decorator';
import { Material } from '../../asset/assets/material';
import { Component } from './component';
import { IMaterialInstanceInfo, MaterialInstance } from '../renderer/core/material-instance';
import { IMaterialInstanceInfo, MaterialInstance } from '../../render-scene/core/material-instance';
import { warnID } from '../platform/debug';
const _matInsInfo: IMaterialInstanceInfo = {
+1 -1
View File
@@ -27,7 +27,7 @@ import { replaceProperty, removeProperty, markAsWarning } from './utils/x-deprec
import * as math from './math';
import { Scheduler } from './scheduler';
import { legacyCC } from './global-exports';
import { SubModel } from './renderer/scene/submodel';
import { SubModel } from '../render-scene/scene/submodel';
import { Root } from './root';
import { game } from './game';
import System from './components/system';
+1 -1
View File
@@ -24,7 +24,7 @@
*/
import { Mat4, Vec3 } from '../math';
import { Camera } from '../renderer/scene';
import { Camera } from '../../render-scene/scene';
import enums from './enums';
import { Plane } from './plane';
import { AABB } from './aabb';
+1 -1
View File
@@ -40,7 +40,7 @@ import { Mesh } from '../../3d/assets/mesh';
import { IBArray, RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh';
import { IRaySubMeshOptions, ERaycastMode, IRaySubMeshResult, IRayMeshOptions, IRayModelOptions } from './spec';
import { IVec3Like } from '../math/type-define';
import { scene } from '../renderer';
import { scene } from '../../render-scene';
/**
* @en
+3 -3
View File
@@ -26,10 +26,10 @@
import { BufferUsageBit, Format, MemoryUsageBit, Device, DescriptorSet, InputAssembler,
InputAssemblerInfo, Attribute, Buffer, BufferInfo, Shader } from '../../gfx';
import { Mat4 } from '../math';
import { SubModel } from '../renderer/scene/submodel';
import { SubModel } from '../../render-scene/scene/submodel';
import { UBOLocalBatched } from './define';
import { Pass } from '../renderer';
import { Model } from '../renderer/scene';
import { Pass } from '../../render-scene';
import { Model } from '../../render-scene/scene';
export interface IBatchedItem {
vbs: Buffer[];
@@ -2,7 +2,7 @@ import { Material } from '../../../asset/assets';
import { intersect, Sphere } from '../../geometry';
import { ClearFlagBit, Color, Format, LoadOp, Rect, StoreOp, Viewport } from '../../../gfx';
import { macro } from '../../platform';
import { Camera, CSMLevel, DirectionalLight, Light, LightType, ShadowType, SKYBOX_FLAG, SpotLight } from '../../renderer/scene';
import { Camera, CSMLevel, DirectionalLight, Light, LightType, ShadowType, SKYBOX_FLAG, SpotLight } from '../../../render-scene/scene';
import { supportsR32FloatTexture } from '../define';
import { SRGBToLinear } from '../pipeline-funcs';
import { AccessType, AttachmentType, ComputeView, LightInfo, QueueHint, RasterView, ResourceResidency, SceneFlags } from './types';
+5 -5
View File
@@ -39,11 +39,11 @@ import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, BufferVie
import { legacyCC } from '../../global-exports';
import { Vec3 } from '../../math/vec3';
import { Vec4 } from '../../math/vec4';
import { BatchingSchemes } from '../../renderer';
import { DirectionalLight } from '../../renderer/scene';
import { Camera } from '../../renderer/scene/camera';
import { LightType } from '../../renderer/scene/light';
import { CSMLevel, ShadowType } from '../../renderer/scene/shadows';
import { BatchingSchemes } from '../../../render-scene';
import { DirectionalLight } from '../../../render-scene/scene';
import { Camera } from '../../../render-scene/scene/camera';
import { LightType } from '../../../render-scene/scene/light';
import { CSMLevel, ShadowType } from '../../../render-scene/scene/shadows';
import { Root } from '../../root';
import { BatchedBuffer } from '../batched-buffer';
import { SetIndex, UBODeferredLight, UBOForwardLight, UBOLocal } from '../define';
+5 -5
View File
@@ -30,19 +30,19 @@
*/
/* eslint-disable max-len */
import { Material } from '../../../asset/assets';
import { Camera } from '../../renderer/scene/camera';
import { Camera } from '../../../render-scene/scene/camera';
import { GeometryRenderer } from '../geometry-renderer';
import { Buffer, Color, CommandBuffer, DescriptorSet, DescriptorSetLayout, Device, DrawInfo, Format, InputAssembler, PipelineState, Rect, Sampler, Swapchain, Texture, UniformBlock, Viewport } from '../../../gfx';
import { GlobalDSManager } from '../global-descriptor-set-manager';
import { DescriptorBlockFlattened, DescriptorBlockIndex } from './layout-graph';
import { Mat4, Quat, Vec2, Vec4 } from '../../math';
import { MacroRecord } from '../../renderer/core/pass-utils';
import { MacroRecord } from '../../../render-scene/core/pass-utils';
import { PipelineSceneData } from '../pipeline-scene-data';
import { ComputeView, LightInfo, QueueHint, RasterView, ResourceResidency, SceneFlags, TaskType, UpdateFrequency } from './types';
import { CopyPair, MovePair } from './render-graph';
import { RenderScene } from '../../renderer/core/render-scene';
import { RenderWindow } from '../../renderer/core/render-window';
import { Model } from '../../renderer/scene';
import { RenderScene } from '../../../render-scene/core/render-scene';
import { RenderWindow } from '../../../render-scene/core/render-window';
import { Model } from '../../../render-scene/scene';
export abstract class PipelineRuntime {
public abstract activate(swapchain: Swapchain): boolean;
+1 -1
View File
@@ -31,7 +31,7 @@
/* eslint-disable max-len */
import * as impl from './graph';
import { Material } from '../../../asset/assets';
import { Camera } from '../../renderer/scene/camera';
import { Camera } from '../../../render-scene/scene/camera';
import { AccessFlagBit, Buffer, ClearFlagBit, Color, Format, Framebuffer, SampleCount, Sampler, Swapchain, Texture, TextureFlagBit, Viewport } from '../../../gfx';
import { ComputeView, LightInfo, QueueHint, RasterView, ResourceDimension, ResourceFlags, ResourceResidency, SceneFlags } from './types';
+1 -1
View File
@@ -30,7 +30,7 @@
*/
/* eslint-disable max-len */
import { ClearFlagBit, Color, LoadOp, StoreOp } from '../../../gfx';
import { Light } from '../../renderer/scene';
import { Light } from '../../../render-scene/scene';
export const enum UpdateFrequency {
PER_INSTANCE,
+4 -4
View File
@@ -31,15 +31,15 @@ import { ComputeView, LightInfo, LightingMode, QueueHint, RasterView, ResourceDi
import { Blit, ClearView, ComputePass, CopyPair, CopyPass, Dispatch, ManagedResource, MovePair, MovePass, RasterPass, RenderData, RenderGraph, RenderGraphComponent, RenderGraphValue, RenderQueue, RenderSwapchain, ResourceDesc, ResourceGraph, ResourceGraphValue, ResourceStates, ResourceTraits, SceneData } from './render-graph';
import { ComputePassBuilder, ComputeQueueBuilder, CopyPassBuilder, LayoutGraphBuilder, MovePassBuilder, Pipeline, PipelineBuilder, RasterPassBuilder, RasterQueueBuilder, SceneTransversal } from './pipeline';
import { PipelineSceneData } from '../pipeline-scene-data';
import { Model, Camera, ShadowType, CSMLevel, DirectionalLight, SpotLight, PCFType, Shadows } from '../../renderer/scene';
import { Light, LightType } from '../../renderer/scene/light';
import { Model, Camera, ShadowType, CSMLevel, DirectionalLight, SpotLight, PCFType, Shadows } from '../../../render-scene/scene';
import { Light, LightType } from '../../../render-scene/scene/light';
import { legacyCC } from '../../global-exports';
import { LayoutGraphData } from './layout-graph';
import { Executor } from './executor';
import { RenderWindow } from '../../renderer/core/render-window';
import { RenderWindow } from '../../../render-scene/core/render-window';
import { assert } from '../../platform/debug';
import { macro } from '../../platform/macro';
import { MacroRecord, RenderScene } from '../../renderer';
import { MacroRecord, RenderScene } from '../../../render-scene';
import { GlobalDSManager } from '../global-descriptor-set-manager';
import { supportsR32FloatTexture } from '../define';
import { OS } from '../../../../pal/system-info/enum-type';
+3 -3
View File
@@ -24,9 +24,9 @@
****************************************************************************/
import { Frustum, intersect } from '../../geometry';
import { Mat4, Vec3 } from '../../math';
import { RenderScene } from '../../renderer';
import { Camera, DirectionalLight, Model, Shadows, ShadowType, SKYBOX_FLAG, SubModel } from '../../renderer/scene';
import { Vec3 } from '../../math';
import { RenderScene } from '../../../render-scene';
import { Camera, Model, ShadowType, SKYBOX_FLAG } from '../../../render-scene/scene';
import { IRenderObject, IRenderPass, UBOShadow } from '../define';
import { PipelineSceneData } from '../pipeline-scene-data';
import { SceneTask, SceneTransversal, SceneVisitor } from './pipeline';
+1 -1
View File
@@ -28,7 +28,7 @@
*/
import { ccclass, displayOrder, serializable, type } from 'cc.decorator';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { SetIndex } from '../define';
import { RenderFlow, RenderPipeline } from '..';
import { Material } from '../../../asset/assets/material';
@@ -40,7 +40,7 @@ import { Format, StoreOp,
RenderPassInfo, Texture, AccessFlagBit, Framebuffer,
TextureInfo, TextureType, TextureUsageBit, FramebufferInfo, Swapchain, GeneralBarrierInfo } from '../../../gfx';
import { UBOGlobal, UBOCamera, UBOShadow, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING } from '../define';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { errorID } from '../../platform/debug';
import { DeferredPipelineSceneData } from './deferred-pipeline-scene-data';
import { PipelineEventType } from '../pipeline-event';
@@ -28,7 +28,7 @@
*/
import { ccclass, displayOrder, type, serializable } from 'cc.decorator';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { SetIndex } from '../define';
import { getPhaseID } from '../pass-phase';
import { renderQueueClearFunc, RenderQueue, convertRenderQueue, renderQueueSortFunc } from '../render-queue';
@@ -38,7 +38,7 @@ import { RenderBatchedQueue } from '../render-batched-queue';
import { RenderInstancedQueue } from '../render-instanced-queue';
import { IRenderStageInfo, RenderStage } from '../render-stage';
import { DeferredStagePriority } from '../enum';
import { BatchingSchemes } from '../../renderer/core/pass';
import { BatchingSchemes } from '../../../render-scene/core/pass';
import { DeferredPipeline } from './deferred-pipeline';
import { RenderQueueDesc, RenderQueueSortMode } from '../pipeline-serialization';
import { MainFlow } from './main-flow';
@@ -28,7 +28,7 @@
*/
import { ccclass, displayOrder, type, serializable } from 'cc.decorator';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { UBODeferredLight, SetIndex, UBOForwardLight, UBOLocal } from '../define';
import { getPhaseID } from '../pass-phase';
import { Color, Rect, Buffer, BufferUsageBit, MemoryUsageBit, BufferInfo, BufferViewInfo, DescriptorSet,
@@ -46,7 +46,7 @@ import { DeferredPipelineSceneData } from './deferred-pipeline-scene-data';
import { renderQueueClearFunc, RenderQueue, convertRenderQueue, renderQueueSortFunc } from '../render-queue';
import { RenderQueueDesc } from '../pipeline-serialization';
import { UIPhase } from '../ui-phase';
import { Pass } from '../../renderer/core/pass';
import { Pass } from '../../../render-scene/core/pass';
const colors: Color[] = [new Color(0, 0, 0, 1)];
+1 -1
View File
@@ -28,7 +28,7 @@
*/
import { ccclass } from 'cc.decorator';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { PIPELINE_FLOW_MAIN } from '../define';
import { IRenderFlowInfo, RenderFlow } from '../render-flow';
import { DeferredFlowPriority } from '../enum';
@@ -27,7 +27,7 @@
* @category pipeline
*/
import { ccclass, displayOrder, type, serializable } from 'cc.decorator';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { SetIndex, UBOLocal } from '../define';
import { Color, Rect, PipelineState, ClearFlagBit, DescriptorSetInfo, BufferInfo, BufferUsageBit, MemoryUsageBit } from '../../../gfx';
import { IRenderStageInfo, RenderStage } from '../render-stage';
+3 -3
View File
@@ -23,9 +23,9 @@
THE SOFTWARE.
*/
import { Pass } from '../renderer/core/pass';
import { Model } from '../renderer/scene/model';
import { SubModel } from '../renderer/scene/submodel';
import { Pass } from '../../render-scene/core/pass';
import { Model } from '../../render-scene/scene/model';
import { SubModel } from '../../render-scene/scene/submodel';
import { Layers } from '../scene-graph/layers';
import { legacyCC } from '../global-exports';
import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit, UniformStorageBuffer, DescriptorSetLayoutBinding,
+1 -3
View File
@@ -29,9 +29,7 @@ import { IRenderFlowInfo, RenderFlow } from '../render-flow';
import { ForwardFlowPriority } from '../enum';
import { ForwardStage } from './forward-stage';
import { RenderPipeline } from '../render-pipeline';
import { Camera } from '../../renderer/scene';
import { PostProcessStage } from '../deferred/postprocess-stage';
import { BloomStage } from '../deferred/bloom-stage';
import { Camera } from '../../../render-scene/scene';
/**
* @en The forward flow in forward render pipeline
@@ -33,7 +33,7 @@ import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPO
import { Swapchain, RenderPass } from '../../../gfx';
import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr';
import { Texture2D } from '../../../asset/assets/texture-2d';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { errorID } from '../../platform/debug';
import { PipelineSceneData } from '../pipeline-scene-data';
+2 -2
View File
@@ -33,13 +33,13 @@ import { RenderInstancedQueue } from '../render-instanced-queue';
import { IRenderStageInfo, RenderStage } from '../render-stage';
import { ForwardStagePriority } from '../enum';
import { RenderAdditiveLightQueue } from '../render-additive-light-queue';
import { BatchingSchemes } from '../../renderer/core/pass';
import { BatchingSchemes } from '../../../render-scene/core/pass';
import { ForwardFlow } from './forward-flow';
import { ForwardPipeline } from './forward-pipeline';
import { RenderQueueDesc, RenderQueueSortMode } from '../pipeline-serialization';
import { PlanarShadowQueue } from '../planar-shadow-queue';
import { UIPhase } from '../ui-phase';
import { Camera } from '../../renderer/scene';
import { Camera } from '../../../render-scene/scene';
import { renderProfiler } from '../pipeline-funcs';
const colors: Color[] = [new Color(0, 0, 0, 1)];
@@ -25,7 +25,7 @@
import { Device, BufferUsageBit, MemoryUsageBit, BufferInfo, Filter, Address, Sampler, DescriptorSet,
DescriptorSetInfo, Buffer, Texture, DescriptorSetLayoutInfo, DescriptorSetLayout, SamplerInfo } from '../../gfx';
import { Light } from '../renderer/scene';
import { Light } from '../../render-scene/scene';
import { UBOShadow, globalDescriptorSetLayout, PipelineGlobalBindings } from './define';
const _samplerLinearInfo = new SamplerInfo(
+2 -2
View File
@@ -23,8 +23,8 @@
THE SOFTWARE.
*/
import { Pass } from '../renderer';
import { IInstancedAttributeBlock, SubModel } from '../renderer/scene';
import { Pass } from '../../render-scene';
import { IInstancedAttributeBlock, SubModel } from '../../render-scene/scene';
import { UNIFORM_LIGHTMAP_TEXTURE_BINDING } from './define';
import { BufferUsageBit, MemoryUsageBit, Device, Texture, InputAssembler, InputAssemblerInfo,
Attribute, Buffer, BufferInfo, CommandBuffer, Shader, DescriptorSet } from '../../gfx';
+1 -1
View File
@@ -27,7 +27,7 @@ import { CommandBuffer, Device, Rect, RenderPass, Viewport } from '../../gfx';
import { IVec4Like } from '../math';
import { PipelineStateManager } from './pipeline-state-manager';
import { SetIndex } from './define';
import { Camera, Model } from '../renderer/scene';
import { Camera, Model } from '../../render-scene/scene';
const profilerViewport = new Viewport();
const profilerScissor = new Rect();
+7 -7
View File
@@ -19,17 +19,17 @@
THE SOFTWARE.
*/
import { Fog } from '../renderer/scene/fog';
import { Ambient } from '../renderer/scene/ambient';
import { Skybox } from '../renderer/scene/skybox';
import { Shadows } from '../renderer/scene/shadows';
import { Octree } from '../renderer/scene/octree';
import { Fog } from '../../render-scene/scene/fog';
import { Ambient } from '../../render-scene/scene/ambient';
import { Skybox } from '../../render-scene/scene/skybox';
import { Shadows } from '../../render-scene/scene/shadows';
import { Octree } from '../../render-scene/scene/octree';
import { IRenderObject } from './define';
import { Device, Framebuffer, InputAssembler, InputAssemblerInfo, Buffer, BufferInfo,
BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../../gfx';
import { Light } from '../renderer/scene/light';
import { Light } from '../../render-scene/scene/light';
import { Material } from '../../asset/assets';
import { Pass } from '../renderer/core/pass';
import { Pass } from '../../render-scene/core/pass';
import { CSMLayers } from './shadow/csm-layers';
const GEOMETRY_RENDERER_TECHNIQUE_COUNT = 6;
@@ -24,7 +24,7 @@
*/
import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, PipelineStateInfo } from '../../gfx';
import { Pass } from '../renderer/core/pass';
import { Pass } from '../../render-scene/core/pass';
export class PipelineStateManager {
private static _PSOHashMap: Map<number, PipelineState> = new Map<number, PipelineState>();
+5 -5
View File
@@ -26,14 +26,14 @@
import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING,
supportsR32FloatTexture, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, UBOCSM } from './define';
import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet } from '../../gfx';
import { Camera } from '../renderer/scene/camera';
import { Camera } from '../../render-scene/scene/camera';
import { Mat4, Vec3, Vec4, Color, toRadian } from '../math';
import { PipelineRuntime } from './custom/pipeline';
import { legacyCC } from '../global-exports';
import { CSMLevel, PCFType, Shadows, ShadowType } from '../renderer/scene/shadows';
import { Light, LightType } from '../renderer/scene/light';
import { DirectionalLight, SpotLight } from '../renderer/scene';
import { RenderWindow } from '../renderer/core/render-window';
import { CSMLevel, PCFType, Shadows, ShadowType } from '../../render-scene/scene/shadows';
import { Light, LightType } from '../../render-scene/scene/light';
import { DirectionalLight, SpotLight } from '../../render-scene/scene';
import { RenderWindow } from '../../render-scene/core/render-window';
import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr';
import { Texture2D } from '../../asset/assets';
import { DebugViewCompositeType } from './debug-view';
+2 -2
View File
@@ -27,9 +27,9 @@ import { AABB, intersect } from '../geometry';
import { SetIndex } from './define';
import { CommandBuffer, Device, RenderPass } from '../../gfx';
import { PipelineStateManager } from './pipeline-state-manager';
import { Model, Camera } from '../renderer/scene';
import { Model, Camera } from '../../render-scene/scene';
import { RenderInstancedQueue } from './render-instanced-queue';
import { ShadowType } from '../renderer/scene/shadows';
import { ShadowType } from '../../render-scene/scene/shadows';
import { Layers } from '../scene-graph/layers';
import { PipelineRuntime } from './custom/pipeline';
@@ -23,8 +23,8 @@
THE SOFTWARE.
*/
import { BatchingSchemes, Pass } from '../renderer/core/pass';
import { Model } from '../renderer/scene/model';
import { BatchingSchemes, Pass } from '../../render-scene/core/pass';
import { Model } from '../../render-scene/scene/model';
import { PipelineStateManager } from './pipeline-state-manager';
import { Vec3, nextPow2, Mat4, Color } from '../math';
import { intersect } from '../geometry';
@@ -33,14 +33,14 @@ import { Device, RenderPass, Buffer, BufferUsageBit, MemoryUsageBit,
import { Pool } from '../memop';
import { RenderBatchedQueue } from './render-batched-queue';
import { RenderInstancedQueue } from './render-instanced-queue';
import { SphereLight } from '../renderer/scene/sphere-light';
import { SpotLight } from '../renderer/scene/spot-light';
import { SubModel } from '../renderer/scene/submodel';
import { SphereLight } from '../../render-scene/scene/sphere-light';
import { SpotLight } from '../../render-scene/scene/spot-light';
import { SubModel } from '../../render-scene/scene/submodel';
import { getPhaseID } from './pass-phase';
import { Light, LightType } from '../renderer/scene/light';
import { Light, LightType } from '../../render-scene/scene/light';
import { SetIndex, UBOForwardLight, UBOShadow, UNIFORM_SHADOWMAP_BINDING,
UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, supportsR32FloatTexture } from './define';
import { Camera, ShadowType } from '../renderer/scene';
import { Camera, ShadowType } from '../../render-scene/scene';
import { GlobalDSManager } from './global-descriptor-set-manager';
import { PipelineUBO } from './pipeline-ubo';
import { PipelineRuntime } from './custom/pipeline';
+1 -1
View File
@@ -27,7 +27,7 @@ import { ccclass, displayOrder, serializable, type } from 'cc.decorator';
import { RenderStage } from './render-stage';
import { RenderPipeline } from './render-pipeline';
import { legacyCC } from '../global-exports';
import { Camera } from '../renderer/scene';
import { Camera } from '../../render-scene/scene';
/**
* @en Render flow information descriptor
+4 -4
View File
@@ -33,10 +33,10 @@ import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, ClearFlag
Texture, TextureInfo, TextureType, TextureUsageBit, Viewport, GeneralBarrierInfo, deviceManager,
} from '../../gfx';
import { legacyCC } from '../global-exports';
import { MacroRecord } from '../renderer/core/pass-utils';
import { RenderWindow } from '../renderer/core/render-window';
import { Camera, SKYBOX_FLAG } from '../renderer/scene/camera';
import { Model } from '../renderer/scene/model';
import { MacroRecord } from '../../render-scene/core/pass-utils';
import { RenderWindow } from '../../render-scene/core/render-window';
import { Camera, SKYBOX_FLAG } from '../../render-scene/scene/camera';
import { Model } from '../../render-scene/scene/model';
import { GlobalDSManager } from './global-descriptor-set-manager';
import { GeometryRenderer } from './geometry-renderer';
import { PipelineSceneData } from './pipeline-scene-data';
@@ -23,19 +23,19 @@
THE SOFTWARE.
*/
import { SubModel } from '../renderer/scene/submodel';
import { SubModel } from '../../render-scene/scene/submodel';
import { SetIndex } from './define';
import { Device, RenderPass, Shader, CommandBuffer } from '../../gfx';
import { getPhaseID } from './pass-phase';
import { PipelineStateManager } from './pipeline-state-manager';
import { Pass, BatchingSchemes } from '../renderer/core/pass';
import { Pass, BatchingSchemes } from '../../render-scene/core/pass';
import { RenderInstancedQueue } from './render-instanced-queue';
import { RenderBatchedQueue } from './render-batched-queue';
import { ShadowType } from '../renderer/scene/shadows';
import { Light, LightType } from '../renderer/scene/light';
import { ShadowType } from '../../render-scene/scene/shadows';
import { Light, LightType } from '../../render-scene/scene/light';
import { intersect } from '../geometry';
import { Model } from '../renderer/scene/model';
import { Camera, DirectionalLight, SpotLight } from '../renderer/scene';
import { Model } from '../../render-scene/scene/model';
import { Camera, DirectionalLight, SpotLight } from '../../render-scene/scene';
import { shadowCulling } from './scene-culling';
import { PipelineRuntime } from './custom/pipeline';
+1 -1
View File
@@ -28,7 +28,7 @@ import { legacyCC } from '../global-exports';
import { RenderPipeline } from './render-pipeline';
import { RenderFlow } from './render-flow';
import { RenderQueueDesc } from './pipeline-serialization';
import { Camera } from '../renderer/scene';
import { Camera } from '../../render-scene/scene';
/**
* @en The render stage information descriptor
+3 -3
View File
@@ -24,13 +24,13 @@
*/
import { intersect, Sphere } from '../geometry';
import { Model } from '../renderer/scene/model';
import { Camera, SKYBOX_FLAG } from '../renderer/scene/camera';
import { Model } from '../../render-scene/scene/model';
import { Camera, SKYBOX_FLAG } from '../../render-scene/scene/camera';
import { Vec3 } from '../math';
import { RenderPipeline } from './render-pipeline';
import { Pool } from '../memop';
import { IRenderObject, UBOShadow } from './define';
import { ShadowType, Shadows, CSMOptimizationMode } from '../renderer/scene/shadows';
import { ShadowType, CSMOptimizationMode } from '../../render-scene/scene/shadows';
import { PipelineSceneData } from './pipeline-scene-data';
import { ShadowLayerVolume } from './shadow/csm-layers';
+1 -1
View File
@@ -19,7 +19,7 @@
THE SOFTWARE.
*/
import { DirectionalLight, Camera, Shadows, CSMLevel, CSMOptimizationMode } from '../../renderer/scene';
import { DirectionalLight, Camera, Shadows, CSMLevel, CSMOptimizationMode } from '../../../render-scene/scene';
import { Mat4, Vec3, Vec2, Vec4 } from '../../math';
import { Frustum, AABB } from '../../geometry';
import { IRenderObject } from '../define';
+4 -4
View File
@@ -35,10 +35,10 @@ import { RenderPass, LoadOp, StoreOp,
import { RenderFlowTag } from '../pipeline-serialization';
import { ForwardPipeline } from '../forward/forward-pipeline';
import { RenderPipeline } from '..';
import { PCFType, ShadowType } from '../../renderer/scene/shadows';
import { Light, LightType } from '../../renderer/scene/light';
import { Camera } from '../../renderer/scene';
import { SpotLight } from '../../renderer/scene/spot-light';
import { PCFType, ShadowType } from '../../../render-scene/scene/shadows';
import { Light, LightType } from '../../../render-scene/scene/light';
import { Camera } from '../../../render-scene/scene';
import { SpotLight } from '../../../render-scene/scene/spot-light';
const _validLights: Light[] = [];
+2 -2
View File
@@ -30,9 +30,9 @@ import { ForwardStagePriority } from '../enum';
import { RenderShadowMapBatchedQueue } from '../render-shadow-map-batched-queue';
import { ForwardPipeline } from '../forward/forward-pipeline';
import { SetIndex } from '../define';
import { Light, LightType } from '../../renderer/scene/light';
import { Light, LightType } from '../../../render-scene/scene/light';
import { ShadowFlow } from './shadow-flow';
import { Camera, CSMLevel, DirectionalLight } from '../../renderer/scene';
import { Camera, CSMLevel, DirectionalLight } from '../../../render-scene/scene';
const colors: Color[] = [new Color(1, 1, 1, 1)];
+1 -1
View File
@@ -26,7 +26,7 @@
import { RenderPass } from '../../gfx';
import { PipelineStateManager } from './pipeline-state-manager';
import { SetIndex } from './define';
import { Camera } from '../renderer/scene/camera';
import { Camera } from '../../render-scene/scene/camera';
import { RenderPipeline } from './render-pipeline';
import { getPhaseID } from './pass-phase';
+7 -7
View File
@@ -26,15 +26,15 @@
import { Pool } from './memop';
import { RenderPipeline, createDefaultPipeline, DeferredPipeline } from './pipeline';
import { DebugView } from './pipeline/debug-view';
import { Camera, Light, Model } from './renderer/scene';
import { Camera, Light, Model } from '../render-scene/scene';
import type { DataPoolManager } from '../3d/skeletal-animation/data-pool-manager';
import { LightType } from './renderer/scene/light';
import { IRenderSceneInfo, RenderScene } from './renderer/core/render-scene';
import { DirectionalLight } from './renderer/scene/directional-light';
import { SphereLight } from './renderer/scene/sphere-light';
import { SpotLight } from './renderer/scene/spot-light';
import { LightType } from '../render-scene/scene/light';
import { IRenderSceneInfo, RenderScene } from '../render-scene/core/render-scene';
import { DirectionalLight } from '../render-scene/scene/directional-light';
import { SphereLight } from '../render-scene/scene/sphere-light';
import { SpotLight } from '../render-scene/scene/spot-light';
import { legacyCC } from './global-exports';
import { RenderWindow, IRenderWindowInfo } from './renderer/core/render-window';
import { RenderWindow, IRenderWindowInfo } from '../render-scene/core/render-window';
import { ColorAttachment, DepthStencilAttachment, RenderPassInfo, StoreOp, Device, Swapchain, Feature, deviceManager } from '../gfx';
import { warnID } from './platform/debug';
import { Pipeline, PipelineRuntime } from './pipeline/custom/pipeline';
+1 -1
View File
@@ -36,7 +36,7 @@ import { CCFloat, CCInteger } from '../data';
import { TextureCube } from '../../asset/assets/texture-cube';
import { Enum } from '../value-types';
import { ccclass, displayOrder, rangeMin, rangeStep, slide } from '../data/decorators';
import { EnvironmentLightingType } from '../renderer/scene';
import { EnvironmentLightingType } from '../../render-scene/scene';
import { Material } from '../../asset/assets/material';
/**
+5 -5
View File
@@ -26,11 +26,11 @@ import { BAIDU } from 'internal:constants';
import { TextureCube } from '../../asset/assets/texture-cube';
import { CCFloat, CCInteger } from '../data/utils/attribute';
import { Color, Quat, Vec3, Vec2, Vec4 } from '../math';
import { Ambient } from '../renderer/scene/ambient';
import { Shadows, ShadowType, ShadowSize } from '../renderer/scene/shadows';
import { Skybox, EnvironmentLightingType } from '../renderer/scene/skybox';
import { Octree } from '../renderer/scene/octree';
import { Fog, FogType } from '../renderer/scene/fog';
import { Ambient } from '../../render-scene/scene/ambient';
import { Shadows, ShadowType, ShadowSize } from '../../render-scene/scene/shadows';
import { Skybox, EnvironmentLightingType } from '../../render-scene/scene/skybox';
import { Octree } from '../../render-scene/scene/octree';
import { Fog, FogType } from '../../render-scene/scene/fog';
import { Node } from './node';
import { legacyCC } from '../global-exports';
import { Root } from '../root';
+1 -1
View File
@@ -27,7 +27,7 @@ import { ccclass, serializable, editable } from 'cc.decorator';
import { EDITOR, TEST } from 'internal:constants';
import { CCObject } from '../data/object';
import { assert, getError } from '../platform/debug';
import { RenderScene } from '../renderer/core/render-scene';
import { RenderScene } from '../../render-scene/core/render-scene';
import { Node } from './node';
import { legacyCC } from '../global-exports';
import { Component } from '../components/component';
+1 -1
View File
@@ -38,7 +38,7 @@ import { DragonBonesAsset } from './DragonBonesAsset';
import { DragonBonesAtlasAsset } from './DragonBonesAtlasAsset';
import { Graphics } from '../2d/components';
import { CCArmatureDisplay } from './CCArmatureDisplay';
import { MaterialInstance } from '../core/renderer/core/material-instance';
import { MaterialInstance } from '../render-scene/core/material-instance';
import { legacyCC } from '../core/global-exports';
import { ArmatureSystem } from './ArmatureSystem';
import { Batcher2D } from '../2d/renderer/batcher-2d';
+1 -1
View File
@@ -27,7 +27,7 @@ import { Armature, BlendMode } from '@cocos/dragonbones-js';
import { Color, Mat4, Node, director } from '../../core';
import { BlendFactor } from '../../gfx';
import { vfmtPosUvColor } from '../../2d/renderer/vertex-format';
import { MaterialInstance } from '../../core/renderer/core/material-instance';
import { MaterialInstance } from '../../render-scene/core/material-instance';
import { IAssembler } from '../../2d/renderer/base';
import { Batcher2D } from '../../2d/renderer/batcher-2d';
import { ArmatureFrame } from '../ArmatureCache';
+1 -1
View File
@@ -31,7 +31,7 @@ import { Material, Texture2D } from '../asset/assets';
import { Component } from '../core/components/component';
import { Attribute, AttributeName, Format, PrimitiveMode } from '../gfx';
import { Color, toDegree, toRadian, Vec4 } from '../core/math';
import { scene } from '../core/renderer';
import { scene } from '../render-scene';
import { legacyCC } from '../core/global-exports';
@ccclass('cc.Billboard')
+1 -1
View File
@@ -32,7 +32,7 @@ import { builtinResMgr } from '../asset/asset-manager';
import CurveRange from './animator/curve-range';
import GradientRange from './animator/gradient-range';
import { legacyCC } from '../core/global-exports';
import { IMaterialInstanceInfo, MaterialInstance } from '../core/renderer/core/material-instance';
import { IMaterialInstanceInfo, MaterialInstance } from '../render-scene/core/material-instance';
const _matInsInfo: IMaterialInstanceInfo = {
parent: null!,
+1 -1
View File
@@ -28,7 +28,7 @@ import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh';
import { DRAW_INFO_SIZE, Buffer, IndirectBuffer, Attribute, BufferInfo, DrawInfo,
AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode } from '../../gfx';
import { Vec3 } from '../../core/math';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import CurveRange from '../animator/curve-range';
import GradientRange from '../animator/gradient-range';
import { Material } from '../../asset/assets';
@@ -29,7 +29,7 @@ import { Mesh } from '../../3d/assets/mesh';
import { AttributeName, BufferUsageBit, FormatInfos, MemoryUsageBit, PrimitiveMode,
Attribute, DRAW_INFO_SIZE, Buffer, IndirectBuffer, BufferInfo, DrawInfo, Feature, deviceManager } from '../../gfx';
import { Color } from '../../core/math/color';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import { Particle } from '../particle';
import { Material, RenderingSubMesh } from '../../asset/assets';
+2 -2
View File
@@ -31,7 +31,7 @@ import { ModelRenderer } from '../core/components/model-renderer';
import { Material } from '../asset/assets/material';
import { Mat4, pseudoRandom, Quat, randomRangeInt, Vec2, Vec3 } from '../core/math';
import { INT_MAX } from '../core/math/bits';
import { scene } from '../core/renderer';
import { scene } from '../render-scene';
import ColorOverLifetimeModule from './animator/color-overtime';
import CurveRange, { Mode } from './animator/curve-range';
import ForceOvertimeModule from './animator/force-overtime';
@@ -52,7 +52,7 @@ import { PARTICLE_MODULE_PROPERTY } from './particle';
import { legacyCC } from '../core/global-exports';
import { TransformBit } from '../core/scene-graph/node-enum';
import { AABB, intersect } from '../core/geometry';
import { Camera } from '../core/renderer/scene';
import { Camera } from '../render-scene/scene';
import { ParticleCuller } from './particle-culler';
import { NoiseModule } from './animator/noise-module';
import { CCBoolean, CCFloat } from '../core';
@@ -31,7 +31,7 @@ import { Material } from '../../asset/assets';
import { Particle, IParticleModule } from '../particle';
import { RenderMode } from '../enum';
import { legacyCC } from '../../core/global-exports';
import { Pass } from '../../core/renderer';
import { Pass } from '../../render-scene';
export interface IParticleSystemRenderer {
onInit (ps: Component): void;
@@ -29,14 +29,14 @@ import { Material } from '../../asset/assets';
import { AttributeName, Format, Attribute, FormatInfos } from '../../gfx';
import { Mat4, Vec2, Vec3, Vec4, pseudoRandom, Quat } from '../../core/math';
import { RecyclePool } from '../../core/memop';
import { MaterialInstance, IMaterialInstanceInfo } from '../../core/renderer/core/material-instance';
import { MacroRecord } from '../../core/renderer/core/pass-utils';
import { MaterialInstance, IMaterialInstanceInfo } from '../../render-scene/core/material-instance';
import { MacroRecord } from '../../render-scene/core/pass-utils';
import { AlignmentSpace, RenderMode, Space } from '../enum';
import { Particle, IParticleModule, PARTICLE_MODULE_ORDER, PARTICLE_MODULE_NAME } from '../particle';
import { ParticleSystemRendererBase } from './particle-system-renderer-base';
import { Component } from '../../core';
import { Camera } from '../../core/renderer/scene/camera';
import { Pass } from '../../core/renderer';
import { Camera } from '../../render-scene/scene/camera';
import { Pass } from '../../render-scene';
import { ParticleNoise } from '../noise';
import { NoiseModule } from '../animator/noise-module';
import { legacyCC } from '../../core/global-exports';
@@ -29,15 +29,15 @@ import { Material, Texture2D } from '../../asset/assets';
import { Component } from '../../core/components';
import { AttributeName, Format, Attribute, API, deviceManager, FormatInfos } from '../../gfx';
import { Mat4, Vec2, Vec4, Quat, Vec3 } from '../../core/math';
import { MaterialInstance, IMaterialInstanceInfo } from '../../core/renderer/core/material-instance';
import { MacroRecord } from '../../core/renderer/core/pass-utils';
import { MaterialInstance, IMaterialInstanceInfo } from '../../render-scene/core/material-instance';
import { MacroRecord } from '../../render-scene/core/pass-utils';
import { AlignmentSpace, RenderMode, Space } from '../enum';
import { Particle, IParticleModule } from '../particle';
import { packGradientRange } from '../animator/gradient-range';
import { Pass } from '../../core/renderer/core/pass';
import { Pass } from '../../render-scene/core/pass';
import { packCurveRangeXYZ, packCurveRangeZ, packCurveRangeXYZW, packCurveRangeN, packCurveRangeXY } from '../animator/curve-range';
import { ParticleSystemRendererBase } from './particle-system-renderer-base';
import { Camera } from '../../core/renderer/scene/camera';
import { Camera } from '../../render-scene/scene/camera';
import { legacyCC } from '../../core/global-exports';
const _tempWorldTrans = new Mat4();
+1 -1
View File
@@ -31,7 +31,7 @@ import { AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, Pri
Device, Attribute, Buffer, IndirectBuffer, BufferInfo, DrawInfo, DRAW_INFO_SIZE } from '../../gfx';
import { Color, Mat4, Quat, toRadian, Vec3 } from '../../core/math';
import { Pool } from '../../core/memop';
import { scene } from '../../core/renderer';
import { scene } from '../../render-scene';
import CurveRange from '../animator/curve-range';
import GradientRange from '../animator/gradient-range';
import { Space, TextureMode, TrailMode } from '../enum';
+1 -1
View File
@@ -34,7 +34,7 @@ import { Node } from '../core/scene-graph/node';
import { ICounterOption } from './counter';
import { PerfCounter } from './perf-counter';
import { legacyCC } from '../core/global-exports';
import { Pass } from '../core/renderer';
import { Pass } from '../render-scene';
import { preTransforms } from '../core/math/mat4';
import { Root } from '../core/root';
import { PipelineRuntime } from '../core/pipeline/custom/pipeline';
@@ -22,8 +22,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { Material } from '../../assets';
import { Renderer } from '../../components/renderer';
import { Material } from '../../asset/assets/material';
import { Renderer } from '../../core/components/renderer';
export const MaterialInstance = jsb.MaterialInstance;
export type MaterialInstance = jsb.MaterialInstance;
@@ -23,11 +23,11 @@
THE SOFTWARE.
*/
import { Material } from '../../../asset/assets/material';
import { Material } from '../../asset/assets/material';
import { PassInstance } from './pass-instance';
import { MacroRecord } from './pass-utils';
import { PassOverrides } from './pass';
import { Renderer } from '../../components/renderer';
import { Renderer } from '../../core/components/renderer';
export interface IMaterialInstanceInfo {
parent: Material;
@@ -23,7 +23,6 @@
THE SOFTWARE.
*/
import { PolygonShape } from '@cocos/box2d';
import { DEBUG } from 'internal:constants';
import { NativeBufferPool } from './native-pools';
@@ -23,7 +23,7 @@
THE SOFTWARE.
*/
import { EffectAsset } from '../../../asset/assets/effect-asset';
import { EffectAsset } from '../../asset/assets/effect-asset';
import { MaterialInstance } from './material-instance';
import { BatchingSchemes, Pass, PassOverrides } from './pass';
import { overrideMacros, MacroRecord } from './pass-utils';
@@ -23,8 +23,8 @@
THE SOFTWARE.
*/
import { Type } from '../../../gfx';
import { Color, Mat3, Mat4, Vec2, Vec3, Vec4, Quat, IVec2Like, IVec3Like, IVec4Like, IMat3Like, IMat4Like } from '../../math';
import { Type } from '../../gfx';
import { Color, Mat3, Mat4, Vec2, Vec3, Vec4, Quat, IVec2Like, IVec3Like, IVec4Like, IMat3Like, IMat4Like } from '../../core/math';
const typeMask = 0xfc000000; // 6 bits => 64 types
const bindingMask = 0x03f00000; // 6 bits => 64 bindings
@@ -23,7 +23,7 @@
THE SOFTWARE.
*/
import { MacroRecord } from "./pass-utils";
import { EffectAsset } from '../../assets/effect-asset';
import { EffectAsset } from '../../asset/assets/effect-asset';
export interface IPassInfoFull extends EffectAsset.IPassStates {
// generated part
@@ -24,24 +24,24 @@
*/
import { EDITOR } from 'internal:constants';
import { Root } from '../../root';
import { TextureBase } from '../../../asset/assets/texture-base';
import { builtinResMgr } from '../../../asset/asset-manager/builtin-res-mgr';
import { getPhaseID } from '../../pipeline/pass-phase';
import { murmurhash2_32_gc } from '../../algorithm/murmurhash2_gc';
import { Root } from '../../core/root';
import { TextureBase } from '../../asset/assets/texture-base';
import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr';
import { getPhaseID } from '../../core/pipeline/pass-phase';
import { murmurhash2_32_gc } from '../../core/algorithm/murmurhash2_gc';
import { BufferUsageBit, DynamicStateFlagBit, DynamicStateFlags, Feature, GetTypeSize, MemoryUsageBit, PrimitiveMode, Type, Color,
BlendState, BlendTarget, Buffer, BufferInfo, BufferViewInfo, DepthStencilState, DescriptorSet,
DescriptorSetInfo, DescriptorSetLayout, Device, RasterizerState, Sampler, Texture, Shader, PipelineLayout, deviceManager,
} from '../../../gfx';
import { EffectAsset } from '../../../asset/assets/effect-asset';
} from '../../gfx';
import { EffectAsset } from '../../asset/assets/effect-asset';
import { IProgramInfo, programLib } from './program-lib';
import { MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType,
getOffsetFromHandle, getTypeFromHandle, type2reader, type2writer, getCountFromHandle,
} from './pass-utils';
import { RenderPassStage, RenderPriority } from '../../pipeline/define';
import { errorID } from '../../platform/debug';
import { InstancedBuffer } from '../../pipeline/instanced-buffer';
import { BatchedBuffer } from '../../pipeline/batched-buffer';
import { RenderPassStage, RenderPriority } from '../../core/pipeline/define';
import { errorID } from '../../core/platform/debug';
import { InstancedBuffer } from '../../core/pipeline/instanced-buffer';
import { BatchedBuffer } from '../../core/pipeline/batched-buffer';
export interface IPassInfoFull extends EffectAsset.IPassInfo {
// generated part
@@ -1,5 +1,5 @@
import { API, } from '../../../gfx';
import { legacyCC } from '../../global-exports';
import { API, } from '../../gfx';
import { legacyCC } from '../../core/global-exports';
export interface ITemplateInfo {
gfxAttributes: Attribute[];
@@ -23,17 +23,17 @@
THE SOFTWARE.
*/
import { EffectAsset } from '../../../asset/assets/effect-asset';
import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../pipeline/define';
import { PipelineRuntime } from '../../pipeline/custom/pipeline';
import { EffectAsset } from '../../asset/assets/effect-asset';
import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../core/pipeline/define';
import { PipelineRuntime } from '../../core/pipeline/custom/pipeline';
import { genHandle, MacroRecord } from './pass-utils';
import { legacyCC } from '../../global-exports';
import { legacyCC } from '../../core/global-exports';
import { PipelineLayoutInfo, Device, Attribute, UniformBlock, ShaderInfo,
Uniform, ShaderStage, DESCRIPTOR_SAMPLER_TYPE, DESCRIPTOR_BUFFER_TYPE,
DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo,
DescriptorType, GetTypeSize, ShaderStageFlagBit, API, UniformSamplerTexture, PipelineLayout,
Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment } from '../../../gfx';
import { debug } from '../../platform/debug';
Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment } from '../../gfx';
import { debug } from '../../core/platform/debug';
const _dsLayoutInfo = new DescriptorSetLayoutInfo();
@@ -23,8 +23,7 @@
THE SOFTWARE.
*/
import { DrawBatch2D } from '../../../2d/renderer/draw-batch';
import { Node } from '../../scene-graph';
import { Node } from '../../core/scene-graph';
export interface IRenderSceneInfo {
name: string;
@@ -22,15 +22,15 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { Root } from '../../root';
import { Node } from '../../scene-graph';
import { Root } from '../../core/root';
import { Node } from '../../core/scene-graph';
import { Camera } from '../scene/camera';
import { DirectionalLight } from '../scene/directional-light';
import { Model } from '../scene/model';
import { SphereLight } from '../scene/sphere-light';
import { SpotLight } from '../scene/spot-light';
import { TransformBit } from '../../scene-graph/node-enum';
import { DrawBatch2D } from '../../../2d/renderer/draw-batch';
import { TransformBit } from '../../core/scene-graph/node-enum';
import { DrawBatch2D } from '../../2d/renderer/draw-batch';
export interface IRenderSceneInfo {
name: string;
@@ -23,12 +23,12 @@
THE SOFTWARE.
*/
import { screenAdapter } from 'pal/screen-adapter';
import { Orientation } from '../../../../pal/screen-adapter/enum-type';
import { Orientation } from '../../../pal/screen-adapter/enum-type';
import {
TextureType, TextureUsageBit, Format, RenderPass, Texture, Framebuffer,
RenderPassInfo, Device, TextureInfo, FramebufferInfo, Swapchain, SurfaceTransform,
} from '../../../gfx';
import { Root } from '../../root';
} from '../../gfx';
import { Root } from '../../core/root';
import { Camera } from '../scene';
export interface IRenderWindowInfo {
@@ -22,7 +22,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { legacyCC } from "../../global-exports";
import { legacyCC } from "../../core/global-exports";
const SamplerLib = nr.SamplerLib;
@@ -24,8 +24,8 @@
*/
import { getTypedArrayConstructor, Format, FormatInfos, TextureType, TextureUsageBit,
Texture, TextureInfo, Device, BufferTextureCopy } from '../../../gfx';
import { debug } from '../../platform/debug';
Texture, TextureInfo, Device, BufferTextureCopy } from '../../gfx';
import { debug } from '../../core/platform/debug';
export function nearestPOT (num: number): number {
--num;
@@ -23,10 +23,10 @@
THE SOFTWARE.
*/
import { replaceProperty, removeProperty } from '../utils/x-deprecated';
import { replaceProperty, removeProperty } from '../core/utils/x-deprecated';
import { RenderScene } from './core/render-scene';
import { Layers } from '../scene-graph/layers';
import { legacyCC } from '../global-exports';
import { Layers } from '../core/scene-graph/layers';
import { legacyCC } from '../core/global-exports';
import { Pass } from './core/pass';
import { Camera } from './scene/camera';
import { Shadows } from './scene/shadows';

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