Bubel/bubel-ecs
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

-onRemove() called when entity is removed from EntityManager

Browse source
This commit is contained in:
Mergul 2019-03-23 21:47:39 +00:00
parent 1841c9c244
commit e4be23ee96
2 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
source/ecs/manager.d
View file

@ -1718,6 +1718,19 @@ class EntityManager
if (entity is null) if (entity is null)
return; //return if entity doesn't exist return; //return if entity doesn't exist
EntitiesBlock* block = getMetaData(entity); EntitiesBlock* block = getMetaData(entity);
EntityInfo* info = block.type_info;
if(info.remove_listeners)
{
void* data_begin = block.dataBegin();
static if (EntityID.sizeof == 8)
uint pos = cast(uint)((cast(void*) entity - data_begin) >> 3);
else
uint pos = cast(uint)((cast(void*) entity - data_begin) / EntityID.sizeof());
callRemoveEntityListeners(info,block,pos,pos+1);
}
id_manager.releaseID(id); //release id from manager id_manager.releaseID(id); //release id from manager
removeEntityNoID(entity, block, true); removeEntityNoID(entity, block, true);
@ -1834,7 +1847,7 @@ class EntityManager
} }
} }
private void callAddEntityListeners(EntityInfo* info, EntitiesBlock* block, int begin, int end) private void callAddEntityListeners(EntityInfo* info, EntitiesBlock* block, int begin, int end) @nogc nothrow
{ {
foreach(listener;info.add_listeners) foreach(listener;info.add_listeners)
{ {
@ -1844,7 +1857,21 @@ class EntityManager
data.block = block; data.block = block;
data.begin = begin; data.begin = begin;
data.end = end; data.end = end;
(cast(void function (ref ListenerCallData)) system.m_entity_added)(data); (cast(void function (ref ListenerCallData) nothrow @nogc) system.m_entity_added)(data);
}
}
private void callRemoveEntityListeners(EntityInfo* info, EntitiesBlock* block, int begin, int end) @nogc nothrow
{
foreach(listener;info.add_listeners)
{
System* system = &systems[listener];
ListenerCallData data;
data.system = system;
data.block = block;
data.begin = begin;
data.end = end;
(cast(void function (ref ListenerCallData) nothrow @nogc) system.m_entity_removed)(data);
} }
} }

4
tests/tests.d
View file

@ -114,10 +114,10 @@ struct TestSystem
//writeln("Entity added ID: ",data.entites[i].id.id); //writeln("Entity added ID: ",data.entites[i].id.id);
} }
/*void onRemove(EntitiesData data) void onRemove(EntitiesData data)
{ {
//writeln("Entity destroyed ID: ",data.entites[0].id); //writeln("Entity destroyed ID: ",data.entites[0].id);
}*/ }
bool onBegin() bool onBegin()
{ {