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

add delete entity buffer

Browse Source
This commit is contained in:
Mikhail 2023-04-20 11:37:27 +08:00
parent 8ce6fc4861
commit 0d4da6325c
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/EcsWorld.cs
View File

@ -2,7 +2,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEditor.Search;
namespace DCFApixels.DragonECS namespace DCFApixels.DragonECS
{ {
@ -43,14 +42,18 @@ namespace DCFApixels.DragonECS
public abstract class EcsWorld<TWorldArchetype> : EcsWorld, IEcsWorld public abstract class EcsWorld<TWorldArchetype> : EcsWorld, IEcsWorld
where TWorldArchetype : EcsWorld<TWorldArchetype> where TWorldArchetype : EcsWorld<TWorldArchetype>
{ {
private const int DEL_ENT_BUFFER_SIZE_OFFSET = 2;
private readonly int _worldArchetypeID = ComponentIndexer.GetWorldId<TWorldArchetype>(); private readonly int _worldArchetypeID = ComponentIndexer.GetWorldId<TWorldArchetype>();
private IntDispenser _entityDispenser; private IntDispenser _entityDispenser;
private int _entitiesCount; private int _entitiesCount;
private int _entitesCapacity; private int _entitesCapacity;
private short[] _gens; //старший бит указывает на то жива ли сущьность. private short[] _gens; //старший бит указывает на то жива ли сущьность.
private EcsGroup _allEntites;
//private short[] _componentCounts; //TODO //private short[] _componentCounts; //TODO
private EcsGroup _allEntites;
private int[] _delEntBuffer; //буфер удаления нужен для того чтобы запускать некоторые процесыы связанные с удалением сущьности не по одному при каждом удалении, а пачкой
private int _delEntBufferCount;
private EcsPool[] _pools; private EcsPool[] _pools;
private EcsNullPool _nullPool; private EcsNullPool _nullPool;
@ -93,6 +96,8 @@ namespace DCFApixels.DragonECS
_gens = new short[512]; _gens = new short[512];
_entitesCapacity = _gens.Length; _entitesCapacity = _gens.Length;
_delEntBufferCount = 0;
_delEntBuffer = new int[_gens.Length >> DEL_ENT_BUFFER_SIZE_OFFSET];
_groups = new List<WeakReference<EcsGroup>>(); _groups = new List<WeakReference<EcsGroup>>();
_allEntites = GetGroupFromPool(); _allEntites = GetGroupFromPool();
@ -128,17 +133,9 @@ namespace DCFApixels.DragonECS
} }
#endregion #endregion
#region Query #region Queries
public TQuery Where<TQuery>(out TQuery query) where TQuery : EcsQueryBase public TQuery Where<TQuery>(out TQuery query) where TQuery : EcsQueryBase
{ {
//int uniqueID = QueryType<TQuery>.uniqueID;
//if (_queries.Length < QueryType.capacity)
// Array.Resize(ref _queries, QueryType.capacity);
//if (_queries[uniqueID] == null)
// _queries[uniqueID] = EcsQueryBase.Builder.Build<TQuery>(this);
//query = (TQuery)_queries[uniqueID];
//query.Where();
//return query;
query = Select<TQuery>(); query = Select<TQuery>();
query.Execute(); query.Execute();
return query; return query;
@ -215,10 +212,20 @@ namespace DCFApixels.DragonECS
public void DelEntity(EcsEntity entity) public void DelEntity(EcsEntity entity)
{ {
_allEntites.Remove(entity.id); _allEntites.Remove(entity.id);
_entityDispenser.Release(entity.id); _delEntBuffer[_delEntBufferCount++] = entity.id;
_gens[entity.id] |= short.MinValue; _gens[entity.id] |= short.MinValue;
_entitiesCount--; _entitiesCount--;
_entityDestry.OnEntityDestroy(entity); _entityDestry.OnEntityDestroy(entity);
if(_delEntBufferCount >= _delEntBuffer.Length)
ReleaseDelEntBuffer();
}
private void ReleaseDelEntBuffer()//TODO проверить что буфер удаления работает нормально
{
for (int i = 0; i < _delEntBufferCount; i++)
_entityDispenser.Release(_delEntBuffer[i]);
_delEntBufferCount = 0;
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]

6
src/Entities/ent.cs
View File

@ -9,12 +9,12 @@ namespace DCFApixels.DragonECS
[StructLayout(LayoutKind.Sequential, Pack = 4, Size = 4)] [StructLayout(LayoutKind.Sequential, Pack = 4, Size = 4)]
public readonly ref struct ent public readonly ref struct ent
{ {
[MarshalAs(UnmanagedType.I4)]
internal readonly int id; internal readonly int id;
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
internal ent(int id) => this.id = id; internal ent(int id) => this.id = id;
//public static explicit operator ent(int uniqueID) => new ent(uniqueID); public static implicit operator int(ent entityID) => entityID.id;
public static explicit operator int(ent entityID) => entityID.id;
public static bool operator ==(ent a, ent b) => a.id == b.id; public static bool operator ==(ent a, ent b) => a.id == b.id;
public static bool operator !=(ent a, ent b) => a.id != b.id; public static bool operator !=(ent a, ent b) => a.id != b.id;
@ -27,6 +27,6 @@ namespace DCFApixels.DragonECS
public struct Null { } public struct Null { }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public EcsEntity ToStrong(IEcsWorld world) => world.GetEcsEntity(id); public EcsEntity ToStrongID(IEcsWorld world) => world.GetEcsEntity(id);
} }
} }