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

update

Browse Source
This commit is contained in:
Mikhail 2024-01-11 00:48:39 +08:00
parent bf9809f3e6
commit 6ebda350a3
5 changed files with 132 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/DataInterfaces.cs
View File

@ -1,7 +1,26 @@
using System;
using System.Linq;
using System.Runtime.CompilerServices;
using static DCFApixels.DragonECS.Internal.DataInterfaceHalper;
namespace DCFApixels.DragonECS.Internal
{
#region DataInterfaceHalper
public static class DataInterfaceHalper
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void CheckFakeInstanceValide<T>(T fakeInstnace)
{
#if DEBUG
if (fakeInstnace.Equals(default) == false)
{
throw new Exception("Не правильное применение интерфейса, менять нужно передаваемое по ref значение");
}
#endif
}
}
#endregion
}
namespace DCFApixels.DragonECS
{
#region IEcsWorldComponent
@ -34,13 +53,22 @@ namespace DCFApixels.DragonECS
public void OnDestroy(ref T component, EcsWorld world) { }
}
}
internal class WorldComponentHandler<T> : IEcsWorldComponent<T>
where T : IEcsWorldComponent<T>
internal sealed class WorldComponentHandler<T> : IEcsWorldComponent<T>
where T : struct, IEcsWorldComponent<T>
{
private T _fakeInstnace = default;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Init(ref T component, EcsWorld world) => _fakeInstnace.Init(ref component, world);
public void OnDestroy(ref T component, EcsWorld world) => _fakeInstnace.OnDestroy(ref component, world);
public void Init(ref T component, EcsWorld world)
{
_fakeInstnace.Init(ref component, world);
CheckFakeInstanceValide(_fakeInstnace);
}
public void OnDestroy(ref T component, EcsWorld world)
{
_fakeInstnace.OnDestroy(ref component, world);
CheckFakeInstanceValide(_fakeInstnace);
}
}
#endregion
@ -77,7 +105,11 @@ namespace DCFApixels.DragonECS
{
private T _fakeInstnace = default;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Reset(ref T component) => _fakeInstnace.Reset(ref component);
public void Reset(ref T component)
{
_fakeInstnace.Reset(ref component);
CheckFakeInstanceValide(_fakeInstnace);
}
}
#endregion
@ -114,7 +146,11 @@ namespace DCFApixels.DragonECS
{
private T _fakeInstnace = default;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Copy(ref T from, ref T to) => _fakeInstnace.Copy(ref from, ref to);
public void Copy(ref T from, ref T to)
{
_fakeInstnace.Copy(ref from, ref to);
CheckFakeInstanceValide(_fakeInstnace);
}
}
#endregion
}

9
src/EcsAspect.cs
View File

@ -40,7 +40,7 @@ namespace DCFApixels.DragonECS
private Builder(EcsWorld world)
{
_world = world;
_maskBuilder = new EcsMask.Builder(world);
_maskBuilder = EcsMask.New(world);
}
internal static unsafe TAspect New<TAspect>(EcsWorld world) where TAspect : EcsAspect
{
@ -113,16 +113,11 @@ namespace DCFApixels.DragonECS
public TOtherAspect Combine<TOtherAspect>(int order = 0) where TOtherAspect : EcsAspect
{
var result = _world.GetAspect<TOtherAspect>();
_maskBuilder.CombineWith(result.Mask);
_maskBuilder.Combine(result.Mask);
return result;
}
#endregion
public EcsWorldCmp<T> GetWorldData<T>() where T : struct
{
return new EcsWorldCmp<T>(_world.id);
}
private void Build(out EcsMask mask)
{
mask = _maskBuilder.Build();

124
src/EcsMask.cs
View File

@ -7,20 +7,6 @@ using System.Runtime.CompilerServices;
namespace DCFApixels.DragonECS
{
public abstract partial class EcsWorld
{
private Dictionary<EcsMask.BuilderMaskKey, EcsMask> _masks = new Dictionary<EcsMask.BuilderMaskKey, EcsMask>(256);
internal EcsMask GetMask_Internal(EcsMask.BuilderMaskKey maskKey)
{
if (!_masks.TryGetValue(maskKey, out EcsMask result))
{
result = new EcsMask(_masks.Count, id, maskKey.inc, maskKey.exc);
_masks.Add(maskKey, result);
}
return result;
}
}
[DebuggerTypeProxy(typeof(DebuggerProxy))]
public sealed class EcsMask : IEquatable<EcsMask>
{
@ -42,6 +28,10 @@ namespace DCFApixels.DragonECS
#endregion
#region Constructors
public static Builder New(EcsWorld world)
{
return new Builder(world);
}
internal EcsMask(int id, int worldID, int[] inc, int[] exc)
{
#if DEBUG
@ -168,19 +158,69 @@ namespace DCFApixels.DragonECS
#endregion
#region Builder
public readonly struct BuilderMaskKey : IEquatable<BuilderMaskKey>
private readonly struct WorldMaskComponent : IEcsWorldComponent<WorldMaskComponent>
{
private readonly EcsWorld _world;
private readonly Dictionary<Key, EcsMask> _masks;
#region Constructor/Destructor
public WorldMaskComponent(EcsWorld world, Dictionary<Key, EcsMask> masks)
{
_world = world;
_masks = masks;
}
public void Init(ref WorldMaskComponent component, EcsWorld world)
{
component = new WorldMaskComponent(world, new Dictionary<Key, EcsMask>(256));
}
public void OnDestroy(ref WorldMaskComponent component, EcsWorld world)
{
component._masks.Clear();
component = default;
}
#endregion
#region GetMask
internal EcsMask GetMask(Key maskKey)
{
if (!_masks.TryGetValue(maskKey, out EcsMask result))
{
result = new EcsMask(_masks.Count, _world.id, maskKey.inc, maskKey.exc);
_masks.Add(maskKey, result);
}
return result;
}
#endregion
}
private readonly struct Key : IEquatable<Key>
{
public readonly int[] inc;
public readonly int[] exc;
public readonly int hash;
public BuilderMaskKey(int[] inc, int[] exc, int hash)
#region Constructors
public Key(int[] inc, int[] exc)
{
this.inc = inc;
this.exc = exc;
this.hash = hash;
unchecked
{
hash = inc.Length + exc.Length;
for (int i = 0, iMax = inc.Length; i < iMax; i++)
{
hash = hash * EcsConsts.MAGIC_PRIME + inc[i];
}
for (int i = 0, iMax = exc.Length; i < iMax; i++)
{
hash = hash * EcsConsts.MAGIC_PRIME - exc[i];
}
}
}
#endregion
#region Object
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool Equals(BuilderMaskKey other)
public bool Equals(Key other)
{
if (inc.Length != other.inc.Length)
{
@ -204,16 +244,11 @@ namespace DCFApixels.DragonECS
return false;
}
}
#if DEBUG
if (other.hash != hash)
{
throw new Exception("other.hash != hash");
}
#endif
return true;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override int GetHashCode() => hash;
#endregion
}
public class Builder
@ -223,49 +258,58 @@ namespace DCFApixels.DragonECS
private readonly HashSet<int> _exc = new HashSet<int>();
private readonly List<Combined> _combined = new List<Combined>();
#region Constrcutors
internal Builder(EcsWorld world)
{
_world = world;
}
#endregion
public void Include<T>()
#region Include/Exclude/Combine
public Builder Include<T>()
{
int id = _world.GetComponentID<T>();
#if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
if (_inc.Contains(id) || _exc.Contains(id)) Throw.ConstraintIsAlreadyContainedInMask(typeof(T));
#endif
_inc.Add(id);
return this;
}
public void Exclude<T>()
public Builder Exclude<T>()
{
int id = _world.GetComponentID<T>();
#if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
if (_inc.Contains(id) || _exc.Contains(id)) Throw.ConstraintIsAlreadyContainedInMask(typeof(T));
#endif
_exc.Add(id);
return this;
}
public void Include(Type type)
public Builder Include(Type type)
{
int id = _world.GetComponentID(type);
#if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
if (_inc.Contains(id) || _exc.Contains(id)) Throw.ConstraintIsAlreadyContainedInMask(type);
#endif
_inc.Add(id);
return this;
}
public void Exclude(Type type)
public Builder Exclude(Type type)
{
int id = _world.GetComponentID(type);
#if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
if (_inc.Contains(id) || _exc.Contains(id)) Throw.ConstraintIsAlreadyContainedInMask(type);
#endif
_exc.Add(id);
return this;
}
public void CombineWith(EcsMask mask, int order = 0)
public Builder Combine(EcsMask mask, int order = 0)
{
_combined.Add(new Combined(mask, order));
return this;
}
#endregion
#region Build
public EcsMask Build()
{
HashSet<int> combinedInc;
@ -296,24 +340,16 @@ namespace DCFApixels.DragonECS
var inc = combinedInc.ToArray();
Array.Sort(inc);
_inc.Clear();
var exc = combinedExc.ToArray();
Array.Sort(exc);
_exc.Clear();
unchecked
{
int keyHash = inc.Length + exc.Length;
for (int i = 0, iMax = inc.Length; i < iMax; i++)
{
keyHash = keyHash * EcsConsts.MAGIC_PRIME + inc[i];
}
for (int i = 0, iMax = exc.Length; i < iMax; i++)
{
keyHash = keyHash * EcsConsts.MAGIC_PRIME - exc[i];
}
BuilderMaskKey key = new BuilderMaskKey(inc, exc, keyHash);
return _world.GetMask_Internal(key);
}
_combined.Clear();
return _world.Get<WorldMaskComponent>().GetMask(new Key(inc, exc));
}
#endregion
}
private readonly struct Combined

8
src/EcsWorld.pools.cs
View File

@ -23,6 +23,14 @@ namespace DCFApixels.DragonECS
public int GetComponentID(Type type) => DeclareComponentType(EcsTypeCode.Get(type));
public bool IsComponentTypeDeclared<T>() => _componentIds.Contains(EcsTypeCode.Get<T>());
public bool IsComponentTypeDeclared(Type type) => _componentIds.Contains(EcsTypeCode.Get(type));
public bool IsComponentTypeDeclared(int componentTypeID)
{
if(componentTypeID >= 0 && componentTypeID < _pools.Length)
{
return _pools[componentTypeID] != _nullPool;
}
return false;
}
public Type GetComponentType(int componentID) => _pools[componentID].ComponentType;
#endregion

2
src/EcsWorld.static.cs
View File

@ -81,9 +81,7 @@ namespace DCFApixels.DragonECS
if (_mapping.Length < Worlds.Length)
{
Array.Resize(ref _mapping, Worlds.Length);
}
ref short itemIndex = ref _mapping[worldID];
if (itemIndex <= 0)
{