diff --git a/source/ecs/manager.d b/source/ecs/manager.d
index d04a516..a5443ce 100644
--- a/source/ecs/manager.d
+++ b/source/ecs/manager.d
@@ -95,7 +95,7 @@ class EntityManager
{
if (system.m_update is null)
{
- if (system.m_entity_added || system.m_entity_removed)
+ if (system.m_add_entity || system.m_remove_entity)
{
foreach (info; &entities_infos.byValue)
{
@@ -570,7 +570,7 @@ class EntityManager
string genParamsChecking()()
{
string ret;
- foreach (func; __traits(getOverloads, Sys, "update"))
+ foreach (func; __traits(getOverloads, Sys, "onUpdate"))
{
if ((Parameters!(func)).length == 1)
ret ~= "\"" ~ (fullyQualifiedName!(Sys.EntitiesData)) ~ "\" == \"" ~ (
@@ -650,7 +650,7 @@ class EntityManager
mixin(genFillInputData());
}
- static if (hasMember!(Sys, "update") && (mixin(genParamsChecking())))
+ static if (hasMember!(Sys, "onUpdate") && (mixin(genParamsChecking())))
{
static void callUpdate(ref CallData data)
{
@@ -691,7 +691,7 @@ class EntityManager
fillInputData(input_data, info, block, offset, entities_count, system);
//mixin(genFillInputData());
- s.update(input_data);
+ s.onUpdate(input_data);
block = block.next_block;
offset = 0;
@@ -759,8 +759,8 @@ class EntityManager
mixin(catchFunc!(bool)("m_begin", "onBegin"));
mixin(catchFunc("m_end", "onEnd"));
- mixin(catchEntityFunc("m_entity_added", "onAdd"));
- mixin(catchEntityFunc("m_entity_removed", "onRemove"));
+ mixin(catchEntityFunc("m_add_entity", "onAddEntity"));
+ mixin(catchEntityFunc("m_remove_entity", "onRemoveEntity"));
system.m_system_pointer = cast(void*) Mallocator.instance.make!Sys;
system.m_priority = priority;
@@ -1210,10 +1210,10 @@ class EntityManager
foreach (i, ref system; systems)
{
- //if(system.m_entity_added || system.m_entity_removed)info.systems[system.id] = true;
+ //if(system.m_add_entity || system.m_remove_entity)info.systems[system.id] = true;
if (system.m_update is null)
{
- if (system.m_entity_added || system.m_entity_removed)
+ if (system.m_add_entity || system.m_remove_entity)
connectListenerToEntityInfo(*info, cast(uint) i);
continue;
}
@@ -1253,7 +1253,7 @@ class EntityManager
{
System* system = &systems[i];
//onAddEntity listener
- if (system.m_entity_added)
+ if (system.m_add_entity)
{
//find listener position by priority
int j;
@@ -1272,7 +1272,7 @@ class EntityManager
tmp_add[j] = cast(ushort) i;
}
//onRemoveEntity listener
- if (system.m_entity_removed)
+ if (system.m_remove_entity)
{
//find listener position by priority
int j;
@@ -2002,7 +2002,7 @@ class EntityManager
data.block = block;
data.begin = begin;
data.end = end;
- (cast(void function(ref ListenerCallData) nothrow @nogc) system.m_entity_added)(data);
+ (cast(void function(ref ListenerCallData) nothrow @nogc) system.m_add_entity)(data);
}
private void callRemoveEntityListeners(EntityInfo* info, EntitiesBlock* block, int begin,
@@ -2023,7 +2023,7 @@ class EntityManager
data.block = block;
data.begin = begin;
data.end = end;
- (cast(void function(ref ListenerCallData) nothrow @nogc) system.m_entity_removed)(data);
+ (cast(void function(ref ListenerCallData) nothrow @nogc) system.m_remove_entity)(data);
}
private void updateBlocks()
diff --git a/source/ecs/system.d b/source/ecs/system.d
index 9b377cf..d3d2b31 100644
--- a/source/ecs/system.d
+++ b/source/ecs/system.d
@@ -9,15 +9,15 @@ import ecs.manager;
/************************************************************************************************************************
*System contain data required to proper glue EntityManager with Systems.
*System callbacks:
-*
-void update(EntitesData);
+*
-void onUpdate(EntitesData);
*
-void onEnable()
*
-void onDisable();
*
-bool onBegin();
*
-void onEnd();
*
-void onCreate()
*
-void onDestroy();
-*
-void onAdd(EntitesData);
-*
-void onRemove(EntitiesData);
+*
-void onAddEntity(EntitesData);
+*
-void onRemoveEntity(EntitiesData);
*/
struct System
{
@@ -135,8 +135,8 @@ package:
void* m_begin;
void* m_end;
- void* m_entity_added;
- void* m_entity_removed;
+ void* m_add_entity;
+ void* m_remove_entity;
//void function(ref EntityManager.CallData data) m_initialize;
//void function(ref EntityManager.CallData data) m_deinitilize;
diff --git a/tests/tests.d b/tests/tests.d
index 4fa8515..1206732 100644
--- a/tests/tests.d
+++ b/tests/tests.d
@@ -108,13 +108,13 @@ struct ChangeTestSystem
writeln("On Change Test System destroy.");
}
- void onAdd(EntitiesData data)
+ void onAddEntity(EntitiesData data)
{
foreach(i;0..data.length)
writeln("Entity added ID: ",data.entites[i].id.id);
}
- void onRemove(EntitiesData data)
+ void onRemoveEntity(EntitiesData data)
{
writeln("Entity removed ID: ",data.entites[0].id);
}
@@ -142,7 +142,7 @@ struct ChangeTestSystem
TestComp4[] test4;
}
- void update(EntitiesData data)
+ void onUpdate(EntitiesData data)
{
foreach(i;0..data.length)
{
@@ -165,13 +165,13 @@ struct TestSystem
writeln("On Test System destroy.");
}
- void onAdd(EntitiesData data)
+ void onAddEntity(EntitiesData data)
{
//foreach(i;0..data.length)
//writeln("Entity added ID: ",data.entites[i].id.id);
}
/*
- void onRemove(EntitiesData data)
+ void onRemoveEntity(EntitiesData data)
{
//writeln("Entity destroyed ID: ",data.entites[0].id);
}*/
@@ -202,7 +202,7 @@ struct TestSystem
//@excluded TestComp4[] test4;
}
- void update(ref Entity entity, ref TestComp test, ref TestComp2 test2)//, TestComp3* test3) //ref TestComp comp)
+ void onUpdate(ref Entity entity, ref TestComp test, ref TestComp2 test2)//, TestComp3* test3) //ref TestComp comp)
{
assert(cast(size_t)&test % TestComp.alignof == 0);
assert(cast(size_t)&test2 % TestComp2.alignof == 0);
@@ -214,7 +214,7 @@ struct TestSystem
test2.a = 8;
}
- void update(EntitiesData data)
+ void onUpdate(EntitiesData data)
{
foreach(i;0..data.length)
{
@@ -245,7 +245,7 @@ struct TestSystemWithHighPriority
int o = 1;
}
- void update(EntitiesData data)
+ void onUpdate(EntitiesData data)
{
}
@@ -265,7 +265,7 @@ struct Sys1
TestComp[] comp;
}
- void onAdd(EntitiesData data)
+ void onAddEntity(EntitiesData data)
{
}
@@ -280,7 +280,7 @@ struct Sys2
TestComp[] comp;
}
- void onAdd(EntitiesData data)
+ void onAddEntity(EntitiesData data)
{
}
@@ -295,12 +295,12 @@ struct Sys3
TestComp[] comp;
}
- void onAdd(EntitiesData data)
+ void onAddEntity(EntitiesData data)
{
}
- void update(EntitiesData data)
+ void onUpdate(EntitiesData data)
{
}
@@ -370,7 +370,7 @@ struct TestSystem2
}
- void update(EntitiesData data)
+ void onUpdate(EntitiesData data)
{
foreach(i;0..data.test.length)
{