remane queries

This commit is contained in:
DCFApixels 2024-11-20 15:54:46 +08:00
parent 2fb247a534
commit 6dcc8ccf38
2 changed files with 12 additions and 12 deletions

View File

@ -239,7 +239,7 @@ namespace DCFApixels.DragonECS
EcsSubGraph subGraph; EcsSubGraph subGraph;
EcsWorld graphWorld = _graph._graphWorld; EcsWorld graphWorld = _graph._graphWorld;
subGraph = graphWorld.JoinToSubGraph(EcsSubGraphMode.All); subGraph = graphWorld.JoinGraph(EcsSubGraphMode.All);
foreach (var sourceE in delEntities) foreach (var sourceE in delEntities)
{ {
var relEs = subGraph.GetRelations(sourceE); var relEs = subGraph.GetRelations(sourceE);

View File

@ -6,7 +6,7 @@ namespace DCFApixels.DragonECS
public static class GraphQueriesExtensions public static class GraphQueriesExtensions
{ {
#region JoinToGraph Empty #region JoinToGraph Empty
public static EcsSubGraph JoinToSubGraph(this EcsWorld entities, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinGraph(this EcsWorld entities, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
{ {
entities.GetQueryCache(out JoinToSubGraphExecutor executor, out EmptyAspect _); entities.GetQueryCache(out JoinToSubGraphExecutor executor, out EmptyAspect _);
return executor.Execute(mode); return executor.Execute(mode);
@ -14,7 +14,7 @@ namespace DCFApixels.DragonECS
#endregion #endregion
#region JoinToGraph Mask #region JoinToGraph Mask
public static EcsSubGraph JoinToSubGraph<TCollection>(this TCollection entities, IComponentMask mask, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinSubGraph<TCollection>(this TCollection entities, IComponentMask mask, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
where TCollection : IEntityStorage where TCollection : IEntityStorage
{ {
if (ReferenceEquals(entities, entities.World)) if (ReferenceEquals(entities, entities.World))
@ -22,13 +22,13 @@ namespace DCFApixels.DragonECS
var executor = entities.World.GetExecutorForMask<JoinToSubGraphExecutor>(mask); var executor = entities.World.GetExecutorForMask<JoinToSubGraphExecutor>(mask);
return executor.Execute(); return executor.Execute();
} }
return entities.ToSpan().JoinToSubGraph(mask, mode); return entities.ToSpan().JoinSubGraph(mask, mode);
} }
public static EcsSubGraph JoinToSubGraph(this EcsReadonlyGroup group, IComponentMask mask, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinSubGraph(this EcsReadonlyGroup group, IComponentMask mask, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
{ {
return group.ToSpan().JoinToSubGraph(mask, mode); return group.ToSpan().JoinSubGraph(mask, mode);
} }
public static EcsSubGraph JoinToSubGraph(this EcsSpan span, IComponentMask mask, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinSubGraph(this EcsSpan span, IComponentMask mask, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
{ {
var executor = span.World.GetExecutorForMask<JoinToSubGraphExecutor>(mask); var executor = span.World.GetExecutorForMask<JoinToSubGraphExecutor>(mask);
return executor.ExecuteFor(span, mode); return executor.ExecuteFor(span, mode);
@ -36,7 +36,7 @@ namespace DCFApixels.DragonECS
#endregion #endregion
#region JoinToGraph #region JoinToGraph
public static EcsSubGraph JoinToSubGraph<TCollection, TAspect>(this TCollection entities, out TAspect aspect, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinSubGraph<TCollection, TAspect>(this TCollection entities, out TAspect aspect, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
where TAspect : EcsAspect, new() where TAspect : EcsAspect, new()
where TCollection : IEntityStorage where TCollection : IEntityStorage
{ {
@ -45,14 +45,14 @@ namespace DCFApixels.DragonECS
entities.World.GetQueryCache(out JoinToSubGraphExecutor executor, out aspect); entities.World.GetQueryCache(out JoinToSubGraphExecutor executor, out aspect);
return executor.Execute(); return executor.Execute();
} }
return entities.ToSpan().JoinToSubGraph(out aspect, mode); return entities.ToSpan().JoinSubGraph(out aspect, mode);
} }
public static EcsSubGraph JoinToSubGraph<TAspect>(this EcsReadonlyGroup group, out TAspect aspect, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinSubGraph<TAspect>(this EcsReadonlyGroup group, out TAspect aspect, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
where TAspect : EcsAspect, new() where TAspect : EcsAspect, new()
{ {
return group.ToSpan().JoinToSubGraph(out aspect, mode); return group.ToSpan().JoinSubGraph(out aspect, mode);
} }
public static EcsSubGraph JoinToSubGraph<TAspect>(this EcsSpan span, out TAspect aspect, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd) public static EcsSubGraph JoinSubGraph<TAspect>(this EcsSpan span, out TAspect aspect, EcsSubGraphMode mode = EcsSubGraphMode.StartToEnd)
where TAspect : EcsAspect, new() where TAspect : EcsAspect, new()
{ {
span.World.GetQueryCache(out JoinToSubGraphExecutor executor, out aspect); span.World.GetQueryCache(out JoinToSubGraphExecutor executor, out aspect);