Merge branch 'SanderMertens:master' into master

Author: 60k41p

distr/flecs.c

@@ -15696,6 +15696,7 @@ void flecs_emit_forward_table_up(
                 const EcsParent *parent = ecs_get(world, tgt, EcsParent);
                 ecs_assert(parent != NULL, ECS_INTERNAL_ERROR, NULL);
                 ecs_assert(parent->value != 0, ECS_INTERNAL_ERROR, NULL);
+
                 cr = flecs_components_get(world, ecs_childof(parent->value));
                 ecs_assert(cr != NULL, ECS_INTERNAL_ERROR, NULL);
             }
@@ -16242,8 +16243,7 @@ void flecs_emit(
 
             for (p = 0; p < parent_count; p ++) {
                 ecs_entity_t parent = parents[p].value;
-                ecs_assert(parent != 0, ECS_INTERNAL_ERROR, NULL);
-                if (flecs_entities_is_alive(world, parent)) {
+                if (parent && flecs_entities_is_alive(world, parent)) {
                     ecs_id_t pair = ecs_childof(parent);
                     ecs_type_t type = { .count = 1, .array = &pair };
                     pdesc.ids = &type;
@@ -20669,6 +20669,8 @@ ecs_type_t flecs_prefab_spawner_build_type(
     ecs_type_t dst = {0};
     ecs_type_t *src = &table->type;
 
+    flecs_type_add(world, &dst, ecs_id(EcsParent));
+
     int32_t i, count = src->count;
     for (i = 0; i < count; i ++) {
         ecs_id_t id = src->array[i];
@@ -20909,6 +20911,7 @@ void flecs_spawner_instantiate(
         ecs_assert(cr != NULL, ECS_INTERNAL_ERROR, NULL);
 
         int32_t parent_column = table->component_map[ecs_id(EcsParent)];
+        ecs_assert(parent_column != 0, ECS_INTERNAL_ERROR, NULL);
         EcsParent *parent_ptr = table->data.columns[parent_column - 1].data;
         parent_ptr = &parent_ptr[row];
         parent_ptr->value = parent;
@@ -41161,6 +41164,8 @@ void flecs_bootstrap_parent_component(
         .ctor = flecs_default_ctor,
         .on_replace = flecs_on_replace_parent
     });
+
+    ecs_add_pair(world, ecs_id(EcsParent), EcsOnInstantiate, EcsDontInherit);
 }
 
 

src/observable.c

@@ -837,6 +837,7 @@ void flecs_emit_forward_table_up(
                 const EcsParent *parent = ecs_get(world, tgt, EcsParent);
                 ecs_assert(parent != NULL, ECS_INTERNAL_ERROR, NULL);
                 ecs_assert(parent->value != 0, ECS_INTERNAL_ERROR, NULL);
+
                 cr = flecs_components_get(world, ecs_childof(parent->value));
                 ecs_assert(cr != NULL, ECS_INTERNAL_ERROR, NULL);
             }
@@ -1383,8 +1384,7 @@ void flecs_emit(
 
             for (p = 0; p < parent_count; p ++) {
                 ecs_entity_t parent = parents[p].value;
-                ecs_assert(parent != 0, ECS_INTERNAL_ERROR, NULL);
-                if (flecs_entities_is_alive(world, parent)) {
+                if (parent && flecs_entities_is_alive(world, parent)) {
                     ecs_id_t pair = ecs_childof(parent);
                     ecs_type_t type = { .count = 1, .array = &pair };
                     pdesc.ids = &type;

src/storage/non_fragmenting_childof.c

@@ -432,4 +432,6 @@ void flecs_bootstrap_parent_component(
         .ctor = flecs_default_ctor,
         .on_replace = flecs_on_replace_parent
     });
+
+    ecs_add_pair(world, ecs_id(EcsParent), EcsOnInstantiate, EcsDontInherit);
 }

src/tree_spawner.c

@@ -52,6 +52,8 @@ ecs_type_t flecs_prefab_spawner_build_type(
     ecs_type_t dst = {0};
     ecs_type_t *src = &table->type;
 
+    flecs_type_add(world, &dst, ecs_id(EcsParent));
+
     int32_t i, count = src->count;
     for (i = 0; i < count; i ++) {
         ecs_id_t id = src->array[i];
@@ -292,6 +294,7 @@ void flecs_spawner_instantiate(
         ecs_assert(cr != NULL, ECS_INTERNAL_ERROR, NULL);
 
         int32_t parent_column = table->component_map[ecs_id(EcsParent)];
+        ecs_assert(parent_column != 0, ECS_INTERNAL_ERROR, NULL);
         EcsParent *parent_ptr = table->data.columns[parent_column - 1].data;
         parent_ptr = &parent_ptr[row];
         parent_ptr->value = parent;

test/core/project.json

@@ -965,7 +965,8 @@
                 "defer_reparent_to_deleted_parent",
                 "delete_mixed_tree_1",
                 "delete_mixed_tree_2",
-                "delete_mixed_tree_3"
+                "delete_mixed_tree_3",
+                "delete_mixed_tree_4"
             ]
         }, {
             "id": "Hierarchies",

test/core/src/NonFragmentingChildOf.c

@@ -5805,3 +5805,31 @@ void NonFragmentingChildOf_delete_mixed_tree_3(void) {
 
     ecs_fini(world);
 }
+
+void NonFragmentingChildOf_delete_mixed_tree_4(void) {
+    ecs_world_t *world = ecs_init();
+
+    ECS_TAG(world, Foo);
+
+    ecs_entity_t a = ecs_new(world);
+    ecs_entity_t b = ecs_new(world);
+    ecs_set(world, b, EcsParent, {a});
+
+    ecs_entity_t c = ecs_new(world);
+    ecs_add_pair(world, c, EcsIsA, b);
+    test_assert(!ecs_has(world, c, EcsParent));
+
+    ecs_entity_t d = ecs_new(world);
+    ecs_add_pair(world, d, EcsChildOf, c);
+
+    ecs_delete(world, a);
+    test_assert(!ecs_is_alive(world, a));
+    test_assert(!ecs_is_alive(world, b));
+    test_assert(!ecs_has_pair(world, c, EcsIsA, EcsWildcard));
+
+    test_assert(ecs_is_alive(world, c));
+    test_assert(ecs_is_alive(world, d));
+    ecs_add(world, d, Foo);
+
+    ecs_fini(world);
+}

test/core/src/main.c

@@ -934,6 +934,7 @@ void NonFragmentingChildOf_defer_reparent_to_deleted_parent(void);
 void NonFragmentingChildOf_delete_mixed_tree_1(void);
 void NonFragmentingChildOf_delete_mixed_tree_2(void);
 void NonFragmentingChildOf_delete_mixed_tree_3(void);
+void NonFragmentingChildOf_delete_mixed_tree_4(void);
 
 // Testsuite 'Hierarchies'
 void Hierarchies_setup(void);
@@ -6828,6 +6829,10 @@ bake_test_case NonFragmentingChildOf_testcases[] = {
     {
         "delete_mixed_tree_3",
         NonFragmentingChildOf_delete_mixed_tree_3
+    },
+    {
+        "delete_mixed_tree_4",
+        NonFragmentingChildOf_delete_mixed_tree_4
     }
 };
 
@@ -15740,7 +15745,7 @@ static bake_test_suite suites[] = {
         "NonFragmentingChildOf",
         NULL,
         NULL,
-        228,
+        229,
         NonFragmentingChildOf_testcases
     },
     {