SanderMertens#1980 Fix issue with recursively setting ParentDepth

Author: SanderMertens

distr/flecs.c

@@ -40289,7 +40289,7 @@ void flecs_entities_update_childof_depth(
             ecs_component_record_t *tgt_cr = flecs_components_get(
                 world, ecs_childof(tgt));
             if (!tgt_cr) {
-                return;
+                continue;
             }
 
             flecs_component_update_childof_depth(world, tgt_cr, tgt, r);
@@ -40313,7 +40313,7 @@ void flecs_entities_update_childof_depth(
             ecs_component_record_t *tgt_cr = flecs_components_get(
                 world, ecs_childof(tgt));
             if (!tgt_cr) {
-                return;
+                continue;
             }
 
             ecs_record_t *r = flecs_entities_get(world, tgt);

src/storage/component_index.c

@@ -1145,7 +1145,7 @@ void flecs_entities_update_childof_depth(
             ecs_component_record_t *tgt_cr = flecs_components_get(
                 world, ecs_childof(tgt));
             if (!tgt_cr) {
-                return;
+                continue;
             }
 
             flecs_component_update_childof_depth(world, tgt_cr, tgt, r);
@@ -1169,7 +1169,7 @@ void flecs_entities_update_childof_depth(
             ecs_component_record_t *tgt_cr = flecs_components_get(
                 world, ecs_childof(tgt));
             if (!tgt_cr) {
-                return;
+                continue;
             }
 
             ecs_record_t *r = flecs_entities_get(world, tgt);

test/core/project.json

@@ -793,6 +793,7 @@
                 "depth_after_parent_set_parent",
                 "depth_after_parent_remove_parent",
                 "depth_after_parent_remove_other_sibling_parent",
+                "depth_after_parent_set_parent_sibling_traversable_no_children",
                 "depth_after_parent_reparent",
                 "depth_after_parent_reparent_different_depth",
                 "depth_after_parent_set_parent_nested",

test/core/src/NonFragmentingChildOf.c

@@ -1616,6 +1616,42 @@ void NonFragmentingChildOf_depth_after_parent_remove_other_sibling_parent(void)
     ecs_fini(world);
 }
 
+void NonFragmentingChildOf_depth_after_parent_set_parent_sibling_traversable_no_children(void) {
+    ecs_world_t *world = ecs_mini();
+
+    ecs_entity_t root = ecs_new(world);
+    ecs_entity_t p = ecs_new(world);
+    ecs_entity_t c1 = ecs_insert(world, ecs_value(EcsParent, {p}));
+    ecs_entity_t c2 = ecs_insert(world, ecs_value(EcsParent, {p}));
+    ecs_add_id(world, c2, EcsOrderedChildren);
+    ecs_entity_t gc2 = ecs_insert(world, ecs_value(EcsParent, {c2}));
+
+    /* Make first sibling traversable without creating ChildOf record for it. */
+    ecs_new_w_pair(world, EcsIsA, c1);
+
+    ecs_entities_t children = ecs_get_ordered_children(world, p);
+    test_int(children.count, 2);
+    test_uint(children.ids[0], c1);
+    test_uint(children.ids[1], c2);
+
+    test_assert(ecs_has_id(world, c1, ecs_value_pair(EcsParentDepth, 1)));
+    test_assert(ecs_has_id(world, c2, ecs_value_pair(EcsParentDepth, 1)));
+    test_assert(ecs_has_id(world, gc2, ecs_value_pair(EcsParentDepth, 2)));
+
+    ecs_set(world, p, EcsParent, {root});
+
+    test_assert(ecs_has_id(world, c1, ecs_value_pair(EcsParentDepth, 2)));
+    test_assert(!ecs_has_id(world, c1, ecs_value_pair(EcsParentDepth, 1)));
+
+    test_assert(ecs_has_id(world, c2, ecs_value_pair(EcsParentDepth, 2)));
+    test_assert(!ecs_has_id(world, c2, ecs_value_pair(EcsParentDepth, 1)));
+
+    test_assert(ecs_has_id(world, gc2, ecs_value_pair(EcsParentDepth, 3)));
+    test_assert(!ecs_has_id(world, gc2, ecs_value_pair(EcsParentDepth, 2)));
+
+    ecs_fini(world);
+}
+
 void NonFragmentingChildOf_depth_after_parent_reparent(void) {
     ecs_world_t *world = ecs_mini();
 

test/core/src/main.c

@@ -761,6 +761,7 @@ void NonFragmentingChildOf_depth_after_parent_remove(void);
 void NonFragmentingChildOf_depth_after_parent_set_parent(void);
 void NonFragmentingChildOf_depth_after_parent_remove_parent(void);
 void NonFragmentingChildOf_depth_after_parent_remove_other_sibling_parent(void);
+void NonFragmentingChildOf_depth_after_parent_set_parent_sibling_traversable_no_children(void);
 void NonFragmentingChildOf_depth_after_parent_reparent(void);
 void NonFragmentingChildOf_depth_after_parent_reparent_different_depth(void);
 void NonFragmentingChildOf_depth_after_parent_set_parent_nested(void);
@@ -6152,6 +6153,10 @@ bake_test_case NonFragmentingChildOf_testcases[] = {
         "depth_after_parent_remove_other_sibling_parent",
         NonFragmentingChildOf_depth_after_parent_remove_other_sibling_parent
     },
+    {
+        "depth_after_parent_set_parent_sibling_traversable_no_children",
+        NonFragmentingChildOf_depth_after_parent_set_parent_sibling_traversable_no_children
+    },
     {
         "depth_after_parent_reparent",
         NonFragmentingChildOf_depth_after_parent_reparent
@@ -15815,7 +15820,7 @@ static bake_test_suite suites[] = {
         "NonFragmentingChildOf",
         NULL,
         NULL,
-        238,
+        239,
         NonFragmentingChildOf_testcases
     },
     {