Skip to content

Commit

Permalink
Add missing event propagation paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@SanderMertens
SanderMertens committed Feb 25, 2024
1 parent a496e0d commit 7874ea5
Show file tree
Hide file tree
Showing 5 changed files with 647 additions and 102 deletions.
123 changes: 94 additions & 29 deletions flecs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14864,7 +14864,9 @@ void flecs_emit_propagate(
/* Get traversed relationship */
ecs_entity_t trav = ECS_PAIR_FIRST(cur->id);
if (propagate_trav && propagate_trav != trav) {
continue;
if (propagate_trav != EcsIsA) {
continue;
}
}

flecs_emit_propagate_id(
Expand Down Expand Up @@ -14951,6 +14953,54 @@ void flecs_emit_propagate_invalidate(
}
}

void flecs_propagate_entities(
ecs_world_t *world,
ecs_iter_t *it,
ecs_id_record_t *idr,
ecs_entity_t *entities,
int32_t count,
ecs_entity_t src,
ecs_event_id_record_t **iders,
int32_t ider_count)
{
if (!count) {
return;
}

ecs_entity_t old_src = it->sources[0];
ecs_table_t *old_table = it->table;
ecs_table_t *old_other_table = it->other_table;
ecs_entity_t *old_entities = it->entities;
int32_t old_count = it->count;
int32_t old_offset = it->offset;

int32_t i;
for (i = 0; i < count; i ++) {
ecs_record_t *record = flecs_entities_get(world, entities[i]);
if (!record) {
/* If the event is emitted after a bulk operation, it's possible
* that it hasn't been populated with entities yet. */
continue;
}

ecs_id_record_t *idr_t = record->idr;
if (idr_t) {
/* Entity is used as target in traversable pairs, propagate */
ecs_entity_t e = src ? src : entities[i];
it->sources[0] = e;
flecs_emit_propagate(
world, it, idr, idr_t, 0, iders, ider_count);
}
}

it->table = old_table;
it->other_table = old_other_table;
it->entities = old_entities;
it->count = old_count;
it->offset = old_offset;
it->sources[0] = old_src;
}

static
void flecs_override_copy(
ecs_world_t *world,
Expand Down Expand Up @@ -15512,6 +15562,46 @@ void flecs_emit_forward(
rc_idr, elem->src, r->table, tr->index, offset, trav);
}
}

/* Propagate events for new reachable ids downwards */
if (table->_->traversable_count) {
int32_t i;
ecs_entity_t *entities = flecs_table_entities_array(table);
entities = ECS_ELEM_T(entities, ecs_entity_t, it->offset);
for (i = 0; i < it->count; i ++) {
ecs_record_t *r = flecs_entities_get(world, entities[i]);
if (r->idr) {
break;
}
}

if (i != it->count) {
ecs_reachable_elem_t *elems = ecs_vec_first_t(&rc->ids,
ecs_reachable_elem_t);
int32_t count = ecs_vec_count(&rc->ids);
for (i = 0; i < count; i ++) {
ecs_reachable_elem_t *elem = &elems[i];
const ecs_table_record_t *tr = elem->tr;
ecs_assert(tr != NULL, ECS_INTERNAL_ERROR, NULL);
ecs_id_record_t *rc_idr = (ecs_id_record_t*)tr->hdr.cache;
ecs_record_t *r = elem->record;

ecs_assert(rc_idr->id == elem->id, ECS_INTERNAL_ERROR, NULL);
ecs_assert(r != NULL, ECS_INTERNAL_ERROR, NULL);
ecs_assert(flecs_entities_get(world, elem->src) == r,
ECS_INTERNAL_ERROR, NULL);
ecs_dbg_assert(r->table == elem->table, ECS_INTERNAL_ERROR, NULL);
(void)r;

ecs_event_id_record_t *iders[5] = {0};
int32_t ider_count = flecs_event_observers_get(
er, rc_idr->id, iders);

flecs_propagate_entities(world, it, rc_idr, it->entities,
it->count, elem->src, iders, ider_count);
}
}
}
}

/* The emit function is responsible for finding and invoking the observers
Expand Down Expand Up @@ -15543,7 +15633,7 @@ void flecs_emit(
ecs_entity_t event = desc->event;
ecs_table_t *table = desc->table, *other_table = desc->other_table;
int32_t offset = desc->offset;
int32_t i, r, count = desc->count;
int32_t i, count = desc->count;
ecs_flags32_t table_flags = table->flags;

/* Deferring cannot be suspended for observers */
Expand Down Expand Up @@ -15842,33 +15932,8 @@ void flecs_emit(
* entities that are used as targets of traversable relationships. If the
* entity/entities for which the event was generated is used as such a
* target, events must be propagated downwards. */
ecs_entity_t *entities = it.entities;
it.entities = NULL;

for (r = 0; r < count; r ++) {
ecs_record_t *record = flecs_entities_get(world, entities[r]);
if (!record) {
/* If the event is emitted after a bulk operation, it's possible
* that it hasn't been populated with entities yet. */
continue;
}

ecs_id_record_t *idr_t = record->idr;
if (idr_t) {
/* Entity is used as target in traversable pairs, propagate */
ecs_entity_t e = entities[r];
it.sources[0] = e;
flecs_emit_propagate(
world, &it, idr, idr_t, 0, iders, ider_count);
}
}

it.table = table;
it.other_table = other_table;
it.entities = entities;
it.count = count;
it.offset = offset;
it.sources[0] = 0;
flecs_propagate_entities(
world, &it, idr, it.entities, count, 0, iders, ider_count);
}

can_override = false; /* Don't override twice */
Expand Down
124 changes: 95 additions & 29 deletions src/observable.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,9 @@ void flecs_emit_propagate(
/* Get traversed relationship */
ecs_entity_t trav = ECS_PAIR_FIRST(cur->id);
if (propagate_trav && propagate_trav != trav) {
continue;
if (propagate_trav != EcsIsA) {
continue;
}
}

flecs_emit_propagate_id(
Expand Down Expand Up @@ -433,6 +435,55 @@ void flecs_emit_propagate_invalidate(
}
}

static
void flecs_propagate_entities(
ecs_world_t *world,
ecs_iter_t *it,
ecs_id_record_t *idr,
ecs_entity_t *entities,
int32_t count,
ecs_entity_t src,
ecs_event_id_record_t **iders,
int32_t ider_count)
{
if (!count) {
return;
}

ecs_entity_t old_src = it->sources[0];
ecs_table_t *old_table = it->table;
ecs_table_t *old_other_table = it->other_table;
ecs_entity_t *old_entities = it->entities;
int32_t old_count = it->count;
int32_t old_offset = it->offset;

int32_t i;
for (i = 0; i < count; i ++) {
ecs_record_t *record = flecs_entities_get(world, entities[i]);
if (!record) {
/* If the event is emitted after a bulk operation, it's possible
* that it hasn't been populated with entities yet. */
continue;
}

ecs_id_record_t *idr_t = record->idr;
if (idr_t) {
/* Entity is used as target in traversable pairs, propagate */
ecs_entity_t e = src ? src : entities[i];
it->sources[0] = e;
flecs_emit_propagate(
world, it, idr, idr_t, 0, iders, ider_count);
}
}

it->table = old_table;
it->other_table = old_other_table;
it->entities = old_entities;
it->count = old_count;
it->offset = old_offset;
it->sources[0] = old_src;
}

static
void flecs_override_copy(
ecs_world_t *world,
Expand Down Expand Up @@ -994,6 +1045,46 @@ void flecs_emit_forward(
rc_idr, elem->src, r->table, tr->index, offset, trav);
}
}

/* Propagate events for new reachable ids downwards */
if (table->_->traversable_count) {
int32_t i;
ecs_entity_t *entities = flecs_table_entities_array(table);
entities = ECS_ELEM_T(entities, ecs_entity_t, it->offset);
for (i = 0; i < it->count; i ++) {
ecs_record_t *r = flecs_entities_get(world, entities[i]);
if (r->idr) {
break;
}
}

if (i != it->count) {
ecs_reachable_elem_t *elems = ecs_vec_first_t(&rc->ids,
ecs_reachable_elem_t);
int32_t count = ecs_vec_count(&rc->ids);
for (i = 0; i < count; i ++) {
ecs_reachable_elem_t *elem = &elems[i];
const ecs_table_record_t *tr = elem->tr;
ecs_assert(tr != NULL, ECS_INTERNAL_ERROR, NULL);
ecs_id_record_t *rc_idr = (ecs_id_record_t*)tr->hdr.cache;
ecs_record_t *r = elem->record;

ecs_assert(rc_idr->id == elem->id, ECS_INTERNAL_ERROR, NULL);
ecs_assert(r != NULL, ECS_INTERNAL_ERROR, NULL);
ecs_assert(flecs_entities_get(world, elem->src) == r,
ECS_INTERNAL_ERROR, NULL);
ecs_dbg_assert(r->table == elem->table, ECS_INTERNAL_ERROR, NULL);
(void)r;

ecs_event_id_record_t *iders[5] = {0};
int32_t ider_count = flecs_event_observers_get(
er, rc_idr->id, iders);

flecs_propagate_entities(world, it, rc_idr, it->entities,
it->count, elem->src, iders, ider_count);
}
}
}
}

/* The emit function is responsible for finding and invoking the observers
Expand Down Expand Up @@ -1025,7 +1116,7 @@ void flecs_emit(
ecs_entity_t event = desc->event;
ecs_table_t *table = desc->table, *other_table = desc->other_table;
int32_t offset = desc->offset;
int32_t i, r, count = desc->count;
int32_t i, count = desc->count;
ecs_flags32_t table_flags = table->flags;

/* Deferring cannot be suspended for observers */
Expand Down Expand Up @@ -1324,33 +1415,8 @@ void flecs_emit(
* entities that are used as targets of traversable relationships. If the
* entity/entities for which the event was generated is used as such a
* target, events must be propagated downwards. */
ecs_entity_t *entities = it.entities;
it.entities = NULL;

for (r = 0; r < count; r ++) {
ecs_record_t *record = flecs_entities_get(world, entities[r]);
if (!record) {
/* If the event is emitted after a bulk operation, it's possible
* that it hasn't been populated with entities yet. */
continue;
}

ecs_id_record_t *idr_t = record->idr;
if (idr_t) {
/* Entity is used as target in traversable pairs, propagate */
ecs_entity_t e = entities[r];
it.sources[0] = e;
flecs_emit_propagate(
world, &it, idr, idr_t, 0, iders, ider_count);
}
}

it.table = table;
it.other_table = other_table;
it.entities = entities;
it.count = count;
it.offset = offset;
it.sources[0] = 0;
flecs_propagate_entities(
world, &it, idr, it.entities, count, 0, iders, ider_count);
}

can_override = false; /* Don't override twice */
Expand Down
12 changes: 11 additions & 1 deletion test/api/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2098,6 +2098,17 @@
"on_add_after_batch_w_exclusive_adds",
"propagate_match_relationship_w_self_up",
"propagate_match_relationship_w_up",
"propagate_isa_of_parent_add",
"propagate_isa_of_parent_remove",
"propagate_isa_of_parent_set",
"propagate_add_childof_of_parent",
"propagate_add_childof_of_parent_w_siblings",
"propagate_remove_childof_of_parent",
"propagate_add_isa_of_parent",
"propagate_remove_isa_of_parent",
"propagate_add_childof_of_base",
"propagate_remove_childof_of_base",
"emit_for_parent_w_prefab_child_and_instance",
"observer_w_2_fixed_src",
"emit_for_recreated_id_after_remove_all",
"emit_for_recreated_id_after_remove_all_wildcard",
Expand All @@ -2120,7 +2131,6 @@
"wildcard_propagate_w_other_table",
"add_in_yield_existing",
"add_in_yield_existing_multi",
"emit_for_parent_w_prefab_child_and_instance",
"disable_observer",
"disable_observer_module",
"disable_observer_module_nested",
Expand Down
Loading

0 comments on commit 7874ea5

Please sign in to comment.