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

-update README code example (to one that compile)

Browse source 
-remove Entity.instance and gEM, global manager is now gEntityManager
This commit is contained in:
Mergul 2021-03-02 19:44:18 +01:00
parent d1c48e4c5f
commit 3b954b732b
11 changed files with 617 additions and 604 deletions
Download patch file Download diff file Expand all files Collapse all files

12
demos/source/app.d
View file

@ -192,7 +192,7 @@ struct Launcher
{
vec2 rel_vec = data.location[i] - position;
float length = rel_vec.x * rel_vec.x + rel_vec.y * rel_vec.y;
if(length < size2)gEM.removeEntity(data.entity[i].id);
if(length < size2)gEntityManager.removeEntity(data.entity[i].id);
}
}
@ -203,7 +203,7 @@ struct Launcher
{
vec2 rel_vec = data.location[i] - position;
float length = rel_vec.x * rel_vec.x + rel_vec.y * rel_vec.y;
if(length < size2)gEM.addComponents(data.entity[i].id, add_comps);
if(length < size2)gEntityManager.addComponents(data.entity[i].id, add_comps);
}
}
@ -216,8 +216,8 @@ struct Launcher
float length = rel_vec.x * rel_vec.x + rel_vec.y * rel_vec.y;
if(length < size2)
{
gEM.removeComponents(data.entity[i].id, rem_comps);
gEM.addComponents(data.entity[i].id, add_comps);
gEntityManager.removeComponents(data.entity[i].id, rem_comps);
gEntityManager.addComponents(data.entity[i].id, add_comps);
}
}
}
@ -229,7 +229,7 @@ struct Launcher
{
vec2 rel_vec = data.location[i] - position;
float length = rel_vec.x * rel_vec.x + rel_vec.y * rel_vec.y;
if(length < size2)gEM.removeComponents(data.entity[i].id, rem_comps);
if(length < size2)gEntityManager.removeComponents(data.entity[i].id, rem_comps);
}
}
@ -1231,7 +1231,7 @@ int app_main(int argc, char** argv)
//launcher.job_updater.onCreate();
EntityManager.initialize(32, 1<<16);
launcher.manager = EntityManager.instance;
launcher.manager = gEntityManager;
//launcher.manager.m_thread_id_func = &launcher.job_updater.getThreadID;
//launcher.manager.setJobDispachFunc(&launcher.job_updater.dispatch);

4
demos/source/game_core/collision.d
View file

@ -188,7 +188,7 @@ struct ShootGridCleaner
bool onBegin()
{
grid = gEM.getSystem!ShootGridManager().grid;
grid = gEntityManager.getSystem!ShootGridManager().grid;
if(grid != null)return true;
else return false;
}
@ -964,7 +964,7 @@ struct BVHBuilder2
void onCreate()
{
tree = gEM.getSystem!BVHBuilder().tree;
tree = gEntityManager.getSystem!BVHBuilder().tree;
}
bool onBegin()

6
demos/source/gui/manager.d
View file

@ -119,7 +119,7 @@ struct GUIManager
// void addComponent(ComponentRef comp, const (char)* name)
// {
// uint size = EntityManager.instance.components[becsID(comp)].size;
// uint size = gEntityManager.components[becsID(comp)].size;
// void* data = malloc(size);
// memcpy(data, comp.ptr, size);
// components.add(ComponentGUI(name, data, becsID(comp)));
@ -127,7 +127,7 @@ struct GUIManager
void addComponent(T)(T comp, const (char)* name)
{
uint size = EntityManager.instance.components[becsID(comp)].size;
uint size = gEntityManager.components[becsID(comp)].size;
void* data = malloc(size);
memcpy(data, &comp, size);
components.add(ComponentGUI(name, data, becsID(comp)));
@ -472,7 +472,7 @@ struct GUIManager
break;
case Tool.selector:
{
Entity* entity = gEM.getEntity(launcher.selected_entity);
Entity* entity = gEntityManager.getEntity(launcher.selected_entity);
style.Colors[ImGuiCol_Header] = col;
entityComponentsGUI(entity);
}