diff --git a/cocos/rendering/custom/editor.ts b/cocos/rendering/custom/editor.ts new file mode 100644 index 0000000000..7e5abfbd78 --- /dev/null +++ b/cocos/rendering/custom/editor.ts @@ -0,0 +1,2 @@ +export * from './graph'; +export * from './layout-graph'; diff --git a/cocos/rendering/custom/layout-graph.ts b/cocos/rendering/custom/layout-graph.ts index 6f6ccc1295..2166da352a 100644 --- a/cocos/rendering/custom/layout-graph.ts +++ b/cocos/rendering/custom/layout-graph.ts @@ -29,7 +29,7 @@ * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! ========================= */ /* eslint-disable max-len */ -import * as impl from './graph'; +import { AddressableGraph, AdjI, AdjacencyGraph, BidirectionalGraph, ComponentGraph, ED, InEI, MutableGraph, MutableReferenceGraph, NamedGraph, OutE, OutEI, PolymorphicGraph, PropertyGraph, PropertyMap, ReferenceGraph, VertexListGraph, directional, findRelative, getPath, parallel, reindexEdgeList, traversal } from './graph'; import { DescriptorSet, DescriptorSetLayout, DescriptorSetLayoutInfo, ShaderStageFlagBit, Type, UniformBlock } from '../../gfx'; import { DescriptorBlock, saveDescriptorBlock, loadDescriptorBlock, DescriptorBlockIndex, saveDescriptorBlockIndex, loadDescriptorBlockIndex, DescriptorTypeOrder, UpdateFrequency } from './types'; import { OutputArchive, InputArchive } from './archive'; @@ -66,7 +66,7 @@ export function getLayoutGraphValueName (e: LayoutGraphValue): string { } } -interface LayoutGraphValueType { +export interface LayoutGraphValueType { [LayoutGraphValue.RenderStage]: number [LayoutGraphValue.RenderPhase]: RenderPhase } @@ -76,7 +76,7 @@ export interface LayoutGraphVisitor { renderPhase(value: RenderPhase): unknown; } -type LayoutGraphObject = number | RenderPhase; +export type LayoutGraphObject = number | RenderPhase; //----------------------------------------------------------------- // Graph Concept @@ -88,15 +88,15 @@ export class LayoutGraphVertex { this._id = id; this._object = object; } - readonly _outEdges: impl.OutE[] = []; - readonly _inEdges: impl.OutE[] = []; + readonly _outEdges: OutE[] = []; + readonly _inEdges: OutE[] = []; readonly _id: LayoutGraphValue; _object: LayoutGraphObject; } //----------------------------------------------------------------- // PropertyGraph Concept -export class LayoutGraphNameMap implements impl.PropertyMap { +export class LayoutGraphNameMap implements PropertyMap { constructor (readonly names: string[]) { this._names = names; } @@ -107,7 +107,7 @@ export class LayoutGraphNameMap implements impl.PropertyMap { readonly _names: string[]; } -export class LayoutGraphDescriptorsMap implements impl.PropertyMap { +export class LayoutGraphDescriptorsMap implements PropertyMap { constructor (readonly descriptors: DescriptorDB[]) { this._descriptors = descriptors; } @@ -124,43 +124,43 @@ export const enum LayoutGraphComponent { Descriptors, } -interface LayoutGraphComponentType { +export interface LayoutGraphComponentType { [LayoutGraphComponent.Name]: string; [LayoutGraphComponent.Descriptors]: DescriptorDB; } -interface LayoutGraphComponentPropertyMap { +export interface LayoutGraphComponentPropertyMap { [LayoutGraphComponent.Name]: LayoutGraphNameMap; [LayoutGraphComponent.Descriptors]: LayoutGraphDescriptorsMap; } //----------------------------------------------------------------- // LayoutGraph Implementation -export class LayoutGraph implements impl.BidirectionalGraph -, impl.AdjacencyGraph -, impl.VertexListGraph -, impl.MutableGraph -, impl.PropertyGraph -, impl.NamedGraph -, impl.ComponentGraph -, impl.PolymorphicGraph -, impl.ReferenceGraph -, impl.MutableReferenceGraph -, impl.AddressableGraph { +export class LayoutGraph implements BidirectionalGraph +, AdjacencyGraph +, VertexListGraph +, MutableGraph +, PropertyGraph +, NamedGraph +, ComponentGraph +, PolymorphicGraph +, ReferenceGraph +, MutableReferenceGraph +, AddressableGraph { //----------------------------------------------------------------- // Graph // type vertex_descriptor = number; nullVertex (): number { return 0xFFFFFFFF; } - // type edge_descriptor = impl.ED; - readonly directed_category: impl.directional = impl.directional.bidirectional; - readonly edge_parallel_category: impl.parallel = impl.parallel.allow; - readonly traversal_category: impl.traversal = impl.traversal.incidence - | impl.traversal.bidirectional - | impl.traversal.adjacency - | impl.traversal.vertex_list; + // type edge_descriptor = ED; + readonly directed_category: directional = directional.bidirectional; + readonly edge_parallel_category: parallel = parallel.allow; + readonly traversal_category: traversal = traversal.incidence + | traversal.bidirectional + | traversal.adjacency + | traversal.vertex_list; //----------------------------------------------------------------- // IncidenceGraph - // type out_edge_iterator = impl.OutEI; + // type out_edge_iterator = OutEI; // type degree_size_type = number; edge (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { @@ -170,23 +170,23 @@ export class LayoutGraph implements impl.BidirectionalGraph } return false; } - source (e: impl.ED): number { + source (e: ED): number { return e.source as number; } - target (e: impl.ED): number { + target (e: ED): number { return e.target as number; } - outEdges (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + outEdges (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } outDegree (v: number): number { return this._vertices[v]._outEdges.length; } //----------------------------------------------------------------- // BidirectionalGraph - // type in_edge_iterator = impl.InEI; - inEdges (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + // type in_edge_iterator = InEI; + inEdges (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } inDegree (v: number): number { return this._vertices[v]._inEdges.length; @@ -196,9 +196,9 @@ export class LayoutGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // AdjacencyGraph - // type adjacency_iterator = impl.AdjI; - adjacentVertices (v: number): impl.AdjI { - return new impl.AdjI(this, this.outEdges(v)); + // type adjacency_iterator = AdjI; + adjacentVertices (v: number): AdjI { + return new AdjI(this, this.outEdges(v)); } //----------------------------------------------------------------- // VertexListGraph @@ -287,15 +287,15 @@ export class LayoutGraph implements impl.BidirectionalGraph for (let v = 0; v !== sz; ++v) { const vert = this._vertices[v]; - impl.reindexEdgeList(vert._outEdges, u); - impl.reindexEdgeList(vert._inEdges, u); + reindexEdgeList(vert._outEdges, u); + reindexEdgeList(vert._inEdges, u); } } - addEdge (u: number, v: number): impl.ED | null { + addEdge (u: number, v: number): ED | null { // update in/out edge list - this._vertices[u]._outEdges.push(new impl.OutE(v)); - this._vertices[v]._inEdges.push(new impl.OutE(u)); - return new impl.ED(u, v); + this._vertices[u]._outEdges.push(new OutE(v)); + this._vertices[v]._inEdges.push(new OutE(u)); + return new ED(u, v); } removeEdges (u: number, v: number): void { const source = this._vertices[u]; @@ -317,7 +317,7 @@ export class LayoutGraph implements impl.BidirectionalGraph } } } - removeEdge (e: impl.ED): void { + removeEdge (e: ED): void { const u = e.source as number; const v = e.target as number; const source = this._vertices[u]; @@ -455,9 +455,9 @@ export class LayoutGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // ReferenceGraph - // type reference_descriptor = impl.ED; - // type child_iterator = impl.OutEI; - // type parent_iterator = impl.InEI; + // type reference_descriptor = ED; + // type child_iterator = OutEI; + // type parent_iterator = InEI; reference (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { if (v === oe.target as number) { @@ -466,17 +466,17 @@ export class LayoutGraph implements impl.BidirectionalGraph } return false; } - parent (e: impl.ED): number { + parent (e: ED): number { return e.source as number; } - child (e: impl.ED): number { + child (e: ED): number { return e.target as number; } - parents (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + parents (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } - children (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + children (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } numParents (v: number): number { return this._vertices[v]._inEdges.length; @@ -519,10 +519,10 @@ export class LayoutGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // MutableReferenceGraph - addReference (u: number, v: number): impl.ED | null { + addReference (u: number, v: number): ED | null { return this.addEdge(u, v); } - removeReference (e: impl.ED): void { + removeReference (e: ED): void { return this.removeEdge(e); } removeReferences (u: number, v: number): void { @@ -551,16 +551,16 @@ export class LayoutGraph implements impl.BidirectionalGraph //----------------------------------------------------------------- // AddressableGraph addressable (absPath: string): boolean { - return impl.findRelative(this, 0xFFFFFFFF, absPath) as number !== 0xFFFFFFFF; + return findRelative(this, 0xFFFFFFFF, absPath) as number !== 0xFFFFFFFF; } locate (absPath: string): number { - return impl.findRelative(this, 0xFFFFFFFF, absPath) as number; + return findRelative(this, 0xFFFFFFFF, absPath) as number; } locateRelative (path: string, start = 0xFFFFFFFF): number { - return impl.findRelative(this, start, path) as number; + return findRelative(this, start, path) as number; } path (v: number): string { - return impl.getPath(this, v); + return getPath(this, v); } readonly components: string[] = ['Name', 'Descriptors']; @@ -682,7 +682,7 @@ export function getLayoutGraphDataValueName (e: LayoutGraphDataValue): string { } } -interface LayoutGraphDataValueType { +export interface LayoutGraphDataValueType { [LayoutGraphDataValue.RenderStage]: RenderStageData [LayoutGraphDataValue.RenderPhase]: RenderPhaseData } @@ -692,7 +692,7 @@ export interface LayoutGraphDataVisitor { renderPhase(value: RenderPhaseData): unknown; } -type LayoutGraphDataObject = RenderStageData | RenderPhaseData; +export type LayoutGraphDataObject = RenderStageData | RenderPhaseData; //----------------------------------------------------------------- // Graph Concept @@ -704,15 +704,15 @@ export class LayoutGraphDataVertex { this._id = id; this._object = object; } - readonly _outEdges: impl.OutE[] = []; - readonly _inEdges: impl.OutE[] = []; + readonly _outEdges: OutE[] = []; + readonly _inEdges: OutE[] = []; readonly _id: LayoutGraphDataValue; _object: LayoutGraphDataObject; } //----------------------------------------------------------------- // PropertyGraph Concept -export class LayoutGraphDataNameMap implements impl.PropertyMap { +export class LayoutGraphDataNameMap implements PropertyMap { constructor (readonly names: string[]) { this._names = names; } @@ -723,7 +723,7 @@ export class LayoutGraphDataNameMap implements impl.PropertyMap { readonly _names: string[]; } -export class LayoutGraphDataUpdateMap implements impl.PropertyMap { +export class LayoutGraphDataUpdateMap implements PropertyMap { constructor (readonly updateFrequencies: UpdateFrequency[]) { this._updateFrequencies = updateFrequencies; } @@ -736,7 +736,7 @@ export class LayoutGraphDataUpdateMap implements impl.PropertyMap { readonly _updateFrequencies: UpdateFrequency[]; } -export class LayoutGraphDataLayoutMap implements impl.PropertyMap { +export class LayoutGraphDataLayoutMap implements PropertyMap { constructor (readonly layouts: PipelineLayoutData[]) { this._layouts = layouts; } @@ -754,44 +754,44 @@ export const enum LayoutGraphDataComponent { Layout, } -interface LayoutGraphDataComponentType { +export interface LayoutGraphDataComponentType { [LayoutGraphDataComponent.Name]: string; [LayoutGraphDataComponent.Update]: UpdateFrequency; [LayoutGraphDataComponent.Layout]: PipelineLayoutData; } -interface LayoutGraphDataComponentPropertyMap { +export interface LayoutGraphDataComponentPropertyMap { [LayoutGraphDataComponent.Name]: LayoutGraphDataNameMap; [LayoutGraphDataComponent.Update]: LayoutGraphDataUpdateMap; [LayoutGraphDataComponent.Layout]: LayoutGraphDataLayoutMap; } @ccclass('cc.LayoutGraphData') -export class LayoutGraphData implements impl.BidirectionalGraph -, impl.AdjacencyGraph -, impl.VertexListGraph -, impl.MutableGraph -, impl.PropertyGraph -, impl.NamedGraph -, impl.ComponentGraph -, impl.PolymorphicGraph -, impl.ReferenceGraph -, impl.MutableReferenceGraph -, impl.AddressableGraph { +export class LayoutGraphData implements BidirectionalGraph +, AdjacencyGraph +, VertexListGraph +, MutableGraph +, PropertyGraph +, NamedGraph +, ComponentGraph +, PolymorphicGraph +, ReferenceGraph +, MutableReferenceGraph +, AddressableGraph { //----------------------------------------------------------------- // Graph // type vertex_descriptor = number; nullVertex (): number { return 0xFFFFFFFF; } - // type edge_descriptor = impl.ED; - readonly directed_category: impl.directional = impl.directional.bidirectional; - readonly edge_parallel_category: impl.parallel = impl.parallel.allow; - readonly traversal_category: impl.traversal = impl.traversal.incidence - | impl.traversal.bidirectional - | impl.traversal.adjacency - | impl.traversal.vertex_list; + // type edge_descriptor = ED; + readonly directed_category: directional = directional.bidirectional; + readonly edge_parallel_category: parallel = parallel.allow; + readonly traversal_category: traversal = traversal.incidence + | traversal.bidirectional + | traversal.adjacency + | traversal.vertex_list; //----------------------------------------------------------------- // IncidenceGraph - // type out_edge_iterator = impl.OutEI; + // type out_edge_iterator = OutEI; // type degree_size_type = number; edge (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { @@ -801,23 +801,23 @@ export class LayoutGraphData implements impl.BidirectionalGraph } return false; } - source (e: impl.ED): number { + source (e: ED): number { return e.source as number; } - target (e: impl.ED): number { + target (e: ED): number { return e.target as number; } - outEdges (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + outEdges (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } outDegree (v: number): number { return this._vertices[v]._outEdges.length; } //----------------------------------------------------------------- // BidirectionalGraph - // type in_edge_iterator = impl.InEI; - inEdges (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + // type in_edge_iterator = InEI; + inEdges (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } inDegree (v: number): number { return this._vertices[v]._inEdges.length; @@ -827,9 +827,9 @@ export class LayoutGraphData implements impl.BidirectionalGraph } //----------------------------------------------------------------- // AdjacencyGraph - // type adjacency_iterator = impl.AdjI; - adjacentVertices (v: number): impl.AdjI { - return new impl.AdjI(this, this.outEdges(v)); + // type adjacency_iterator = AdjI; + adjacentVertices (v: number): AdjI { + return new AdjI(this, this.outEdges(v)); } //----------------------------------------------------------------- // VertexListGraph @@ -928,15 +928,15 @@ export class LayoutGraphData implements impl.BidirectionalGraph for (let v = 0; v !== sz; ++v) { const vert = this._vertices[v]; - impl.reindexEdgeList(vert._outEdges, u); - impl.reindexEdgeList(vert._inEdges, u); + reindexEdgeList(vert._outEdges, u); + reindexEdgeList(vert._inEdges, u); } } - addEdge (u: number, v: number): impl.ED | null { + addEdge (u: number, v: number): ED | null { // update in/out edge list - this._vertices[u]._outEdges.push(new impl.OutE(v)); - this._vertices[v]._inEdges.push(new impl.OutE(u)); - return new impl.ED(u, v); + this._vertices[u]._outEdges.push(new OutE(v)); + this._vertices[v]._inEdges.push(new OutE(u)); + return new ED(u, v); } removeEdges (u: number, v: number): void { const source = this._vertices[u]; @@ -958,7 +958,7 @@ export class LayoutGraphData implements impl.BidirectionalGraph } } } - removeEdge (e: impl.ED): void { + removeEdge (e: ED): void { const u = e.source as number; const v = e.target as number; const source = this._vertices[u]; @@ -1108,9 +1108,9 @@ export class LayoutGraphData implements impl.BidirectionalGraph } //----------------------------------------------------------------- // ReferenceGraph - // type reference_descriptor = impl.ED; - // type child_iterator = impl.OutEI; - // type parent_iterator = impl.InEI; + // type reference_descriptor = ED; + // type child_iterator = OutEI; + // type parent_iterator = InEI; reference (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { if (v === oe.target as number) { @@ -1119,17 +1119,17 @@ export class LayoutGraphData implements impl.BidirectionalGraph } return false; } - parent (e: impl.ED): number { + parent (e: ED): number { return e.source as number; } - child (e: impl.ED): number { + child (e: ED): number { return e.target as number; } - parents (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + parents (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } - children (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + children (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } numParents (v: number): number { return this._vertices[v]._inEdges.length; @@ -1172,10 +1172,10 @@ export class LayoutGraphData implements impl.BidirectionalGraph } //----------------------------------------------------------------- // MutableReferenceGraph - addReference (u: number, v: number): impl.ED | null { + addReference (u: number, v: number): ED | null { return this.addEdge(u, v); } - removeReference (e: impl.ED): void { + removeReference (e: ED): void { return this.removeEdge(e); } removeReferences (u: number, v: number): void { @@ -1204,16 +1204,16 @@ export class LayoutGraphData implements impl.BidirectionalGraph //----------------------------------------------------------------- // AddressableGraph addressable (absPath: string): boolean { - return impl.findRelative(this, 0xFFFFFFFF, absPath) as number !== 0xFFFFFFFF; + return findRelative(this, 0xFFFFFFFF, absPath) as number !== 0xFFFFFFFF; } locate (absPath: string): number { - return impl.findRelative(this, 0xFFFFFFFF, absPath) as number; + return findRelative(this, 0xFFFFFFFF, absPath) as number; } locateRelative (path: string, start = 0xFFFFFFFF): number { - return impl.findRelative(this, start, path) as number; + return findRelative(this, start, path) as number; } path (v: number): string { - return impl.getPath(this, v); + return getPath(this, v); } readonly components: string[] = ['Name', 'Update', 'Layout']; diff --git a/cocos/rendering/custom/render-graph.ts b/cocos/rendering/custom/render-graph.ts index 1d1ec07eb5..93583593bc 100644 --- a/cocos/rendering/custom/render-graph.ts +++ b/cocos/rendering/custom/render-graph.ts @@ -29,7 +29,7 @@ * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! ========================= */ /* eslint-disable max-len */ -import * as impl from './graph'; +import { AdjI, AdjacencyGraph, BidirectionalGraph, ComponentGraph, ED, InEI, MutableGraph, MutableReferenceGraph, NamedGraph, OutE, OutEI, PolymorphicGraph, PropertyGraph, PropertyMap, ReferenceGraph, UuidGraph, VertexListGraph, directional, parallel, reindexEdgeList, traversal } from './graph'; import { Material } from '../../asset/assets'; import { Camera } from '../../render-scene/scene/camera'; import { AccessFlagBit, Buffer, ClearFlagBit, Color, Format, Framebuffer, SampleCount, Sampler, SamplerInfo, Swapchain, Texture, TextureFlagBit, Viewport } from '../../gfx'; @@ -115,7 +115,7 @@ export function getResourceGraphValueName (e: ResourceGraphValue): string { } } -interface ResourceGraphValueType { +export interface ResourceGraphValueType { [ResourceGraphValue.Managed]: ManagedResource [ResourceGraphValue.ManagedBuffer]: ManagedBuffer [ResourceGraphValue.ManagedTexture]: ManagedTexture @@ -135,7 +135,7 @@ export interface ResourceGraphVisitor { swapchain(value: RenderSwapchain): unknown; } -type ResourceGraphObject = ManagedResource +export type ResourceGraphObject = ManagedResource | ManagedBuffer | ManagedTexture | Buffer @@ -153,15 +153,15 @@ export class ResourceGraphVertex { this._id = id; this._object = object; } - readonly _outEdges: impl.OutE[] = []; - readonly _inEdges: impl.OutE[] = []; + readonly _outEdges: OutE[] = []; + readonly _inEdges: OutE[] = []; readonly _id: ResourceGraphValue; _object: ResourceGraphObject; } //----------------------------------------------------------------- // PropertyGraph Concept -export class ResourceGraphNameMap implements impl.PropertyMap { +export class ResourceGraphNameMap implements PropertyMap { constructor (readonly names: string[]) { this._names = names; } @@ -174,7 +174,7 @@ export class ResourceGraphNameMap implements impl.PropertyMap { readonly _names: string[]; } -export class ResourceGraphDescMap implements impl.PropertyMap { +export class ResourceGraphDescMap implements PropertyMap { constructor (readonly descs: ResourceDesc[]) { this._descs = descs; } @@ -184,7 +184,7 @@ export class ResourceGraphDescMap implements impl.PropertyMap { readonly _descs: ResourceDesc[]; } -export class ResourceGraphTraitsMap implements impl.PropertyMap { +export class ResourceGraphTraitsMap implements PropertyMap { constructor (readonly traits: ResourceTraits[]) { this._traits = traits; } @@ -194,7 +194,7 @@ export class ResourceGraphTraitsMap implements impl.PropertyMap { readonly _traits: ResourceTraits[]; } -export class ResourceGraphStatesMap implements impl.PropertyMap { +export class ResourceGraphStatesMap implements PropertyMap { constructor (readonly states: ResourceStates[]) { this._states = states; } @@ -204,7 +204,7 @@ export class ResourceGraphStatesMap implements impl.PropertyMap { readonly _states: ResourceStates[]; } -export class ResourceGraphSamplerMap implements impl.PropertyMap { +export class ResourceGraphSamplerMap implements PropertyMap { constructor (readonly samplerInfo: SamplerInfo[]) { this._samplerInfo = samplerInfo; } @@ -224,7 +224,7 @@ export const enum ResourceGraphComponent { Sampler, } -interface ResourceGraphComponentType { +export interface ResourceGraphComponentType { [ResourceGraphComponent.Name]: string; [ResourceGraphComponent.Desc]: ResourceDesc; [ResourceGraphComponent.Traits]: ResourceTraits; @@ -232,7 +232,7 @@ interface ResourceGraphComponentType { [ResourceGraphComponent.Sampler]: SamplerInfo; } -interface ResourceGraphComponentPropertyMap { +export interface ResourceGraphComponentPropertyMap { [ResourceGraphComponent.Name]: ResourceGraphNameMap; [ResourceGraphComponent.Desc]: ResourceGraphDescMap; [ResourceGraphComponent.Traits]: ResourceGraphTraitsMap; @@ -242,29 +242,29 @@ interface ResourceGraphComponentPropertyMap { //----------------------------------------------------------------- // ResourceGraph Implementation -export class ResourceGraph implements impl.BidirectionalGraph -, impl.AdjacencyGraph -, impl.VertexListGraph -, impl.MutableGraph -, impl.PropertyGraph -, impl.NamedGraph -, impl.ComponentGraph -, impl.PolymorphicGraph -, impl.UuidGraph { +export class ResourceGraph implements BidirectionalGraph +, AdjacencyGraph +, VertexListGraph +, MutableGraph +, PropertyGraph +, NamedGraph +, ComponentGraph +, PolymorphicGraph +, UuidGraph { //----------------------------------------------------------------- // Graph // type vertex_descriptor = number; nullVertex (): number { return 0xFFFFFFFF; } - // type edge_descriptor = impl.ED; - readonly directed_category: impl.directional = impl.directional.bidirectional; - readonly edge_parallel_category: impl.parallel = impl.parallel.allow; - readonly traversal_category: impl.traversal = impl.traversal.incidence - | impl.traversal.bidirectional - | impl.traversal.adjacency - | impl.traversal.vertex_list; + // type edge_descriptor = ED; + readonly directed_category: directional = directional.bidirectional; + readonly edge_parallel_category: parallel = parallel.allow; + readonly traversal_category: traversal = traversal.incidence + | traversal.bidirectional + | traversal.adjacency + | traversal.vertex_list; //----------------------------------------------------------------- // IncidenceGraph - // type out_edge_iterator = impl.OutEI; + // type out_edge_iterator = OutEI; // type degree_size_type = number; edge (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { @@ -274,23 +274,23 @@ export class ResourceGraph implements impl.BidirectionalGraph } return false; } - source (e: impl.ED): number { + source (e: ED): number { return e.source as number; } - target (e: impl.ED): number { + target (e: ED): number { return e.target as number; } - outEdges (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + outEdges (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } outDegree (v: number): number { return this._vertices[v]._outEdges.length; } //----------------------------------------------------------------- // BidirectionalGraph - // type in_edge_iterator = impl.InEI; - inEdges (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + // type in_edge_iterator = InEI; + inEdges (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } inDegree (v: number): number { return this._vertices[v]._inEdges.length; @@ -300,9 +300,9 @@ export class ResourceGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // AdjacencyGraph - // type adjacency_iterator = impl.AdjI; - adjacentVertices (v: number): impl.AdjI { - return new impl.AdjI(this, this.outEdges(v)); + // type adjacency_iterator = AdjI; + adjacentVertices (v: number): AdjI { + return new AdjI(this, this.outEdges(v)); } //----------------------------------------------------------------- // VertexListGraph @@ -409,15 +409,15 @@ export class ResourceGraph implements impl.BidirectionalGraph for (let v = 0; v !== sz; ++v) { const vert = this._vertices[v]; - impl.reindexEdgeList(vert._outEdges, u); - impl.reindexEdgeList(vert._inEdges, u); + reindexEdgeList(vert._outEdges, u); + reindexEdgeList(vert._inEdges, u); } } - addEdge (u: number, v: number): impl.ED | null { + addEdge (u: number, v: number): ED | null { // update in/out edge list - this._vertices[u]._outEdges.push(new impl.OutE(v)); - this._vertices[v]._inEdges.push(new impl.OutE(u)); - return new impl.ED(u, v); + this._vertices[u]._outEdges.push(new OutE(v)); + this._vertices[v]._inEdges.push(new OutE(u)); + return new ED(u, v); } removeEdges (u: number, v: number): void { const source = this._vertices[u]; @@ -439,7 +439,7 @@ export class ResourceGraph implements impl.BidirectionalGraph } } } - removeEdge (e: impl.ED): void { + removeEdge (e: ED): void { const u = e.source as number; const v = e.target as number; const source = this._vertices[u]; @@ -722,13 +722,13 @@ export class RasterSubpass { export class SubpassGraphVertex { constructor () { } - readonly _outEdges: impl.OutE[] = []; - readonly _inEdges: impl.OutE[] = []; + readonly _outEdges: OutE[] = []; + readonly _inEdges: OutE[] = []; } //----------------------------------------------------------------- // PropertyGraph Concept -export class SubpassGraphNameMap implements impl.PropertyMap { +export class SubpassGraphNameMap implements PropertyMap { constructor (readonly names: string[]) { this._names = names; } @@ -741,7 +741,7 @@ export class SubpassGraphNameMap implements impl.PropertyMap { readonly _names: string[]; } -export class SubpassGraphSubpassMap implements impl.PropertyMap { +export class SubpassGraphSubpassMap implements PropertyMap { constructor (readonly subpasses: RasterSubpass[]) { this._subpasses = subpasses; } @@ -758,39 +758,39 @@ export const enum SubpassGraphComponent { Subpass, } -interface SubpassGraphComponentType { +export interface SubpassGraphComponentType { [SubpassGraphComponent.Name]: string; [SubpassGraphComponent.Subpass]: RasterSubpass; } -interface SubpassGraphComponentPropertyMap { +export interface SubpassGraphComponentPropertyMap { [SubpassGraphComponent.Name]: SubpassGraphNameMap; [SubpassGraphComponent.Subpass]: SubpassGraphSubpassMap; } //----------------------------------------------------------------- // SubpassGraph Implementation -export class SubpassGraph implements impl.BidirectionalGraph -, impl.AdjacencyGraph -, impl.VertexListGraph -, impl.MutableGraph -, impl.PropertyGraph -, impl.NamedGraph -, impl.ComponentGraph { +export class SubpassGraph implements BidirectionalGraph +, AdjacencyGraph +, VertexListGraph +, MutableGraph +, PropertyGraph +, NamedGraph +, ComponentGraph { //----------------------------------------------------------------- // Graph // type vertex_descriptor = number; nullVertex (): number { return 0xFFFFFFFF; } - // type edge_descriptor = impl.ED; - readonly directed_category: impl.directional = impl.directional.bidirectional; - readonly edge_parallel_category: impl.parallel = impl.parallel.allow; - readonly traversal_category: impl.traversal = impl.traversal.incidence - | impl.traversal.bidirectional - | impl.traversal.adjacency - | impl.traversal.vertex_list; + // type edge_descriptor = ED; + readonly directed_category: directional = directional.bidirectional; + readonly edge_parallel_category: parallel = parallel.allow; + readonly traversal_category: traversal = traversal.incidence + | traversal.bidirectional + | traversal.adjacency + | traversal.vertex_list; //----------------------------------------------------------------- // IncidenceGraph - // type out_edge_iterator = impl.OutEI; + // type out_edge_iterator = OutEI; // type degree_size_type = number; edge (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { @@ -800,23 +800,23 @@ export class SubpassGraph implements impl.BidirectionalGraph } return false; } - source (e: impl.ED): number { + source (e: ED): number { return e.source as number; } - target (e: impl.ED): number { + target (e: ED): number { return e.target as number; } - outEdges (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + outEdges (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } outDegree (v: number): number { return this._vertices[v]._outEdges.length; } //----------------------------------------------------------------- // BidirectionalGraph - // type in_edge_iterator = impl.InEI; - inEdges (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + // type in_edge_iterator = InEI; + inEdges (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } inDegree (v: number): number { return this._vertices[v]._inEdges.length; @@ -826,9 +826,9 @@ export class SubpassGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // AdjacencyGraph - // type adjacency_iterator = impl.AdjI; - adjacentVertices (v: number): impl.AdjI { - return new impl.AdjI(this, this.outEdges(v)); + // type adjacency_iterator = AdjI; + adjacentVertices (v: number): AdjI { + return new AdjI(this, this.outEdges(v)); } //----------------------------------------------------------------- // VertexListGraph @@ -907,15 +907,15 @@ export class SubpassGraph implements impl.BidirectionalGraph for (let v = 0; v !== sz; ++v) { const vert = this._vertices[v]; - impl.reindexEdgeList(vert._outEdges, u); - impl.reindexEdgeList(vert._inEdges, u); + reindexEdgeList(vert._outEdges, u); + reindexEdgeList(vert._inEdges, u); } } - addEdge (u: number, v: number): impl.ED | null { + addEdge (u: number, v: number): ED | null { // update in/out edge list - this._vertices[u]._outEdges.push(new impl.OutE(v)); - this._vertices[v]._inEdges.push(new impl.OutE(u)); - return new impl.ED(u, v); + this._vertices[u]._outEdges.push(new OutE(v)); + this._vertices[v]._inEdges.push(new OutE(u)); + return new ED(u, v); } removeEdges (u: number, v: number): void { const source = this._vertices[u]; @@ -937,7 +937,7 @@ export class SubpassGraph implements impl.BidirectionalGraph } } } - removeEdge (e: impl.ED): void { + removeEdge (e: ED): void { const u = e.source as number; const v = e.target as number; const source = this._vertices[u]; @@ -1157,7 +1157,7 @@ export function getRenderGraphValueName (e: RenderGraphValue): string { } } -interface RenderGraphValueType { +export interface RenderGraphValueType { [RenderGraphValue.Raster]: RasterPass [RenderGraphValue.Compute]: ComputePass [RenderGraphValue.Copy]: CopyPass @@ -1187,7 +1187,7 @@ export interface RenderGraphVisitor { viewport(value: Viewport): unknown; } -type RenderGraphObject = RasterPass +export type RenderGraphObject = RasterPass | ComputePass | CopyPass | MovePass @@ -1210,17 +1210,17 @@ export class RenderGraphVertex { this._id = id; this._object = object; } - readonly _outEdges: impl.OutE[] = []; - readonly _inEdges: impl.OutE[] = []; - readonly _children: impl.OutE[] = []; - readonly _parents: impl.OutE[] = []; + readonly _outEdges: OutE[] = []; + readonly _inEdges: OutE[] = []; + readonly _children: OutE[] = []; + readonly _parents: OutE[] = []; readonly _id: RenderGraphValue; _object: RenderGraphObject; } //----------------------------------------------------------------- // PropertyGraph Concept -export class RenderGraphNameMap implements impl.PropertyMap { +export class RenderGraphNameMap implements PropertyMap { constructor (readonly names: string[]) { this._names = names; } @@ -1233,7 +1233,7 @@ export class RenderGraphNameMap implements impl.PropertyMap { readonly _names: string[]; } -export class RenderGraphLayoutMap implements impl.PropertyMap { +export class RenderGraphLayoutMap implements PropertyMap { constructor (readonly layoutNodes: string[]) { this._layoutNodes = layoutNodes; } @@ -1246,7 +1246,7 @@ export class RenderGraphLayoutMap implements impl.PropertyMap { readonly _layoutNodes: string[]; } -export class RenderGraphDataMap implements impl.PropertyMap { +export class RenderGraphDataMap implements PropertyMap { constructor (readonly data: RenderData[]) { this._data = data; } @@ -1256,7 +1256,7 @@ export class RenderGraphDataMap implements impl.PropertyMap { readonly _data: RenderData[]; } -export class RenderGraphValidMap implements impl.PropertyMap { +export class RenderGraphValidMap implements PropertyMap { constructor (readonly valid: boolean[]) { this._valid = valid; } @@ -1278,14 +1278,14 @@ export const enum RenderGraphComponent { Valid, } -interface RenderGraphComponentType { +export interface RenderGraphComponentType { [RenderGraphComponent.Name]: string; [RenderGraphComponent.Layout]: string; [RenderGraphComponent.Data]: RenderData; [RenderGraphComponent.Valid]: boolean; } -interface RenderGraphComponentPropertyMap { +export interface RenderGraphComponentPropertyMap { [RenderGraphComponent.Name]: RenderGraphNameMap; [RenderGraphComponent.Layout]: RenderGraphLayoutMap; [RenderGraphComponent.Data]: RenderGraphDataMap; @@ -1294,30 +1294,30 @@ interface RenderGraphComponentPropertyMap { //----------------------------------------------------------------- // RenderGraph Implementation -export class RenderGraph implements impl.BidirectionalGraph -, impl.AdjacencyGraph -, impl.VertexListGraph -, impl.MutableGraph -, impl.PropertyGraph -, impl.NamedGraph -, impl.ComponentGraph -, impl.PolymorphicGraph -, impl.ReferenceGraph -, impl.MutableReferenceGraph { +export class RenderGraph implements BidirectionalGraph +, AdjacencyGraph +, VertexListGraph +, MutableGraph +, PropertyGraph +, NamedGraph +, ComponentGraph +, PolymorphicGraph +, ReferenceGraph +, MutableReferenceGraph { //----------------------------------------------------------------- // Graph // type vertex_descriptor = number; nullVertex (): number { return 0xFFFFFFFF; } - // type edge_descriptor = impl.ED; - readonly directed_category: impl.directional = impl.directional.bidirectional; - readonly edge_parallel_category: impl.parallel = impl.parallel.allow; - readonly traversal_category: impl.traversal = impl.traversal.incidence - | impl.traversal.bidirectional - | impl.traversal.adjacency - | impl.traversal.vertex_list; + // type edge_descriptor = ED; + readonly directed_category: directional = directional.bidirectional; + readonly edge_parallel_category: parallel = parallel.allow; + readonly traversal_category: traversal = traversal.incidence + | traversal.bidirectional + | traversal.adjacency + | traversal.vertex_list; //----------------------------------------------------------------- // IncidenceGraph - // type out_edge_iterator = impl.OutEI; + // type out_edge_iterator = OutEI; // type degree_size_type = number; edge (u: number, v: number): boolean { for (const oe of this._vertices[u]._outEdges) { @@ -1327,23 +1327,23 @@ export class RenderGraph implements impl.BidirectionalGraph } return false; } - source (e: impl.ED): number { + source (e: ED): number { return e.source as number; } - target (e: impl.ED): number { + target (e: ED): number { return e.target as number; } - outEdges (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._outEdges.values(), v); + outEdges (v: number): OutEI { + return new OutEI(this._vertices[v]._outEdges.values(), v); } outDegree (v: number): number { return this._vertices[v]._outEdges.length; } //----------------------------------------------------------------- // BidirectionalGraph - // type in_edge_iterator = impl.InEI; - inEdges (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._inEdges.values(), v); + // type in_edge_iterator = InEI; + inEdges (v: number): InEI { + return new InEI(this._vertices[v]._inEdges.values(), v); } inDegree (v: number): number { return this._vertices[v]._inEdges.length; @@ -1353,9 +1353,9 @@ export class RenderGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // AdjacencyGraph - // type adjacency_iterator = impl.AdjI; - adjacentVertices (v: number): impl.AdjI { - return new impl.AdjI(this, this.outEdges(v)); + // type adjacency_iterator = AdjI; + adjacentVertices (v: number): AdjI { + return new AdjI(this, this.outEdges(v)); } //----------------------------------------------------------------- // VertexListGraph @@ -1406,8 +1406,8 @@ export class RenderGraph implements impl.BidirectionalGraph // ReferenceGraph if (u !== 0xFFFFFFFF) { - this._vertices[u]._children.push(new impl.OutE(v)); - vert._parents.push(new impl.OutE(u)); + this._vertices[u]._children.push(new OutE(v)); + vert._parents.push(new OutE(u)); } return v; @@ -1481,18 +1481,18 @@ export class RenderGraph implements impl.BidirectionalGraph for (let v = 0; v !== sz; ++v) { const vert = this._vertices[v]; - impl.reindexEdgeList(vert._outEdges, u); - impl.reindexEdgeList(vert._inEdges, u); + reindexEdgeList(vert._outEdges, u); + reindexEdgeList(vert._inEdges, u); // ReferenceGraph (Separated) - impl.reindexEdgeList(vert._children, u); - impl.reindexEdgeList(vert._parents, u); + reindexEdgeList(vert._children, u); + reindexEdgeList(vert._parents, u); } } - addEdge (u: number, v: number): impl.ED | null { + addEdge (u: number, v: number): ED | null { // update in/out edge list - this._vertices[u]._outEdges.push(new impl.OutE(v)); - this._vertices[v]._inEdges.push(new impl.OutE(u)); - return new impl.ED(u, v); + this._vertices[u]._outEdges.push(new OutE(v)); + this._vertices[v]._inEdges.push(new OutE(u)); + return new ED(u, v); } removeEdges (u: number, v: number): void { const source = this._vertices[u]; @@ -1514,7 +1514,7 @@ export class RenderGraph implements impl.BidirectionalGraph } } } - removeEdge (e: impl.ED): void { + removeEdge (e: ED): void { const u = e.source as number; const v = e.target as number; const source = this._vertices[u]; @@ -1838,9 +1838,9 @@ export class RenderGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // ReferenceGraph - // type reference_descriptor = impl.ED; - // type child_iterator = impl.OutEI; - // type parent_iterator = impl.InEI; + // type reference_descriptor = ED; + // type child_iterator = OutEI; + // type parent_iterator = InEI; reference (u: number, v: number): boolean { for (const oe of this._vertices[u]._children) { if (v === oe.target as number) { @@ -1849,17 +1849,17 @@ export class RenderGraph implements impl.BidirectionalGraph } return false; } - parent (e: impl.ED): number { + parent (e: ED): number { return e.source as number; } - child (e: impl.ED): number { + child (e: ED): number { return e.target as number; } - parents (v: number): impl.InEI { - return new impl.InEI(this._vertices[v]._parents.values(), v); + parents (v: number): InEI { + return new InEI(this._vertices[v]._parents.values(), v); } - children (v: number): impl.OutEI { - return new impl.OutEI(this._vertices[v]._children.values(), v); + children (v: number): OutEI { + return new OutEI(this._vertices[v]._children.values(), v); } numParents (v: number): number { return this._vertices[v]._parents.length; @@ -1902,13 +1902,13 @@ export class RenderGraph implements impl.BidirectionalGraph } //----------------------------------------------------------------- // MutableReferenceGraph - addReference (u: number, v: number): impl.ED | null { + addReference (u: number, v: number): ED | null { // update in/out edge list - this._vertices[u]._children.push(new impl.OutE(v)); - this._vertices[v]._parents.push(new impl.OutE(u)); - return new impl.ED(u, v); + this._vertices[u]._children.push(new OutE(v)); + this._vertices[v]._parents.push(new OutE(u)); + return new ED(u, v); } - removeReference (e: impl.ED): void { + removeReference (e: ED): void { const u = e.source as number; const v = e.target as number; const source = this._vertices[u]; diff --git a/editor/exports/custom-pipeline.ts b/editor/exports/custom-pipeline.ts new file mode 100644 index 0000000000..c010acce3b --- /dev/null +++ b/editor/exports/custom-pipeline.ts @@ -0,0 +1,2 @@ +import * as shader from '../../cocos/rendering/custom/editor'; +export { shader }; diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 239b998cbb..24f5b73859 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -1303,6 +1303,12 @@ cocos_source_files( cocos/renderer/pipeline/custom/test/test.h cocos/renderer/pipeline/custom/NativeDefaultScene.cpp cocos/renderer/pipeline/custom/NativeResourceGraph.cpp + cocos/renderer/pipeline/reflection-probe/ReflectionProbeFlow.cpp + cocos/renderer/pipeline/reflection-probe/ReflectionProbeFlow.h + cocos/renderer/pipeline/reflection-probe/ReflectionProbeStage.cpp + cocos/renderer/pipeline/reflection-probe/ReflectionProbeStage.h + cocos/renderer/pipeline/ReflectionProbeBatchedQueue.cpp + cocos/renderer/pipeline/ReflectionProbeBatchedQueue.h cocos/renderer/pipeline/custom/ArchiveFwd.h cocos/renderer/pipeline/custom/ArchiveTypes.cpp cocos/renderer/pipeline/custom/ArchiveTypes.h @@ -1350,12 +1356,6 @@ cocos_source_files( cocos/renderer/pipeline/custom/RenderInterfaceImpl.cpp cocos/renderer/pipeline/custom/RenderInterfaceTypes.cpp cocos/renderer/pipeline/custom/RenderInterfaceTypes.h - cocos/renderer/pipeline/reflection-probe/ReflectionProbeFlow.cpp - cocos/renderer/pipeline/reflection-probe/ReflectionProbeFlow.h - cocos/renderer/pipeline/reflection-probe/ReflectionProbeStage.cpp - cocos/renderer/pipeline/reflection-probe/ReflectionProbeStage.h - cocos/renderer/pipeline/ReflectionProbeBatchedQueue.cpp - cocos/renderer/pipeline/ReflectionProbeBatchedQueue.h ) if (USE_GEOMETRY_RENDERER)