Compare commits

..

No commits in common. "e2a6fd1c6b724701936f886525483fa2dbd3acb1" and "21b891b44cec0709168fb21e3ce82c271bfdfca3" have entirely different histories.

3 changed files with 5 additions and 32 deletions

View File

@ -8,7 +8,7 @@
"displayName": "DragonECS-Graphs",
"description": "Entity Graphs for DragonECS",
"unity": "2020.3",
"version": "0.3.5",
"version": "0.3.4",
"repository": {
"type": "git",
"url": "https://github.com/DCFApixels/DragonECS-Graphs.git"

View File

@ -10,10 +10,10 @@ namespace DCFApixels.DragonECS
[MetaID("DragonECS_ECC4CF479301897718600925B00A7DB4")]
public sealed class EcsGraphWorld : EcsWorld, IInjectionUnit, IInjectionBlock
{
private const string DEFAULT_NAME = "Graph";
public EcsGraphWorld() : base(default(EcsWorldConfig), DEFAULT_NAME) { }
public EcsGraphWorld(EcsWorldConfig config = null, string name = null, short worldID = -1) : base(config, name == null ? DEFAULT_NAME : name, worldID) { }
public EcsGraphWorld(IConfigContainer configs, string name = null, short worldID = -1) : base(configs, name == null ? DEFAULT_NAME : name, worldID) { }
public EcsGraphWorld() : base() { }
public EcsGraphWorld(EcsWorldConfig config = null, string name = null, short worldID = -1) : base(config, name == null ? "Default" : name, worldID) { }
public EcsGraphWorld(IConfigContainer configs, string name = null, short worldID = -1) : base(configs, name == null ? "Default" : name, worldID) { }
void IInjectionUnit.InitInjectionNode(InjectionGraph nodes)
{
nodes.AddNode(this);

View File

@ -88,29 +88,11 @@ namespace DCFApixels.DragonECS
{
if (_matrix.TryGetValue(startEntityID, endEntityID, out int relEntityID))
{
#if DEBUG && DRAGONECS_DEEP_DEBUG
if(_graphWorld.IsUsed(relEntityID) == false)
{
throw new InvalidOperationException();
}
var (s, e) = GetRelationStartEnd(relEntityID);
if (s != startEntityID || e != endEntityID)
{
throw new InvalidOperationException();
}
#endif
return relEntityID;
}
return NewRelationInternal(startEntityID, endEntityID);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOrNewRelationNoDirection(int entityID, int otherEntityID)
{
return GetOrNewRelation(
entityID < otherEntityID ? entityID : otherEntityID,
entityID > otherEntityID ? entityID : otherEntityID);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOrNewInverseRelation(int relEntityID)
{
#if DEBUG || !DISABLE_DRAGONECS_ASSERT_CHEKS
@ -124,15 +106,6 @@ namespace DCFApixels.DragonECS
private int NewRelationInternal(int startEntityID, int endEntityID)
{
int relEntityID = _graphWorld.NewEntity();
#if DEBUG && DRAGONECS_DEEP_DEBUG
var (s, e) = GetRelationStartEnd(relEntityID);
if (s != 0 || e != 0)
{
throw new InvalidOperationException();
}
#endif
_matrix.Add(startEntityID, endEntityID, relEntityID);
_relEntityInfos[relEntityID] = new RelationInfo(startEntityID, endEntityID);
_count++;