AlicizaX/DragonECS-Graphs
1
0
Fork 0
mirror of https://github.com/DCFApixels/DragonECS-Graphs.git synced 2025-09-18 03:34:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

api polishing

Browse Source
This commit is contained in:
DCFApixels 2024-11-22 12:15:29 +08:00
parent 3b57922be3
commit a747b5043c
4 changed files with 96 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/EntityGraph.cs
View File

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

9
src/EntityGraphExtensions.cs
View File

@ -71,6 +71,15 @@ namespace DCFApixels.DragonECS
Throw.UndefinedException();
return null;
}
public static EcsWorld GetGraphWorld(this EcsWorld self)
{
if (self.TryGetGraph(out EntityGraph graph))
{
return graph.GraphWorld;
}
Throw.UndefinedException();
return null;
}
public static bool IsGraphWorld(this EcsWorld self)
{

24
src/Executors/GraphQueries.cs
View File

@ -6,56 +6,56 @@ namespace DCFApixels.DragonECS
public static class GraphQueriesExtensions
{
#region JoinToGraph Empty
public static SubGraphMap JoinGraph(this EcsWorld entities, JoinMode mode = JoinMode.Start)
public static SubGraphMap Join(this EcsWorld entities, JoinMode mode = JoinMode.Start)
{
entities.GetQueryCache(out JoinToSubGraphExecutor executor, out EmptyAspect _);
entities.GetQueryCache(out JoinExecutor executor, out EmptyAspect _);
return executor.Execute(mode);
}
#endregion
#region JoinToGraph Mask
public static SubGraphMap JoinSubGraph<TCollection>(this TCollection entities, IComponentMask mask, JoinMode mode = JoinMode.Start)
public static SubGraphMap Join<TCollection>(this TCollection entities, IComponentMask mask, JoinMode mode = JoinMode.Start)
where TCollection : IEntityStorage
{
if (ReferenceEquals(entities, entities.World))
{
var executor = entities.World.GetExecutorForMask<JoinToSubGraphExecutor>(mask);
var executor = entities.World.GetExecutorForMask<JoinExecutor>(mask);
return executor.Execute();
}
return entities.ToSpan().JoinSubGraph(mask, mode);
}
public static SubGraphMap JoinSubGraph(this EcsReadonlyGroup group, IComponentMask mask, JoinMode mode = JoinMode.Start)
public static SubGraphMap Join(this EcsReadonlyGroup group, IComponentMask mask, JoinMode mode = JoinMode.Start)
{
return group.ToSpan().JoinSubGraph(mask, mode);
}
public static SubGraphMap JoinSubGraph(this EcsSpan span, IComponentMask mask, JoinMode mode = JoinMode.Start)
{
var executor = span.World.GetExecutorForMask<JoinToSubGraphExecutor>(mask);
var executor = span.World.GetExecutorForMask<JoinExecutor>(mask);
return executor.ExecuteFor(span, mode);
}
#endregion
#region JoinToGraph
public static SubGraphMap JoinSubGraph<TCollection, TAspect>(this TCollection entities, out TAspect aspect, JoinMode mode = JoinMode.Start)
public static SubGraphMap Join<TCollection, TAspect>(this TCollection entities, out TAspect aspect, JoinMode mode = JoinMode.Start)
where TAspect : EcsAspect, new()
where TCollection : IEntityStorage
{
if (ReferenceEquals(entities, entities.World))
{
entities.World.GetQueryCache(out JoinToSubGraphExecutor executor, out aspect);
entities.World.GetQueryCache(out JoinExecutor executor, out aspect);
return executor.Execute();
}
return entities.ToSpan().JoinSubGraph(out aspect, mode);
return entities.ToSpan().Join(out aspect, mode);
}
public static SubGraphMap JoinSubGraph<TAspect>(this EcsReadonlyGroup group, out TAspect aspect, JoinMode mode = JoinMode.Start)
where TAspect : EcsAspect, new()
{
return group.ToSpan().JoinSubGraph(out aspect, mode);
return group.ToSpan().Join(out aspect, mode);
}
public static SubGraphMap JoinSubGraph<TAspect>(this EcsSpan span, out TAspect aspect, JoinMode mode = JoinMode.Start)
public static SubGraphMap Join<TAspect>(this EcsSpan span, out TAspect aspect, JoinMode mode = JoinMode.Start)
where TAspect : EcsAspect, new()
{
span.World.GetQueryCache(out JoinToSubGraphExecutor executor, out aspect);
span.World.GetQueryCache(out JoinExecutor executor, out aspect);
return executor.ExecuteFor(span, mode);
}
#endregion

113
src/Executors/JoinToSubGraphExecutor.cs
View File

@ -3,12 +3,13 @@ using DCFApixels.DragonECS.Graphs.Internal;
using DCFApixels.DragonECS.UncheckedCore;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using LinkedList = DCFApixels.DragonECS.Graphs.Internal.OnlyAppendHeadLinkedList;
namespace DCFApixels.DragonECS.Graphs.Internal
{
internal sealed class JoinToSubGraphExecutor : MaskQueryExecutor, IEcsWorldEventListener
internal sealed class JoinExecutor : MaskQueryExecutor, IEcsWorldEventListener
{
private EntityGraph _graph;
private EcsMaskIterator _iterator;
@ -62,6 +63,11 @@ namespace DCFApixels.DragonECS.Graphs.Internal
#region OnInitialize/OnDestroy
protected override void OnInitialize()
{
if (World.IsGraphWorld() == false)
{
Throw.Exception("The JounSubGraph query can only be used for EntityGraph.GraphWorld or a collection of that world.");
}
_versionsChecker = new WorldStateVersionsChecker(Mask);
_linkedList = new OnlyAppendHeadLinkedList(World.Capacity);
_linkedListSourceHeads = new LinkedListHead[World.Capacity];
@ -246,10 +252,10 @@ namespace DCFApixels.DragonECS.Graphs.Internal
#region Internal result methods
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal SubGraphMap.Node GetRelations_Internal(int sourceEntityID)
internal SubGraphMap.NodeInfo GetRelations_Internal(int sourceEntityID)
{
LinkedListHead basket = _linkedListSourceHeads[sourceEntityID];
return new SubGraphMap.Node(_linkedList._nodes, basket.head, basket.count);
return new SubGraphMap.NodeInfo(_linkedList._nodes, basket.head, basket.count);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal int GetRelation_Internal(int sourceEntityID)
@ -291,7 +297,7 @@ namespace DCFApixels.DragonECS.Graphs.Internal
#endregion
#region GetEntites
internal EcsSpan GetSourceEntities()
internal EcsSpan GetNodeEntities()
{
return UncheckedCoreUtility.CreateSpan(WorldID, _sourceEntities, _sourceEntitiesCount);
}
@ -313,47 +319,64 @@ namespace DCFApixels.DragonECS
All = Start | End,
}
#region SubGraphMap/SubGraphMapNode
#region SubGraphMap
public readonly ref struct SubGraphMap
{
private readonly JoinToSubGraphExecutor _executer;
private readonly JoinExecutor _executer;
public EntityGraph Graph
{
get { return _executer.Graph; }
}
internal SubGraphMap(JoinToSubGraphExecutor executer)
internal SubGraphMap(JoinExecutor executer)
{
_executer = executer;
}
public EcsSpan GetSourceEntities()
public EcsSpan WhereNodes<TAspect>(out TAspect a)
where TAspect : EcsAspect, new()
{
return _executer.GetSourceEntities();
return _executer.GetNodeEntities().Where(out a);
}
public EcsSpan GetAllRelEntities()
public EcsSpan WhereNodes<TAspect>(IComponentMask mask)
{
return _executer.GetNodeEntities().Where(mask);
}
public EcsSpan WhereNodes<TAspect>(out TAspect a, Comparison<int> comparison)
where TAspect : EcsAspect, new()
{
return _executer.GetNodeEntities().Where(out a, comparison);
}
public EcsSpan WhereNodes<TAspect>(IComponentMask mask, Comparison<int> comparison)
{
return _executer.GetNodeEntities().Where(mask, comparison);
}
public EcsSpan GetNodes()
{
return _executer.GetNodeEntities();
}
public EcsSpan GetAllRelations()
{
return _executer.GetRelEntities();
}
public Node GetRelations(int startEntityID)
public NodeInfo GetRelations(int nodeEntityID)
{
return _executer.GetRelations_Internal(startEntityID);
}
public int GetRelation(int startEntityID)
{
return _executer.GetRelation_Internal(startEntityID);
}
public int GetRelationsCount(int startEntityID)
{
return _executer.GetRelationsCount_Internal(startEntityID);
return _executer.GetRelations_Internal(nodeEntityID);
}
public readonly ref struct Node
public int GetRelation(int nodeEntityID)
{
public static Node Empty
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return new Node(null, 0, 0); }
}
return _executer.GetRelation_Internal(nodeEntityID);
}
public int GetRelationsCount(int nodeEntityID)
{
return _executer.GetRelationsCount_Internal(nodeEntityID);
}
[DebuggerTypeProxy(typeof(DebuggerProxy))]
public readonly ref struct NodeInfo
{
private readonly LinkedList.Node[] _nodes;
private readonly LinkedList.NodeIndex _startNodeIndex;
private readonly int _count;
@ -362,20 +385,8 @@ namespace DCFApixels.DragonECS
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return _count; }
}
private IEnumerable<int> E
{
get
{
List<int> result = new List<int>();
foreach (var item in this)
{
result.Add(item);
}
return result;
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal Node(LinkedList.Node[] nodes, LinkedList.NodeIndex startNodeIndex, int count)
internal NodeInfo(LinkedList.Node[] nodes, LinkedList.NodeIndex startNodeIndex, int count)
{
_nodes = nodes;
_startNodeIndex = startNodeIndex;
@ -414,6 +425,30 @@ namespace DCFApixels.DragonECS
//return _count-- > 0;
}
}
private class DebuggerProxy
{
private readonly LinkedList.Node[] _nodes;
private readonly LinkedList.NodeIndex _startNodeIndex;
private readonly int _count;
private IEnumerable<int> Entities
{
get
{
List<int> result = new List<int>();
foreach (var item in new NodeInfo(_nodes, _startNodeIndex, _count))
{
result.Add(item);
}
return result;
}
}
public DebuggerProxy(NodeInfo node)
{
_nodes = node._nodes;
_startNodeIndex = node._startNodeIndex;
_count = node._count;
}
}
}
}
#endregion