mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-19 14:52:40 +08:00
move cocos/core/gfx to cocos/gfx (#12559)
* move cocos/core/gfx to cocos/gfx
This commit is contained in:
+2
-2
@@ -158,8 +158,8 @@
|
||||
"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/2d/renderer/native-2d.ts": "cocos/2d/renderer/native-2d.jsb.ts",
|
||||
"cocos/core/gfx/base/pipeline-state.ts": "cocos/core/gfx/base/pipeline-state.jsb.ts",
|
||||
"cocos/core/gfx/index.ts": "cocos/core/gfx/index.jsb.ts",
|
||||
"cocos/gfx/base/pipeline-state.ts": "cocos/gfx/base/pipeline-state.jsb.ts",
|
||||
"cocos/gfx/index.ts": "cocos/gfx/index.jsb.ts",
|
||||
"cocos/spine/index.ts": "cocos/spine/index.jsb.ts",
|
||||
"cocos/dragon-bones/index.ts": "cocos/dragon-bones/index.jsb.ts",
|
||||
"cocos/physics/physx/instantiate.ts": "cocos/physics/physx/instantiate.jsb.ts",
|
||||
|
||||
@@ -27,7 +27,7 @@ import { FontAtlas } from '../../assets/bitmap-font';
|
||||
import { Color } from '../../../core/math';
|
||||
import { ImageAsset, Texture2D } from '../../../core/assets';
|
||||
import { PixelFormat } from '../../../core/assets/asset-enum';
|
||||
import { BufferTextureCopy } from '../../../core/gfx';
|
||||
import { BufferTextureCopy } from '../../../gfx';
|
||||
import { safeMeasureText, BASELINE_RATIO, MIDDLE_RATIO, getBaselineOffset } from '../../utils/text-utils';
|
||||
import { director, Director } from '../../../core/director';
|
||||
import { macro, warnID } from '../../../core';
|
||||
|
||||
@@ -33,9 +33,8 @@ import { ISharedLabelData, LetterRenderTexture } from './font-utils';
|
||||
import { logID } from '../../../core/platform/debug';
|
||||
import { UITransform } from '../../framework/ui-transform';
|
||||
import { legacyCC } from '../../../core/global-exports';
|
||||
import { assetManager } from '../../../core/asset-manager';
|
||||
import { dynamicAtlasManager } from '../../utils/dynamic-atlas/atlas-manager';
|
||||
import { BlendFactor } from '../../../core/gfx';
|
||||
import { BlendFactor } from '../../../gfx';
|
||||
import { WrapMode } from '../../../core/assets/asset-enum';
|
||||
|
||||
const Overflow = Label.Overflow;
|
||||
|
||||
@@ -27,7 +27,7 @@ import { Color, Mat4 } from '../../core/math';
|
||||
import { RenderData } from '../renderer/render-data';
|
||||
import { IBatcher } from '../renderer/i-batcher';
|
||||
import { Node } from '../../core/scene-graph/node';
|
||||
import { FormatInfos } from '../../core/gfx';
|
||||
import { FormatInfos } from '../../gfx';
|
||||
import { clamp } from '../../core';
|
||||
|
||||
const m = new Mat4();
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { EDITOR, TEST, BUILD } from 'internal:constants';
|
||||
import { Color, Mat4, Rect, Size, Vec2, Vec3, Vec4 } from '../../core/math';
|
||||
import { Mat4, Rect, Size, Vec2, Vec3, Vec4 } from '../../core/math';
|
||||
import { Asset } from '../../core/assets/asset';
|
||||
import { TextureBase } from '../../core/assets/texture-base';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
@@ -38,7 +38,7 @@ import { dynamicAtlasManager } from '../utils/dynamic-atlas/atlas-manager';
|
||||
import { js } from '../../core/utils/js';
|
||||
import { Mesh } from '../../3d/assets/mesh';
|
||||
import { createMesh } from '../../3d/misc';
|
||||
import { Attribute, AttributeName, Format, PrimitiveMode } from '../../core/gfx';
|
||||
import { Attribute, AttributeName, Format, PrimitiveMode } from '../../gfx';
|
||||
|
||||
const INSET_LEFT = 0;
|
||||
const INSET_TOP = 1;
|
||||
|
||||
@@ -36,7 +36,7 @@ import { IBatcher } from '../renderer/i-batcher';
|
||||
import { LineCap, LineJoin } from '../assembler/graphics/types';
|
||||
import { Impl } from '../assembler/graphics/webgl/impl';
|
||||
import { RenderingSubMesh } from '../../core/assets';
|
||||
import { Format, PrimitiveMode, Attribute, Device, BufferUsageBit, BufferInfo, MemoryUsageBit, deviceManager } from '../../core/gfx';
|
||||
import { Format, PrimitiveMode, Attribute, Device, BufferUsageBit, BufferInfo, MemoryUsageBit, deviceManager } from '../../gfx';
|
||||
import { vfmtPosColor, getAttributeStride, getComponentPerVertex } from '../renderer/vertex-format';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
import { warnID } from '../../core/platform/debug';
|
||||
|
||||
@@ -37,7 +37,7 @@ import { InstanceMaterialType, UIRenderer } from '../framework/ui-renderer';
|
||||
import { TextureBase } from '../../core/assets/texture-base';
|
||||
import { PixelFormat } from '../../core/assets/asset-enum';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
import { BlendFactor } from '../../core/gfx';
|
||||
import { BlendFactor } from '../../gfx';
|
||||
import { Color } from '../../core';
|
||||
|
||||
const tempColor = Color.WHITE.clone();
|
||||
|
||||
@@ -28,14 +28,13 @@ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, visib
|
||||
import { JSB } from 'internal:constants';
|
||||
import { InstanceMaterialType, UIRenderer } from '../framework/ui-renderer';
|
||||
import { clamp, Color, Mat4, Vec2, Vec3 } from '../../core/math';
|
||||
import { warnID } from '../../core/platform';
|
||||
import { IBatcher } from '../renderer/i-batcher';
|
||||
import { ccenum } from '../../core/value-types/enum';
|
||||
import { Graphics } from './graphics';
|
||||
import { TransformBit } from '../../core/scene-graph/node-enum';
|
||||
import { SpriteFrame } from '../assets/sprite-frame';
|
||||
import { Game, Material, builtinResMgr, director, CCObject, Node, NodeEventType } from '../../core';
|
||||
import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, PrimitiveMode, deviceManager } from '../../core/gfx';
|
||||
import { Material, builtinResMgr, director, CCObject, Node, NodeEventType } from '../../core';
|
||||
import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, PrimitiveMode, deviceManager } from '../../gfx';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
import { MaterialInstance, scene } from '../../core/renderer';
|
||||
import { Model } from '../../core/renderer/scene';
|
||||
|
||||
@@ -32,7 +32,7 @@ import { Color } from '../../core/math';
|
||||
import { ccenum } from '../../core/value-types/enum';
|
||||
import { builtinResMgr } from '../../core/builtin';
|
||||
import { Material } from '../../core/assets';
|
||||
import { BlendFactor, BlendState, BlendTarget } from '../../core/gfx';
|
||||
import { BlendFactor } from '../../gfx';
|
||||
import { IAssembler, IAssemblerManager } from '../renderer/base';
|
||||
import { RenderData } from '../renderer/render-data';
|
||||
import { IBatcher } from '../renderer/i-batcher';
|
||||
|
||||
@@ -29,7 +29,7 @@ import type { UIStaticBatch } from '../components/ui-static-batch';
|
||||
import { Material } from '../../core/assets/material';
|
||||
import { RenderRoot2D, UIRenderer } from '../framework';
|
||||
import { Texture, Device, Attribute, Sampler, DescriptorSetInfo, Buffer,
|
||||
BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet, InputAssembler, deviceManager } from '../../core/gfx';
|
||||
BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet, InputAssembler, deviceManager } from '../../gfx';
|
||||
import { Pool } from '../../core/memop';
|
||||
import { CachedArray } from '../../core/memop/cached-array';
|
||||
import { Root } from '../../core/root';
|
||||
@@ -40,19 +40,16 @@ import { legacyCC } from '../../core/global-exports';
|
||||
import { ModelLocalBindings, UBOLocal } from '../../core/pipeline/define';
|
||||
import { SpriteFrame } from '../assets';
|
||||
import { TextureBase } from '../../core/assets/texture-base';
|
||||
import { Mat4, Vec3 } from '../../core/math';
|
||||
import { Mat4 } from '../../core/math';
|
||||
import { IBatcher } from './i-batcher';
|
||||
import { StaticVBAccessor, StaticVBChunk } from './static-vb-accessor';
|
||||
import { StaticVBAccessor } from './static-vb-accessor';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { getAttributeStride, vfmtPosUvColor } from './vertex-format';
|
||||
import { updateOpacity } from '../assembler/utils';
|
||||
import { BaseRenderData, MeshRenderData, RenderData } from './render-data';
|
||||
import { BaseRenderData, MeshRenderData } from './render-data';
|
||||
import { UIMeshRenderer } from '../components/ui-mesh-renderer';
|
||||
import { RenderDrawInfo } from './render-draw-info';
|
||||
import { NativeBatcher2d, NativeRenderDrawInfo, NativeUIMeshBuffer } from './native-2d';
|
||||
import { mapBuffer, readBuffer } from '../../3d/misc';
|
||||
import { NativeBatcher2d, NativeUIMeshBuffer } from './native-2d';
|
||||
import { MeshBuffer } from './mesh-buffer';
|
||||
import { propertyDefine } from '../../core/utils/misc';
|
||||
|
||||
const _dsInfo = new DescriptorSetInfo(null!);
|
||||
const m4_1 = new Mat4();
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Attribute, Device } from '../../core/gfx';
|
||||
import { Attribute, Device } from '../../gfx';
|
||||
import type { MeshBuffer } from './mesh-buffer';
|
||||
import { getComponentPerVertex } from './vertex-format';
|
||||
|
||||
|
||||
@@ -23,13 +23,9 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { JSB } from 'internal:constants';
|
||||
import { MeshBuffer } from './mesh-buffer';
|
||||
import { Material } from '../../core/assets/material';
|
||||
import { Texture, Sampler, InputAssembler, DescriptorSet, Shader } from '../../core/gfx';
|
||||
import { Texture, Sampler, InputAssembler, DescriptorSet, Shader } from '../../gfx';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { Camera } from '../../core/renderer/scene/camera';
|
||||
import { RenderScene } from '../../core/renderer/core/render-scene';
|
||||
import { Model } from '../../core/renderer/scene/model';
|
||||
import { Layers } from '../../core/scene-graph/layers';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { CachedArray, Material, Node } from '../../core';
|
||||
import { TextureBase } from '../../core/assets/texture-base';
|
||||
import { Device } from '../../core/gfx';
|
||||
import { Attribute } from '../../core/gfx/base/define';
|
||||
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 { SpriteFrame } from '../assets/sprite-frame';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { JSB } from 'internal:constants';
|
||||
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo } from '../../core/gfx';
|
||||
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo } from '../../gfx';
|
||||
import { getComponentPerVertex } from './vertex-format';
|
||||
import { getError, warnID } from '../../core/platform/debug';
|
||||
import { sys } from '../../core';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Material } from '../../core/assets';
|
||||
import { Attribute, Device, Sampler, Texture } from '../../core/gfx';
|
||||
import { Attribute, Device, Sampler, Texture } from '../../gfx';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { Model } from '../../core/renderer/scene';
|
||||
|
||||
|
||||
@@ -33,11 +33,10 @@ import { murmurhash2_32_gc } from '../../core/utils/murmurhash2_gc';
|
||||
import { SpriteFrame } from '../assets/sprite-frame';
|
||||
import { UIRenderer } from '../framework/ui-renderer';
|
||||
import { StaticVBAccessor, StaticVBChunk } from './static-vb-accessor';
|
||||
import { getAttributeStride, vfmtPosUvColor, vfmtPosUvTwoColor } from './vertex-format';
|
||||
import { Buffer, BufferInfo, BufferUsageBit, Device, Attribute, InputAssembler, InputAssemblerInfo, MemoryUsageBit } from '../../core/gfx';
|
||||
import { getAttributeStride, vfmtPosUvColor } from './vertex-format';
|
||||
import { Buffer, BufferInfo, BufferUsageBit, Device, Attribute, InputAssembler, InputAssemblerInfo, MemoryUsageBit } from '../../gfx';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { RenderDrawInfo, RenderDrawInfoType } from './render-draw-info';
|
||||
import { StencilManager } from './stencil-manager';
|
||||
import { Batcher2D } from './batcher-2d';
|
||||
import { RenderEntity, RenderEntityType } from './render-entity';
|
||||
import { assert } from '../../core';
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { JSB } from 'internal:constants';
|
||||
import { BaseRenderData, IRenderData } from './render-data';
|
||||
import { Stage } from './stencil-manager';
|
||||
import { IRenderData } from './render-data';
|
||||
import { NativeRenderDrawInfo } from './native-2d';
|
||||
import { director, Material, Node } from '../../core';
|
||||
import { Sampler, Texture } from '../../core/gfx';
|
||||
import { Material, Node } from '../../core';
|
||||
import { Sampler, Texture } from '../../gfx';
|
||||
import { Model } from '../../core/renderer/scene';
|
||||
|
||||
export enum AttrUInt8ArrayView {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { JSB } from 'internal:constants';
|
||||
import { Device, Attribute } from '../../core/gfx';
|
||||
import { Device, Attribute } from '../../gfx';
|
||||
import { MeshBuffer } from './mesh-buffer';
|
||||
import { BufferAccessor } from './buffer-accessor';
|
||||
import { assertID, errorID } from '../../core/platform/debug';
|
||||
|
||||
@@ -23,11 +23,9 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { JSB } from 'internal:constants';
|
||||
import { ComparisonFunc, StencilOp, DepthStencilState } from '../../core/gfx';
|
||||
import { ComparisonFunc, StencilOp, DepthStencilState } from '../../gfx';
|
||||
import { Mask } from '../components/mask';
|
||||
import { Material } from '../../core';
|
||||
import { NativeStencilManager } from './native-2d';
|
||||
|
||||
// Stage types
|
||||
export enum Stage {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { AttributeName, Format, FormatInfos, Attribute } from '../../core/gfx';
|
||||
import { AttributeName, Format, FormatInfos, Attribute } from '../../gfx';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { PixelFormat } from '../../../core/assets/asset-enum';
|
||||
import { ImageAsset } from '../../../core/assets/image-asset';
|
||||
import { Texture2D } from '../../../core/assets/texture-2d';
|
||||
import { BufferTextureCopy } from '../../../core/gfx';
|
||||
import { BufferTextureCopy } from '../../../gfx';
|
||||
import { legacyCC } from '../../../core/global-exports';
|
||||
import { SpriteFrame } from '../../assets/sprite-frame';
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ import { RenderingSubMesh } from '../../core/assets';
|
||||
import {
|
||||
Attribute, Device, Buffer, BufferInfo, AttributeName, BufferUsageBit, Feature, Format,
|
||||
FormatInfos, FormatType, MemoryUsageBit, PrimitiveMode, getTypedArrayConstructor, DrawInfo, FormatInfo, deviceManager,
|
||||
} from '../../core/gfx';
|
||||
} from '../../gfx';
|
||||
import { Mat4, Quat, Vec3 } from '../../core/math';
|
||||
import { Morph } from './morph';
|
||||
import { MorphRendering, createMorphRendering } from './morph-rendering';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
import {
|
||||
AttributeName, Buffer, BufferUsageBit, Device, MemoryUsageBit, DescriptorSet, BufferInfo, FormatFeatureBit, Format,
|
||||
} from '../../core/gfx';
|
||||
} from '../../gfx';
|
||||
import { Mesh } from './mesh';
|
||||
import { Texture2D } from '../../core/assets/texture-2d';
|
||||
import { ImageAsset } from '../../core/assets/image-asset';
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { AttributeName } from '../../core/gfx';
|
||||
import { AttributeName } from '../../gfx';
|
||||
import { Mesh } from './mesh';
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Format, FormatInfos, FormatType, FormatInfo } from '../../core/gfx';
|
||||
import { Format, FormatInfos, FormatType, FormatInfo } from '../../gfx';
|
||||
import { sys } from '../../core/platform/sys';
|
||||
|
||||
const _typeMap: Record<string, string> = {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { AttributeName, Format, FormatInfos, PrimitiveMode, Attribute } from '../../core/gfx';
|
||||
import { AttributeName, Format, FormatInfos, PrimitiveMode, Attribute } from '../../gfx';
|
||||
import { Vec3 } from '../../core/math';
|
||||
import { IGeometry, IDynamicGeometry, ICreateMeshOptions, ICreateDynamicMeshOptions } from '../../primitive/define';
|
||||
import { writeBuffer } from './buffer';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Address, Filter, SamplerInfo } from '../../core/gfx';
|
||||
import { Address, Filter, SamplerInfo } from '../../gfx';
|
||||
|
||||
export const jointTextureSamplerInfo = new SamplerInfo(
|
||||
Filter.POINT,
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { AttributeName, Format, FormatInfos } from '../../core/gfx';
|
||||
import { AttributeName, Format, FormatInfos } from '../../gfx';
|
||||
import { IGeometry } from '../../primitive/define';
|
||||
import { readBuffer } from './buffer';
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { AABB } from '../../core/geometry';
|
||||
import { BufferUsageBit, MemoryUsageBit, Attribute, DescriptorSet, Buffer, BufferInfo } from '../../core/gfx';
|
||||
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';
|
||||
|
||||
@@ -27,7 +27,7 @@ import { Model } from '../../core/renderer/scene/model';
|
||||
import { MorphRenderingInstance } from '../assets/morph-rendering';
|
||||
import { Material } from '../../core/assets/material';
|
||||
import { RenderingSubMesh } from '../../core/assets/rendering-sub-mesh';
|
||||
import { DescriptorSet } from '../../core/gfx';
|
||||
import { DescriptorSet } from '../../gfx';
|
||||
import { IMacroPatch } from '../../core/renderer';
|
||||
|
||||
/**
|
||||
|
||||
@@ -28,7 +28,7 @@ import { RenderingSubMesh } from '../../core/assets/rendering-sub-mesh';
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { AABB } from '../../core/geometry';
|
||||
import { BufferUsageBit, MemoryUsageBit, DescriptorSet, Buffer, BufferInfo, Attribute, FormatFeatureBit, Format, Texture } from '../../core/gfx';
|
||||
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 { Node } from '../../core/scene-graph/node';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import type { Skeleton } from '../assets';
|
||||
import { Device } from '../../core/gfx';
|
||||
import { Device } from '../../gfx';
|
||||
import { JointAnimationInfo, JointTexturePool } from './skeletal-animation-utils';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
|
||||
|
||||
@@ -30,8 +30,8 @@ import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { AABB } from '../../core/geometry';
|
||||
import { Address, BufferUsageBit, Filter, Format, FormatInfos,
|
||||
MemoryUsageBit, Feature, Device, Buffer, BufferInfo, Sampler, SamplerInfo, FormatFeatureBit } from '../../core/gfx';
|
||||
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 { Node } from '../../core/scene-graph';
|
||||
|
||||
@@ -33,7 +33,7 @@ import { Mesh } from '../assets/mesh';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { Texture2D } from '../../core/assets/texture-2d';
|
||||
import { CCString } from '../../core/data/utils/attribute';
|
||||
import { AttributeName, FormatInfos, Format, Type, Attribute, BufferTextureCopy } from '../../core/gfx';
|
||||
import { AttributeName, FormatInfos, Format, Type, Attribute, BufferTextureCopy } from '../../gfx';
|
||||
import { Mat4, Vec2, Vec3 } from '../../core/math';
|
||||
import { mapBuffer, readBuffer, writeBuffer } from '../misc/buffer';
|
||||
import { SkinnedMeshRenderer } from './skinned-mesh-renderer';
|
||||
|
||||
@@ -28,12 +28,11 @@ import { builtinResMgr } from '../../builtin/builtin-res-mgr';
|
||||
import { Material } from '../../assets/material';
|
||||
import { SpriteFrame } from '../../../2d/assets/sprite-frame';
|
||||
import { TextureBase } from '../../assets/texture-base';
|
||||
import { deviceManager, Type } from '../../gfx';
|
||||
import { deviceManager, Type } from '../../../gfx';
|
||||
import { Pass } from '../../renderer/core/pass';
|
||||
import { getDefaultFromType } from '../../renderer/core/pass-utils';
|
||||
import { IValueProxy, IValueProxyFactory } from '../value-proxy';
|
||||
import { warn } from '../../platform/debug';
|
||||
import { legacyCC } from '../../global-exports';
|
||||
|
||||
/**
|
||||
* @en
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Address, Filter as GFXFilter, Format } from '../gfx';
|
||||
import { Address, Filter as GFXFilter, Format } from '../../gfx';
|
||||
|
||||
// define a specified number for the pixel format which gfx do not have a standard definition.
|
||||
const CUSTOM_PIXEL_FORMAT = 1024;
|
||||
|
||||
@@ -27,7 +27,7 @@ import { ccclass, serializable, editable, editorOnly } from 'cc.decorator';
|
||||
import { EDITOR } from 'internal:constants';
|
||||
import { Root } from '../root';
|
||||
import { BlendState, DepthStencilState, RasterizerState,
|
||||
DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format, deviceManager } from '../gfx';
|
||||
DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format, deviceManager } from '../../gfx';
|
||||
import { RenderPassStage } from '../pipeline/define';
|
||||
import { MacroRecord } from '../renderer/core/pass-utils';
|
||||
import { programLib } from '../renderer/core/program-lib';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
import { ccclass, override } from 'cc.decorator';
|
||||
import { ALIPAY, XIAOMI, JSB, TEST, BAIDU } from 'internal:constants';
|
||||
import { Format, FormatFeatureBit, deviceManager } from '../gfx';
|
||||
import { Format, FormatFeatureBit, deviceManager } from '../../gfx';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { PixelFormat } from './asset-enum';
|
||||
import { sys } from '../platform/sys';
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// @ts-check
|
||||
import { ccclass, override } from 'cc.decorator';
|
||||
import { EDITOR, ALIPAY, XIAOMI, JSB, TEST, BAIDU } from 'internal:constants';
|
||||
import { Device, Format, FormatFeatureBit, deviceManager } from '../gfx';
|
||||
import { Device, Format, FormatFeatureBit, deviceManager } from '../../gfx';
|
||||
import { Asset } from './asset';
|
||||
import { PixelFormat } from './asset-enum';
|
||||
import { legacyCC } from '../global-exports';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { EffectAsset } from './effect-asset';
|
||||
import { Texture } from '../gfx';
|
||||
import { Texture } from '../../gfx';
|
||||
import { TextureBase } from './texture-base';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { PassOverrides, MacroRecord, MaterialProperty } from '../renderer';
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
import { ccclass, serializable, type } from 'cc.decorator';
|
||||
import { Asset } from './asset';
|
||||
import { EffectAsset } from './effect-asset';
|
||||
import { Texture, Type } from '../gfx';
|
||||
import { Texture, Type } from '../../gfx';
|
||||
import { TextureBase } from './texture-base';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { IPassInfoFull, Pass, PassOverrides } from '../renderer/core/pass';
|
||||
|
||||
@@ -26,12 +26,12 @@
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { EDITOR, TEST } from 'internal:constants';
|
||||
import { clamp } from '../math/utils';
|
||||
import { Texture, ColorAttachment, DepthStencilAttachment, GeneralBarrierInfo, AccessFlagBit, RenderPassInfo, Format, deviceManager } from '../gfx';
|
||||
import { Texture, ColorAttachment, DepthStencilAttachment, GeneralBarrierInfo, AccessFlagBit, RenderPassInfo, Format, deviceManager } from '../../gfx';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { RenderWindow, IRenderWindowInfo } from '../renderer/core/render-window';
|
||||
import { Root } from '../root';
|
||||
import { TextureBase } from './texture-base';
|
||||
import { BufferTextureCopy } from '../gfx/base/define';
|
||||
import { BufferTextureCopy } from '../../gfx/base/define';
|
||||
import { errorID } from '../platform/debug';
|
||||
|
||||
export interface IRenderTextureCreateInfo {
|
||||
|
||||
@@ -27,8 +27,8 @@ import { legacyCC } from '../global-exports';
|
||||
import { mapBuffer } from '../../3d/misc/buffer';
|
||||
import {
|
||||
Attribute, Device, InputAssemblerInfo, Buffer, BufferInfo, AttributeName, BufferUsageBit,
|
||||
Format, FormatInfos, MemoryUsageBit, PrimitiveMode, getTypedArrayConstructor, DrawInfo,
|
||||
} from '../gfx';
|
||||
Format, FormatInfos, MemoryUsageBit, PrimitiveMode, DrawInfo,
|
||||
} from '../../gfx';
|
||||
import { Vec3 } from '../math';
|
||||
import { Mesh } from '../../3d/assets/mesh';
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { DEV } from 'internal:constants';
|
||||
import { TextureFlagBit, TextureUsageBit, API, Texture, TextureInfo, TextureViewInfo, Device, BufferTextureCopy } from '../gfx';
|
||||
import { TextureFlagBit, TextureUsageBit, API, Texture, TextureInfo, TextureViewInfo, Device, BufferTextureCopy } from '../../gfx';
|
||||
import { assertID, error } from '../platform/debug';
|
||||
import { Filter } from './asset-enum';
|
||||
import { ImageAsset } from './image-asset';
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
import { EDITOR, TEST } from 'internal:constants';
|
||||
import { ccclass, type } from 'cc.decorator';
|
||||
import { TextureType, TextureInfo, TextureViewInfo } from '../gfx';
|
||||
import { TextureType, TextureInfo, TextureViewInfo } from '../../gfx';
|
||||
import { PixelFormat } from './asset-enum';
|
||||
import { ImageAsset } from './image-asset';
|
||||
import { PresumedGFXTextureInfo, PresumedGFXTextureViewInfo, SimpleTexture } from './simple-texture';
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { deviceManager } from '../gfx';
|
||||
import { deviceManager } from '../../gfx';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { Filter, PixelFormat, WrapMode } from './asset-enum';
|
||||
import './asset';
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
*/
|
||||
|
||||
// @ts-check
|
||||
import { EDITOR, JSB, TEST } from 'internal:constants';
|
||||
import { EDITOR, TEST } from 'internal:constants';
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import IDGenerator from '../utils/id-generator';
|
||||
import { Asset } from './asset';
|
||||
import { Filter, PixelFormat, WrapMode } from './asset-enum';
|
||||
import { Sampler, Texture, Device, Format, SamplerInfo, Address, Filter as GFXFilter, deviceManager } from '../gfx';
|
||||
import { Sampler, Texture, Device, Format, SamplerInfo, Address, Filter as GFXFilter, deviceManager } from '../../gfx';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { errorID } from '../platform/debug';
|
||||
import { murmurhash2_32_gc } from '../utils/murmurhash2_gc';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
import { EDITOR, TEST } from 'internal:constants';
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { TextureType, TextureInfo, TextureViewInfo } from '../gfx';
|
||||
import { TextureType, TextureInfo, TextureViewInfo } from '../../gfx';
|
||||
import { ImageAsset } from './image-asset';
|
||||
import { PresumedGFXTextureInfo, PresumedGFXTextureViewInfo, SimpleTexture } from './simple-texture';
|
||||
import { ITexture2DCreateInfo, Texture2D } from './texture-2d';
|
||||
|
||||
@@ -37,11 +37,11 @@ import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO
|
||||
import { Root } from '../root';
|
||||
import { Node } from '../scene-graph/node';
|
||||
import { Layers } from '../scene-graph/layers';
|
||||
import { ccenum, Enum } from '../value-types';
|
||||
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 { ClearFlagBit } from '../gfx';
|
||||
import { ClearFlagBit } from '../../gfx';
|
||||
|
||||
const _temp_vec3_1 = new Vec3();
|
||||
|
||||
@@ -522,7 +522,7 @@ export class Camera extends Component {
|
||||
}
|
||||
|
||||
public onLoad () {
|
||||
this._createCamera();
|
||||
this._createCamera();
|
||||
}
|
||||
|
||||
public onEnable () {
|
||||
|
||||
@@ -40,10 +40,10 @@ import NodeActivator from './scene-graph/node-activator';
|
||||
import { Scheduler } from './scheduler';
|
||||
import { js } from './utils/js';
|
||||
import { legacyCC } from './global-exports';
|
||||
import { errorID, error, assertID, warnID, debug } from './platform/debug';
|
||||
import { errorID, error, assertID, warnID } from './platform/debug';
|
||||
import { containerManager } from './memop/container-manager';
|
||||
import { uiRendererManager } from '../2d/framework/ui-renderer-manager';
|
||||
import { deviceManager } from './gfx';
|
||||
import { deviceManager } from '../gfx';
|
||||
|
||||
// ----------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { BUILD, DEBUG, EDITOR, HTML5, JSB, NATIVE, PREVIEW, RUNTIME_BASED, TEST } from 'internal:constants';
|
||||
import { DEBUG, EDITOR, NATIVE, PREVIEW } from 'internal:constants';
|
||||
import { systemInfo } from 'pal/system-info';
|
||||
import { findCanvas, loadJsFile } from 'pal/env';
|
||||
import { Pacer } from 'pal/pacer';
|
||||
@@ -34,7 +34,7 @@ import { EventTarget } from './event';
|
||||
import { AsyncDelegate } from './event/async-delegate';
|
||||
import { input } from '../input';
|
||||
import * as debug from './platform/debug';
|
||||
import { deviceManager } from './gfx';
|
||||
import { deviceManager } from '../gfx';
|
||||
import { sys } from './platform/sys';
|
||||
import { macro } from './platform/macro';
|
||||
import { legacyCC, VERSION } from './global-exports';
|
||||
|
||||
@@ -35,7 +35,7 @@ import { Plane } from './plane';
|
||||
import { Ray } from './ray';
|
||||
import { Sphere } from './sphere';
|
||||
import { Triangle } from './triangle';
|
||||
import { PrimitiveMode } from '../gfx';
|
||||
import { PrimitiveMode } from '../../gfx';
|
||||
import { Mesh } from '../../3d/assets/mesh';
|
||||
import { IBArray, RenderingSubMesh } from '../assets/rendering-sub-mesh';
|
||||
import { IRaySubMeshOptions, ERaycastMode, IRaySubMeshResult, IRayMeshOptions, IRayModelOptions } from './spec';
|
||||
|
||||
+1
-3
@@ -29,7 +29,6 @@ import { legacyCC, VERSION } from './global-exports';
|
||||
import * as geometry from './geometry';
|
||||
import * as math from './math';
|
||||
import * as memop from './memop';
|
||||
import * as gfx from './gfx';
|
||||
|
||||
import './splash-screen';
|
||||
import './deprecated';
|
||||
@@ -37,7 +36,7 @@ import './deprecated';
|
||||
legacyCC.math = math;
|
||||
legacyCC.geometry = geometry;
|
||||
|
||||
export { math, memop, geometry, gfx, VERSION };
|
||||
export { math, memop, geometry, VERSION };
|
||||
|
||||
export * from './math';
|
||||
export * from './memop';
|
||||
@@ -52,7 +51,6 @@ export { Root } from './root';
|
||||
export * from './scheduler';
|
||||
export * from './director';
|
||||
|
||||
export * from './gfx/deprecated-3.0.0';
|
||||
export * from './pipeline';
|
||||
export * from './asset-manager';
|
||||
export * from './scene-graph';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { BufferUsageBit, Format, MemoryUsageBit, Device, DescriptorSet, InputAssembler,
|
||||
InputAssemblerInfo, Attribute, Buffer, BufferInfo, Shader } from '../gfx';
|
||||
InputAssemblerInfo, Attribute, Buffer, BufferInfo, Shader } from '../../gfx';
|
||||
import { Mat4 } from '../math';
|
||||
import { SubModel } from '../renderer/scene/submodel';
|
||||
import { UBOLocalBatched } from './define';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Material } from '../../assets';
|
||||
import { intersect, Sphere } from '../../geometry';
|
||||
import { ClearFlagBit, Color, Format, LoadOp, Rect, StoreOp, Viewport } from '../../gfx';
|
||||
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 { supportsR32FloatTexture } from '../define';
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
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 { Buffer, Framebuffer, Texture, Viewport } from '../../../gfx';
|
||||
import { assert } from '../../platform/debug';
|
||||
import { LayoutGraphData } from './layout-graph';
|
||||
import { Pipeline } from './pipeline';
|
||||
|
||||
@@ -2,9 +2,9 @@ import { legacyCC } from '../../global-exports';
|
||||
import { EffectAsset } from '../../assets';
|
||||
import { CollectVisitor, WebDescriptorHierarchy } from './web-descriptor-hierarchy';
|
||||
// eslint-disable-next-line max-len
|
||||
import { Descriptor, DescriptorBlock, DescriptorBlockFlattened, DescriptorBlockIndex, DescriptorDB, DescriptorTypeOrder, LayoutGraph, LayoutGraphData, LayoutGraphValue, RenderPhase } from './layout-graph';
|
||||
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';
|
||||
|
||||
|
||||
@@ -31,39 +31,34 @@
|
||||
/* eslint-disable max-len */
|
||||
import { getPhaseID, InstancedBuffer, PipelineStateManager } from '..';
|
||||
import { assert } from '../..';
|
||||
import { AABB } from '../../geometry/aabb';
|
||||
import intersect from '../../geometry/intersect';
|
||||
import { Sphere } from '../../geometry/sphere';
|
||||
import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, BufferViewInfo, ClearFlagBit, Color, ColorAttachment, CommandBuffer, DepthStencilAttachment, DescriptorSet, DescriptorSetInfo, Device, deviceManager, Format, Framebuffer,
|
||||
FramebufferInfo, GeneralBarrierInfo, InputAssemblerInfo, LoadOp, MemoryUsageBit, PipelineState, Rect, RenderPass, RenderPassInfo, Sampler, SamplerInfo, Shader, StoreOp, SurfaceTransform, Swapchain, Texture, TextureInfo,
|
||||
TextureType, TextureUsageBit, Viewport } from '../../gfx';
|
||||
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 { Mat4 } from '../../math/mat4';
|
||||
import { Vec3 } from '../../math/vec3';
|
||||
import { Vec4 } from '../../math/vec4';
|
||||
import { BatchingSchemes, Pass } from '../../renderer';
|
||||
import { DirectionalLight, SpotLight } from '../../renderer/scene';
|
||||
import { Camera, SKYBOX_FLAG } from '../../renderer/scene/camera';
|
||||
import { Light, LightType } from '../../renderer/scene/light';
|
||||
import { Model } from '../../renderer/scene/model';
|
||||
import { CSMLevel, CSMOptimizationMode, ShadowType } from '../../renderer/scene/shadows';
|
||||
import { SubModel } from '../../renderer/scene/submodel';
|
||||
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 { Root } from '../../root';
|
||||
import { BatchedBuffer } from '../batched-buffer';
|
||||
import { RenderPassStage, SetIndex, UBODeferredLight, UBOForwardLight, UBOLocal } from '../define';
|
||||
import { SetIndex, UBODeferredLight, UBOForwardLight, UBOLocal } from '../define';
|
||||
import { PipelineSceneData } from '../pipeline-scene-data';
|
||||
import { PipelineInputAssemblerData } from '../render-pipeline';
|
||||
import { ShadowLayerVolume } from '../shadow/csm-layers';
|
||||
import { LayoutGraph, LayoutGraphData, LayoutGraphDataVisitor, LayoutGraphVisitor, PipelineLayoutData, RenderPhase, RenderPhaseData, RenderStageData } from './layout-graph';
|
||||
import { LayoutGraphData, PipelineLayoutData, RenderPhaseData, RenderStageData } from './layout-graph';
|
||||
import { Pipeline, SceneVisitor } from './pipeline';
|
||||
import { Blit, ClearView, ComputePass, CopyPass, Dispatch, ManagedResource, MovePass, PresentPass,
|
||||
RasterPass, RaytracePass, RenderData, RenderGraph, RenderGraphValue, RenderGraphVisitor, RenderQueue, RenderSwapchain, ResourceDesc,
|
||||
RasterPass, RaytracePass, RenderData, RenderGraph, RenderGraphVisitor, RenderQueue, RenderSwapchain, ResourceDesc,
|
||||
ResourceGraph, ResourceGraphVisitor, ResourceTraits, SceneData } from './render-graph';
|
||||
import { AttachmentType, ComputeView, QueueHint, ResourceDimension, ResourceFlags, SceneFlags, UpdateFrequency } from './types';
|
||||
import { PipelineUBO } from '../pipeline-ubo';
|
||||
import { RenderInfo, RenderObject, WebSceneTask, WebSceneTransversal } from './web-scene';
|
||||
import { WebSceneVisitor } from './web-scene-visitor';
|
||||
import { stringify, parse } from './utils';
|
||||
import { stringify } from './utils';
|
||||
import { RenderAdditiveLightQueue } from '../render-additive-light-queue';
|
||||
import { RenderShadowMapBatchedQueue } from '../render-shadow-map-batched-queue';
|
||||
import { renderProfiler } from '../pipeline-funcs';
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
*/
|
||||
/* 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';
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
import { Material } from '../../assets';
|
||||
import { Camera } from '../../renderer/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';
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
import * as impl from './graph';
|
||||
import { Material } from '../../assets';
|
||||
import { Camera } from '../../renderer/scene/camera';
|
||||
import { AccessFlagBit, Buffer, ClearFlagBit, Color, Format, Framebuffer, SampleCount, Sampler, Swapchain, Texture, TextureFlagBit, Viewport } from '../../gfx';
|
||||
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,7 +29,7 @@
|
||||
* ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! =========================
|
||||
*/
|
||||
/* eslint-disable max-len */
|
||||
import { ClearFlagBit, Color, LoadOp, StoreOp } from '../../gfx';
|
||||
import { ClearFlagBit, Color, LoadOp, StoreOp } from '../../../gfx';
|
||||
import { Light } from '../../renderer/scene';
|
||||
|
||||
export const enum UpdateFrequency {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
****************************************************************************/
|
||||
|
||||
import { EffectAsset } from '../../assets';
|
||||
import { Descriptor, DescriptorBlock, DescriptorBlockIndex, DescriptorDB, DescriptorTypeOrder, LayoutGraph, LayoutGraphValue, LayoutGraphVisitor, RenderPhase } from './layout-graph';
|
||||
import { ShaderStageFlagBit, Type, Uniform, UniformBlock } from '../../gfx';
|
||||
import { Descriptor, DescriptorBlock, DescriptorBlockIndex, DescriptorDB, DescriptorTypeOrder, LayoutGraph, LayoutGraphValue, RenderPhase } from './layout-graph';
|
||||
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, IncidenceGraph, vertex_descriptor } from './graph';
|
||||
import { DefaultVisitor, edge_descriptor } from './graph';
|
||||
import { ccclass } from '../../data/decorators';
|
||||
|
||||
@ccclass('cc.WebDescriptorHierarchy')
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { DEBUG } from 'internal:constants';
|
||||
import { ccclass } from '../../data/decorators';
|
||||
// eslint-disable-next-line max-len
|
||||
import { DescriptorSetInfo, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, Device, ShaderStageFlagBit, Type, Uniform, UniformBlock } from '../../gfx';
|
||||
import { DescriptorSetInfo, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, Device, ShaderStageFlagBit, Type, UniformBlock } from '../../../gfx';
|
||||
import { VectorGraphColorMap } from './effect';
|
||||
import { DefaultVisitor, depthFirstSearch, GraphColor, MutableVertexPropertyMap } from './graph';
|
||||
import { DefaultVisitor, depthFirstSearch } from './graph';
|
||||
// eslint-disable-next-line max-len
|
||||
import { DescriptorBlockIndex, LayoutGraphData, PipelineLayoutData, LayoutGraphDataValue, RenderStageData, RenderPhaseData, DescriptorTypeOrder, DescriptorSetLayoutData, DescriptorSetData, DescriptorBlockData, Descriptor, DescriptorData, getDescriptorTypeOrderName, DescriptorBlockFlattened } from './layout-graph';
|
||||
import { LayoutGraphBuilder } from './pipeline';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
/* 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 { 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 { 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';
|
||||
@@ -41,7 +41,7 @@ import { assert } from '../../platform/debug';
|
||||
import { macro } from '../../platform/macro';
|
||||
import { MacroRecord, RenderScene } from '../../renderer';
|
||||
import { GlobalDSManager } from '../global-descriptor-set-manager';
|
||||
import { supportsR32FloatTexture, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING } from '../define';
|
||||
import { supportsR32FloatTexture } from '../define';
|
||||
import { OS } from '../../../../pal/system-info/enum-type';
|
||||
import { Compiler } from './compiler';
|
||||
import { PipelineUBO } from '../pipeline-ubo';
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -32,11 +32,10 @@ import { Camera } from '../../renderer/scene';
|
||||
import { SetIndex } from '../define';
|
||||
import { RenderFlow, RenderPipeline } from '..';
|
||||
import { Material } from '../../assets/material';
|
||||
import { BufferInfo, BufferUsageBit, ClearFlagBit, Color, MemoryUsageBit, PipelineState, Rect } from '../../gfx';
|
||||
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';
|
||||
import { gfx } from '../..';
|
||||
import { MAX_BLOOM_FILTER_PASS_NUM } from '../render-pipeline';
|
||||
import { BLOOM_COMBINEPASS_INDEX, BLOOM_DOWNSAMPLEPASS_INDEX, BLOOM_PREFILTERPASS_INDEX,
|
||||
BLOOM_UPSAMPLEPASS_INDEX,
|
||||
@@ -75,7 +74,7 @@ export class BloomStage extends RenderStage {
|
||||
private _bloomMaterial: Material | null = null;
|
||||
|
||||
private _renderArea = new Rect();
|
||||
private _bloomUBO: gfx.Buffer[] = [];
|
||||
private _bloomUBO: Buffer[] = [];
|
||||
|
||||
constructor () {
|
||||
super();
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Device } from '../../gfx';
|
||||
import { Device } from '../../../gfx';
|
||||
import { MAX_BLOOM_FILTER_PASS_NUM } from '../render-pipeline';
|
||||
import { Material } from '../../assets';
|
||||
import { PipelineSceneData } from '../pipeline-scene-data';
|
||||
|
||||
@@ -38,7 +38,7 @@ 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 '../../renderer/scene';
|
||||
import { errorID } from '../../platform/debug';
|
||||
|
||||
@@ -32,14 +32,12 @@ import { Camera } from '../../renderer/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 { InstancedBuffer } from '../instanced-buffer';
|
||||
import { BatchedBuffer } from '../batched-buffer';
|
||||
import { BatchingSchemes } from '../../renderer/core/pass';
|
||||
import { DeferredPipeline } from './deferred-pipeline';
|
||||
import { RenderQueueDesc, RenderQueueSortMode } from '../pipeline-serialization';
|
||||
|
||||
@@ -31,8 +31,8 @@ import { ccclass, displayOrder, type, serializable } from 'cc.decorator';
|
||||
import { Camera } from '../../renderer/scene';
|
||||
import { UBODeferredLight, SetIndex, UBOForwardLight, UBOLocal } from '../define';
|
||||
import { getPhaseID } from '../pass-phase';
|
||||
import { Color, Rect, Buffer, BufferUsageBit, MemoryUsageBit, BufferInfo, BufferViewInfo, DescriptorSet, DescriptorSetLayoutInfo,
|
||||
DescriptorSetLayout, DescriptorSetInfo, PipelineState, ClearFlagBit } from '../../gfx';
|
||||
import { Color, Rect, Buffer, BufferUsageBit, MemoryUsageBit, BufferInfo, BufferViewInfo, DescriptorSet,
|
||||
DescriptorSetLayout, DescriptorSetInfo, PipelineState, ClearFlagBit } from '../../../gfx';
|
||||
import { IRenderStageInfo, RenderStage } from '../render-stage';
|
||||
import { DeferredStagePriority } from '../enum';
|
||||
import { MainFlow } from './main-flow';
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
import { ccclass, displayOrder, type, serializable } from 'cc.decorator';
|
||||
import { Camera } from '../../renderer/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 '../../assets/material';
|
||||
|
||||
@@ -30,7 +30,7 @@ import { Layers } from '../scene-graph/layers';
|
||||
import { legacyCC } from '../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';
|
||||
|
||||
@@ -30,7 +30,7 @@ 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 { Swapchain, RenderPass } from '../../../gfx';
|
||||
import { builtinResMgr } from '../../builtin';
|
||||
import { Texture2D } from '../../assets/texture-2d';
|
||||
import { Camera } from '../../renderer/scene';
|
||||
|
||||
@@ -27,7 +27,7 @@ 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';
|
||||
@@ -179,7 +179,7 @@ export class ForwardStage extends RenderStage {
|
||||
colors, camera.clearDepth, camera.clearStencil);
|
||||
cmdBuff.bindDescriptorSet(SetIndex.GLOBAL, pipeline.descriptorSet);
|
||||
this._renderQueues[0].recordCommandBuffer(device, renderPass, cmdBuff);
|
||||
|
||||
|
||||
for (let i = 0; i < this.additiveInstanceQueues.length; i++) {
|
||||
this.additiveInstanceQueues[i].recordCommandBuffer(device, renderPass, cmdBuff);
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ 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';
|
||||
InputAssemblerInfo, MemoryUsageBit, RenderPass } from '../../gfx';
|
||||
import { warnID } from '../platform/debug';
|
||||
import { Frustum } from '../geometry/frustum';
|
||||
import { toRadian } from '../math/utils';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { Device, BufferUsageBit, MemoryUsageBit, BufferInfo, Filter, Address, Sampler, DescriptorSet,
|
||||
DescriptorSetInfo, Buffer, Texture, DescriptorSetLayoutInfo, DescriptorSetLayout, SamplerInfo } from '../gfx';
|
||||
DescriptorSetInfo, Buffer, Texture, DescriptorSetLayoutInfo, DescriptorSetLayout, SamplerInfo } from '../../gfx';
|
||||
import { Light } from '../renderer/scene';
|
||||
import { UBOShadow, globalDescriptorSetLayout, PipelineGlobalBindings } from './define';
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import { Pass } from '../renderer';
|
||||
import { IInstancedAttributeBlock, SubModel } from '../renderer/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;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { CommandBuffer, Device, Rect, RenderPass, Swapchain, Viewport } from '../gfx';
|
||||
import { CommandBuffer, Device, Rect, RenderPass, Viewport } from '../../gfx';
|
||||
import { IVec4Like } from '../math';
|
||||
import { PipelineStateManager } from './pipeline-state-manager';
|
||||
import { SetIndex } from './define';
|
||||
|
||||
@@ -26,7 +26,7 @@ import { Shadows } from '../renderer/scene/shadows';
|
||||
import { Octree } from '../renderer/scene/octree';
|
||||
import { IRenderObject } from './define';
|
||||
import { Device, Framebuffer, InputAssembler, InputAssemblerInfo, Buffer, BufferInfo,
|
||||
BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../gfx';
|
||||
BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../../gfx';
|
||||
import { Light } from '../renderer/scene/light';
|
||||
import { Material } from '../assets';
|
||||
import { Pass } from '../renderer/core/pass';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
import { ccclass, type, serializable, editable } from 'cc.decorator';
|
||||
import { CCString } from '../data/utils/attribute';
|
||||
import { AccessFlagBit, Format, LoadOp, StoreOp, TextureType, TextureUsageBit } from '../gfx';
|
||||
import { AccessFlagBit, Format, LoadOp, StoreOp, TextureType, TextureUsageBit } from '../../gfx';
|
||||
import { ccenum } from '../value-types/enum';
|
||||
import { RenderTexture } from '../assets/render-texture';
|
||||
import { Material } from '../assets/material';
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, PipelineStateInfo } from '../gfx';
|
||||
import { Shader, RenderPass, InputAssembler, Device, PipelineState, InputState, PipelineStateInfo } from '../../gfx';
|
||||
import { Pass } from '../renderer/core/pass';
|
||||
|
||||
export class PipelineStateManager {
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
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 { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet } from '../../gfx';
|
||||
import { Camera } from '../renderer/scene/camera';
|
||||
import { Mat4, Vec3, Vec4, Color, toRadian } from '../math';
|
||||
import { PipelineRuntime } from './custom/pipeline';
|
||||
|
||||
@@ -25,8 +25,7 @@
|
||||
|
||||
import { AABB, intersect } from '../geometry';
|
||||
import { SetIndex } from './define';
|
||||
import { CommandBuffer, Device, RenderPass } from '../gfx';
|
||||
import { InstancedBuffer } from './instanced-buffer';
|
||||
import { CommandBuffer, Device, RenderPass } from '../../gfx';
|
||||
import { PipelineStateManager } from './pipeline-state-manager';
|
||||
import { Model, Camera } from '../renderer/scene';
|
||||
import { RenderInstancedQueue } from './render-instanced-queue';
|
||||
|
||||
@@ -29,7 +29,7 @@ import { PipelineStateManager } from './pipeline-state-manager';
|
||||
import { Vec3, nextPow2, Mat4, Color } from '../math';
|
||||
import { intersect } from '../geometry';
|
||||
import { Device, RenderPass, Buffer, BufferUsageBit, MemoryUsageBit,
|
||||
BufferInfo, BufferViewInfo, CommandBuffer } from '../gfx';
|
||||
BufferInfo, BufferViewInfo, CommandBuffer } from '../../gfx';
|
||||
import { Pool } from '../memop';
|
||||
import { RenderBatchedQueue } from './render-batched-queue';
|
||||
import { RenderInstancedQueue } from './render-instanced-queue';
|
||||
|
||||
@@ -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';
|
||||
|
||||
/**
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -31,13 +31,12 @@ import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, ClearFlag
|
||||
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';
|
||||
} 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 { Root } from '../root';
|
||||
import { GlobalDSManager } from './global-descriptor-set-manager';
|
||||
import { GeometryRenderer } from './geometry-renderer';
|
||||
import { PipelineSceneData } from './pipeline-scene-data';
|
||||
|
||||
@@ -27,7 +27,7 @@ import { RecyclePool } from '../memop';
|
||||
import { CachedArray } from '../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';
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
import { SubModel } from '../renderer/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 '../renderer/core/pass';
|
||||
|
||||
@@ -31,7 +31,7 @@ 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 '..';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
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';
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { RenderPass } from '../gfx';
|
||||
import { RenderPass } from '../../gfx';
|
||||
import { PipelineStateManager } from './pipeline-state-manager';
|
||||
import { SetIndex } from './define';
|
||||
import { Camera } from '../renderer/scene/camera';
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Type } from '../../gfx';
|
||||
import { Type } from '../../../gfx';
|
||||
import { Color, Mat3, Mat4, Vec2, Vec3, Vec4, Quat, IVec2Like, IVec3Like, IVec4Like, IMat3Like, IMat4Like } from '../../math';
|
||||
|
||||
const typeMask = 0xfc000000; // 6 bits => 64 types
|
||||
|
||||
@@ -32,7 +32,7 @@ import { murmurhash2_32_gc } from '../../utils/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';
|
||||
} from '../../../gfx';
|
||||
import { EffectAsset } from '../../assets/effect-asset';
|
||||
import { IProgramInfo, programLib } from './program-lib';
|
||||
import { MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { API, } from '../../gfx';
|
||||
import { API, } from '../../../gfx';
|
||||
import { legacyCC } from '../../global-exports';
|
||||
|
||||
export interface ITemplateInfo {
|
||||
|
||||
@@ -25,16 +25,15 @@
|
||||
|
||||
import { EffectAsset } from '../../assets/effect-asset';
|
||||
import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../pipeline/define';
|
||||
import { Pipeline, PipelineRuntime } from '../../pipeline/custom/pipeline';
|
||||
import { PipelineRuntime } from '../../pipeline/custom/pipeline';
|
||||
import { genHandle, MacroRecord } from './pass-utils';
|
||||
import { legacyCC } from '../../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';
|
||||
Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment } from '../../../gfx';
|
||||
import { debug } from '../../platform/debug';
|
||||
import { UpdateFrequency } from '../../pipeline/custom/types';
|
||||
|
||||
const _dsLayoutInfo = new DescriptorSetLayoutInfo();
|
||||
|
||||
|
||||
@@ -22,13 +22,12 @@
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
import { JSB } from 'internal:constants';
|
||||
import { screenAdapter } from 'pal/screen-adapter';
|
||||
import { Orientation } from '../../../../pal/screen-adapter/enum-type';
|
||||
import {
|
||||
TextureType, TextureUsageBit, Format, RenderPass, Texture, Framebuffer,
|
||||
RenderPassInfo, Device, TextureInfo, FramebufferInfo, Swapchain, SurfaceTransform,
|
||||
} from '../../gfx';
|
||||
} from '../../../gfx';
|
||||
import { Root } from '../../root';
|
||||
import { Camera } from '../scene';
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { getTypedArrayConstructor, Format, FormatInfos, TextureType, TextureUsageBit,
|
||||
Texture, TextureInfo, Device, BufferTextureCopy } from '../../gfx';
|
||||
Texture, TextureInfo, Device, BufferTextureCopy } from '../../../gfx';
|
||||
import { debug } from '../../platform/debug';
|
||||
|
||||
export function nearestPOT (num: number): number {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user