sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Fix incorrect update of entity manager 

Changelog:
- Clear to_update queue correctly
- Move entity deletion after adding
    - This is to allow deletion immediately after adding
    - Should be okay
- Fix incorrect null checking when adding entity
- Queue deletion when removing entity even if not found at removal time
    - The update function should handle such case
scene_man
En Yi 2023-07-19 10:55:16 +08:00
parent ebffd48958
commit cf6dbcf481
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scenes/engine/EC/entManager.c
View File

@ -23,6 +23,14 @@ void update_entity_manager(EntityManager_t* p_manager)
// New entities are assigned during add_entity // New entities are assigned during add_entity
unsigned long e_idx; unsigned long e_idx;
sc_queue_foreach (&p_manager->to_add, e_idx)
{
Entity_t *p_entity = get_entity_wtih_id(e_idx);
sc_map_put_64v(&p_manager->entities, e_idx, (void *)p_entity);
sc_map_put_64v(&p_manager->entities_map[p_entity->m_tag], e_idx, (void *)p_entity);
}
sc_queue_clear(&p_manager->to_add);
sc_queue_foreach (&p_manager->to_remove, e_idx) sc_queue_foreach (&p_manager->to_remove, e_idx)
{ {
Entity_t *p_entity = (Entity_t *)sc_map_get_64v(&p_manager->entities, e_idx); Entity_t *p_entity = (Entity_t *)sc_map_get_64v(&p_manager->entities, e_idx);
@ -37,17 +45,11 @@ void update_entity_manager(EntityManager_t* p_manager)
} }
sc_queue_clear(&p_manager->to_remove); sc_queue_clear(&p_manager->to_remove);
sc_queue_foreach (&p_manager->to_add, e_idx)
{
Entity_t *p_entity = get_entity_wtih_id(e_idx);
sc_map_put_64v(&p_manager->entities, e_idx, (void *)p_entity);
sc_map_put_64v(&p_manager->entities_map[p_entity->m_tag], e_idx, (void *)p_entity);
}
sc_queue_clear(&p_manager->to_add);
struct EntityUpdateEventInfo evt; struct EntityUpdateEventInfo evt;
sc_queue_foreach (&p_manager->to_update, evt) sc_queue_foreach (&p_manager->to_update, evt)
{ {
sc_map_get_64v(&p_manager->entities, evt.e_id);
if(!sc_map_found(&p_manager->entities)) continue;
switch(evt.evt_type) switch(evt.evt_type)
{ {
case COMP_ADDTION: case COMP_ADDTION:
@ -59,7 +61,7 @@ void update_entity_manager(EntityManager_t* p_manager)
break; break;
} }
} }
sc_queue_clear(&p_manager->to_add); sc_queue_clear(&p_manager->to_update);
} }
void clear_entity_manager(EntityManager_t* p_manager) void clear_entity_manager(EntityManager_t* p_manager)
@ -94,11 +96,10 @@ Entity_t *add_entity(EntityManager_t* p_manager, unsigned int tag)
{ {
unsigned long e_idx = 0; unsigned long e_idx = 0;
Entity_t* p_ent = new_entity_from_mempool(&e_idx); Entity_t* p_ent = new_entity_from_mempool(&e_idx);
if (p_ent == NULL) return NULL;
p_ent->m_tag = tag; p_ent->m_tag = tag;
if (p_ent) sc_queue_add_last(&p_manager->to_add, e_idx);
{
sc_queue_add_last(&p_manager->to_add, e_idx);
}
p_ent->manager = p_manager; p_ent->manager = p_manager;
return p_ent; return p_ent;
} }
@ -106,14 +107,17 @@ Entity_t *add_entity(EntityManager_t* p_manager, unsigned int tag)
void remove_entity(EntityManager_t* p_manager, unsigned long id) void remove_entity(EntityManager_t* p_manager, unsigned long id)
{ {
Entity_t* p_entity = sc_map_get_64v(&p_manager->entities, id); Entity_t* p_entity = sc_map_get_64v(&p_manager->entities, id);
if(!sc_map_found(&p_manager->entities)) return; if(sc_map_found(&p_manager->entities))
// This only marks the entity for deletion
// Does not free entity. This is done during the update
if (p_entity->m_alive)
{ {
p_entity->m_alive = false; // This only marks the entity for deletion
sc_queue_add_last(&p_manager->to_remove, id); // Does not free entity. This is done during the update
if (p_entity->m_alive)
{
p_entity->m_alive = false;
}
} }
// Queue anyways because added entity may be in update queue
sc_queue_add_last(&p_manager->to_remove, id);
} }
Entity_t* get_entity(EntityManager_t* p_manager, unsigned long id) Entity_t* get_entity(EntityManager_t* p_manager, unsigned long id)