#1366 Fix issue with C++ observers and up traversal

SanderMertens · Sep 20, 2024 · 3095237 · 3095237
1 parent c51cf55
commit 3095237
Show file tree

Hide file tree

Showing 12 changed files with 465 additions and 10 deletions.
diff --git a/distr/flecs.c b/distr/flecs.c
@@ -12784,6 +12784,7 @@ void flecs_emit_propagate_id(
         it->other_table = NULL;
         it->offset = 0;
         it->count = entity_count;
+        it->up_fields = 1;
         if (entity_count) {
             it->entities = ecs_table_entities(table);
         }
@@ -12822,6 +12823,7 @@ void flecs_emit_propagate_id(
     }
 
     it->event_cur = event_cur;
+    it->up_fields = 0;
 }
 
 static
@@ -13116,6 +13118,7 @@ void flecs_emit_forward_id(
     it->sources[0] = tgt;
     it->event_id = id;
     ECS_CONST_CAST(int32_t*, it->sizes)[0] = 0; /* safe, owned by observer */
+    it->up_fields = 1;
 
     int32_t storage_i = ecs_table_type_to_column_index(tgt_table, column);
     if (storage_i != -1) {
@@ -13176,6 +13179,8 @@ void flecs_emit_forward_id(
             it->trs[0] = base_tr;
         }
     }
+
+    it->up_fields = 0;
 }
 
 static

diff --git a/distr/flecs.h b/distr/flecs.h
@@ -25737,7 +25737,6 @@ struct field_ptrs {
     void populate_self(const ecs_iter_t *iter, size_t index, T, Targs... comps) {
         fields_[index].ptr = ecs_field_w_size(iter, sizeof(A), 
             static_cast<int8_t>(index));
-        // fields_[index].is_ref = iter->sources[index] != 0;
         fields_[index].is_ref = false;
         ecs_assert(iter->sources[index] == 0, ECS_INTERNAL_ERROR, NULL);
         populate_self(iter, index + 1, comps ...);

diff --git a/include/flecs/addons/cpp/delegate.hpp b/include/flecs/addons/cpp/delegate.hpp
@@ -99,7 +99,6 @@ struct field_ptrs {
     void populate_self(const ecs_iter_t *iter, size_t index, T, Targs... comps) {
         fields_[index].ptr = ecs_field_w_size(iter, sizeof(A), 
             static_cast<int8_t>(index));
-        // fields_[index].is_ref = iter->sources[index] != 0;
         fields_[index].is_ref = false;
         ecs_assert(iter->sources[index] == 0, ECS_INTERNAL_ERROR, NULL);
         populate_self(iter, index + 1, comps ...);

diff --git a/src/observable.c b/src/observable.c
@@ -281,6 +281,7 @@ void flecs_emit_propagate_id(
         it->other_table = NULL;
         it->offset = 0;
         it->count = entity_count;
+        it->up_fields = 1;
         if (entity_count) {
             it->entities = ecs_table_entities(table);
         }
@@ -319,6 +320,7 @@ void flecs_emit_propagate_id(
     }
 
     it->event_cur = event_cur;
+    it->up_fields = 0;
 }
 
 static
@@ -613,6 +615,7 @@ void flecs_emit_forward_id(
     it->sources[0] = tgt;
     it->event_id = id;
     ECS_CONST_CAST(int32_t*, it->sizes)[0] = 0; /* safe, owned by observer */
+    it->up_fields = 1;
 
     int32_t storage_i = ecs_table_type_to_column_index(tgt_table, column);
     if (storage_i != -1) {
@@ -673,6 +676,8 @@ void flecs_emit_forward_id(
             it->trs[0] = base_tr;
         }
     }
+
+    it->up_fields = 0;
 }
 
 static

diff --git a/test/core/include/core.h b/test/core/include/core.h
@@ -29,6 +29,9 @@ typedef struct Probe {
     ecs_entity_t e[MAX_ENTITIES];
     ecs_entity_t c[MAX_INVOCATIONS][MAX_SYS_COLUMNS];
     ecs_entity_t s[MAX_INVOCATIONS][MAX_SYS_COLUMNS];
+    ecs_flags32_t ref_fields;
+    ecs_flags32_t up_fields;
+    ecs_flags32_t row_fields;
     void *param;
 } Probe;
 

diff --git a/test/core/project.json b/test/core/project.json
@@ -1628,6 +1628,14 @@
                 "register_callback_after_run_ctx",
                 "register_run_after_callback_ctx",
                 "on_add_after_new_w_table",
+                "ref_flag_term_1",
+                "ref_flag_term_2",
+                "forward_up_flag_term_1",
+                "forward_up_flag_term_2",
+                "propagate_up_flag_term_1",
+                "propagate_up_flag_term_2",
+                "row_flag_term_1",
+                "row_flag_term_2",
                 "cache_test_1",
                 "cache_test_2",
                 "cache_test_3",