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

ECS fixes

Browse source 
-fixed bug with addEntityCopy (on create was called for bad entity, and incorrect block was added to update)
-added function to retrieve Component pointer from Entity (not  template function)
-fixed thread_pool bug
This commit is contained in:
Mergul 2020-08-22 11:37:23 +02:00
parent 64dc099e0a
commit 8960423935
3 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
demos/external/sources/mmutils/thread_pool.d vendored
View file

@ -396,8 +396,8 @@ version (MM_USE_POSIX_THREADS)
void start(DG dg) void start(DG dg)
{ {
threadStart = dg; threadStart = dg;
int ok = pthread_create(&handle, null, &threadRunFunc, cast(void*)&this); int err = pthread_create(&handle, null, &threadRunFunc, cast(void*)&this);
if(!ok)handle = pthread_t(); if(err)handle = pthread_t();
//assert(ok == 0); //assert(ok == 0);
} }

30
source/bubel/ecs/entity.d
View file

@ -34,12 +34,23 @@ struct Entity
*/ */
T* getComponent(T)() const T* getComponent(T)() const
{ {
EntityManager.EntitiesBlock* block = gEM.getMetaData(&this); /*EntityManager.EntitiesBlock* block = gEM.getMetaData(&this);
EntityManager.EntityInfo* info = block.type_info; EntityManager.EntityInfo* info = block.type_info;
if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0) if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0)
return null; return null;
return cast(T*)(cast(void*)block + info.deltas[T.component_id] + block.entityIndex(&this) * T.sizeof); return cast(T*)(cast(void*)block + info.deltas[T.component_id] + block.entityIndex(&this) * T.sizeof);*/
return cast(T*)getComponent(T.component_id);
}
void* getComponent(ushort component_id) const
{
EntityManager.EntitiesBlock* block = gEM.getMetaData(&this);
EntityManager.EntityInfo* info = block.type_info;
if (component_id >= info.deltas.length || info.deltas[component_id] == 0)
return null;
return (cast(void*)block + info.deltas[component_id] + block.entityIndex(&this) * gEM.components[component_id].size);
} }
bool hasComponent(ushort component_id) const bool hasComponent(ushort component_id) const
@ -66,10 +77,21 @@ struct EntityMeta
T* getComponent(T)() const T* getComponent(T)() const
{ {
const (EntityManager.EntityInfo)* info = block.type_info; /*const (EntityManager.EntityInfo)* info = block.type_info;
if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0) if (T.component_id >= info.deltas.length || info.deltas[T.component_id] == 0)
return null; return null;
return cast(T*)(cast(void*)block + block.type_info.deltas[T.component_id] + index * T.sizeof); return cast(T*)(cast(void*)block + info.deltas[T.component_id] + index * T.sizeof);*/
return cast(T*)getComponent(T.component_id);
}
void* getComponent(ushort component_id) const
{
const (EntityManager.EntityInfo)* info = block.type_info;
if (component_id >= info.deltas.length || info.deltas[component_id] == 0)
return null;
return (cast(void*)block + info.deltas[component_id] + index * gEM.components[component_id].size);
} }
bool hasComponent(ushort component_id) const bool hasComponent(ushort component_id) const

6
source/bubel/ecs/manager.d
View file

@ -2513,17 +2513,17 @@ export struct EntityManager
{ {
ushort size = components[comp].size; ushort size = components[comp].size;
if (size != 0) if (size != 0)
memcpy(cast(void*) new_block + info.deltas[comp] + size * new_id, memcpy(cast(void*) new_block + info.deltas[comp] + new_id * size,
cast(void*) block + info.deltas[comp] + size * index, size); cast(void*) block + info.deltas[comp] + size * index, size);
if (components[comp].create_callback) if (components[comp].create_callback)
{ {
components[comp].create_callback( components[comp].create_callback(
cast(void*) block + info.deltas[comp] + new_id * size); cast(void*) new_block + info.deltas[comp] + new_id * size);
} }
} }
if (new_index == 1 && info.update_block == block) if (new_index == 1 && info.update_block == new_block)
threads[threadID].infosToUpdate.add(info); threads[threadID].infosToUpdate.add(info);
Entity* new_entity = cast(Entity*) start; Entity* new_entity = cast(Entity*) start;