Merge branch 'master' into c-api

This commit is contained in:
Mergul 2021-11-17 15:15:46 +01:00
commit 6e45e7b053
7 changed files with 31 additions and 47 deletions

View file

@ -2040,29 +2040,11 @@ export struct EntityManager
void addComponents(Components...)(const EntityID entity_id, Components comps) nothrow @nogc
{
const uint num = Components.length;
/*ushort[num] new_ids;
static foreach (i, comp; Components)
{
new_ids[i] = comp.component_id;
}
ThreadData* data = &threads[threadID];
data.changeEntitiesList.add(cast(ubyte) 1u);
data.changeEntitiesList.add((cast(ubyte*)&entity_id)[0 .. EntityID.sizeof]);
data.changeEntitiesList.add((cast(ubyte*)&num)[0 .. uint.sizeof]);
data.changeEntitiesList.add(cast(ubyte[]) new_ids);
static foreach (i, comp; comps)
{
data.changeEntitiesList.add((cast(ubyte*)&comp)[0 .. comp.sizeof]);
}*/
//__addComponents(entity_id, new_ids, pointers);
ComponentRef[num] _comps;
static foreach (i, comp; comps)
{
_comps[i] = comp.ref_;
_comps[i] = ComponentRef(&comp, becsID!(typeof(comp)));
}
addComponents(entity_id, _comps);
@ -2085,11 +2067,6 @@ export struct EntityManager
data.changeEntitiesList.add(
(cast(ubyte*) ref_.ptr)[0 .. components[ref_.component_id].size]);
}
/*data.changeEntitiesList.add(cast(ubyte[]) new_ids);
static foreach (i, comp; comps)
{
data.changeEntitiesList.add((cast(ubyte*)&comp)[0 .. comp.sizeof]);
}*/
}
/************************************************************************************************************************