#839 Ensure on_add hooks are invoked when using bulk_init

SanderMertens · SanderMertens · commit 3898f8dfa7de · 2022-10-20T14:45:33.000-07:00
diff --git a/examples/c/systems/system_ctx/project.json b/examples/c/systems/system_ctx/project.json
@@ -6,5 +6,10 @@
             "flecs"
         ],
         "public": false
+    },
+    "lang.c": {
+        "${os linux}": {
+            "lib": ["m"]
+        }
     }
-}
+}
diff --git a/examples/c/systems/system_ctx/src/main.c b/examples/c/systems/system_ctx/src/main.c
@@ -16,8 +16,12 @@ typedef struct {
     double value;
 } Radius;
 
-double distance(const Position *p1, const Position *p2) {
-    return sqrt(pow(p2->x - p1->x, 2) + pow(p2->y - p1->y, 2));
+double sqr(double value) {
+    return value * value;
+}
+
+double distance_sqr(const Position *p1, const Position *p2) {
+    return sqr(p2->x - p1->x) + sqr(p2->y - p1->y);
 }
 
 void Collide(ecs_iter_t *it) {
@@ -47,11 +51,10 @@ void Collide(ecs_iter_t *it) {
                 }
 
                 // Check for collision
-                double d = distance(&p1[i], &p2[j]);
-                double r = r1[i].value + r2[j].value;
-                if (r > d) {
-                    printf("%u (r: %.0f) and %u (r: %.0f) collided! (d = %.2f)\n",
-                        (uint32_t)e1, r1[i].value, (uint32_t)e2, r2[j].value, d);
+                double d_sqr = distance_sqr(&p1[i], &p2[j]);
+                double r_sqr = sqr(r1[i].value + r2[j].value);
+                if (r_sqr > d_sqr) {
+                    printf("%u and %u collided!\n", (uint32_t)e1, (uint32_t)e2);
                 }
             }
         }
@@ -96,8 +99,8 @@ int main(int argc, char *argv[]) {
     return ecs_fini(ecs);
 
     // Output
-    //  508 (r: 6) and 505 (r: 4) collided! (d = 9.22)
-    //  510 (r: 10) and 508 (r: 6) collided! (d = 14.32)
-    //  513 (r: 10) and 506 (r: 3) collided! (d = 3.61)
-    //  514 (r: 6) and 512 (r: 8) collided! (d = 11.40)
+    //  508 and 505 collided!
+    //  510 and 508 collided!
+    //  513 and 506 collided!
+    //  514 and 512 collided!
 }
diff --git a/examples/c/systems/time_interval/src/main.c b/examples/c/systems/time_interval/src/main.c
@@ -1,5 +1,4 @@
 #include <time_interval.h>
-#include <basics.h>
 #include <stdio.h>
 
 // This example shows how to run a system at a specified time interval.
diff --git a/examples/cpp/systems/system_ctx/project.json b/examples/cpp/systems/system_ctx/project.json
@@ -8,4 +8,4 @@
         "public": false,
         "language": "c++"
     }
-}
+}
diff --git a/examples/cpp/systems/system_ctx/src/main.cpp b/examples/cpp/systems/system_ctx/src/main.cpp
@@ -1,6 +1,5 @@
 #include <system_ctx.h>
 #include <iostream>
-#include <math.h>
 
 // Applications can pass context data to a system. A common use case where this
 // comes in handy is when a system needs to iterate more than one query. The
@@ -15,8 +14,12 @@ struct Radius {
     double value;
 };
 
-double distance(const Position& p1, const Position& p2) {
-    return sqrt(pow(p2.x - p1.x, 2) + pow(p2.y - p1.y, 2));
+double sqr(double value) {
+    return value * value;
+}
+
+double distance_sqr(const Position& p1, const Position& p2) {
+    return sqr(p2.x - p1.x) + sqr(p2.y - p1.y);
 }
 
 double randd(int max) {
@@ -33,10 +36,10 @@ int main(int, char *[]) {
     auto sys = ecs.system<const Position, const Radius>("Collide")
         .ctx(&q_collide)
         .each([](flecs::iter& it, size_t i, const Position& p1, const Radius& r1) {
-            CollisionQuery *q_collide = it.ctx<CollisionQuery>();
+            CollisionQuery *q = it.ctx<CollisionQuery>();
             flecs::entity e1 = it.entity(i);
 
-            q_collide->each([&](flecs::entity e2, const Position& p2, const Radius& r2) {
+            q->each([&](flecs::entity e2, const Position& p2, const Radius& r2) {
                 if (e1 == e2) {
                     // don't collide with self
                     return;
@@ -49,12 +52,10 @@ int main(int, char *[]) {
                 }
 
                 // Check for collision
-                double d = distance(p1, p2);
-                double r = r1.value + r2.value;
-                if (r > d) {
-                    std::cout << e1 << " (r: " << r1.value << ") and " 
-                        << e2 << " (r: " << r2.value << ") collided! "
-                        << "(d = " << d << "\n";
+                double d_sqr = distance_sqr(p1, p2);
+                double r_sqr = sqr(r1.value + r2.value);
+                if (r_sqr > d_sqr) {
+                    std::cout << e1 << " and " << e2 << " collided!\n";
                 }
             });
         });
@@ -70,8 +71,8 @@ int main(int, char *[]) {
     sys.run();
 
     // Output
-    //  526 (r: 4) and 529 (r: 6) collided! (d = 9.21954
-    //  527 (r: 3) and 534 (r: 10) collided! (d = 3.60555
-    //  529 (r: 6) and 531 (r: 10) collided! (d = 14.3178
-    //  533 (r: 8) and 535 (r: 6) collided! (d = 11.4018
+    //  526 and 529 collided!
+    //  527 and 534 collided!
+    //  529 and 531 collided!
+    //  533 and 535 collided!
 }
diff --git a/flecs.c b/flecs.c
@@ -3819,9 +3819,7 @@ int32_t flecs_table_grow_data(
     /* Initialize entity ids and record ptrs */
     int32_t i;
     if (ids) {
-        for (i = 0; i < to_add; i ++) {
-            e[i] = ids[i];
-        }
+        ecs_os_memcpy_n(e, ids, ecs_entity_t, to_add);
     } else {
         ecs_os_memset(e, 0, ECS_SIZEOF(ecs_entity_t) * to_add);
     }
@@ -3834,6 +3832,8 @@ int32_t flecs_table_grow_data(
         ecs_type_info_t *ti = type_info[i];
         flecs_table_grow_column(world, column, ti, to_add, size, true);
         ecs_assert(columns[i].size == size, ECS_INTERNAL_ERROR, NULL);
+        flecs_run_add_hooks(world, table, ti, column, e, table->type.array[i], 
+            cur_count, to_add, false);
     }
 
     /* Add elements to each switch column */
@@ -4303,11 +4303,11 @@ int32_t flecs_table_appendn(
     ecs_assert(!table->lock, ECS_LOCKED_STORAGE, NULL);
 
     flecs_table_check_sanity(table);
-
     int32_t cur_count = flecs_table_data_count(data);
     int32_t result = flecs_table_grow_data(
         world, table, data, to_add, cur_count + to_add, ids);
     flecs_table_check_sanity(table);
+
     return result;
 }
 
diff --git a/src/table.c b/src/table.c
@@ -1438,9 +1438,7 @@ int32_t flecs_table_grow_data(
     /* Initialize entity ids and record ptrs */
     int32_t i;
     if (ids) {
-        for (i = 0; i < to_add; i ++) {
-            e[i] = ids[i];
-        }
+        ecs_os_memcpy_n(e, ids, ecs_entity_t, to_add);
     } else {
         ecs_os_memset(e, 0, ECS_SIZEOF(ecs_entity_t) * to_add);
     }
@@ -1453,6 +1451,8 @@ int32_t flecs_table_grow_data(
         ecs_type_info_t *ti = type_info[i];
         flecs_table_grow_column(world, column, ti, to_add, size, true);
         ecs_assert(columns[i].size == size, ECS_INTERNAL_ERROR, NULL);
+        flecs_run_add_hooks(world, table, ti, column, e, table->type.array[i], 
+            cur_count, to_add, false);
     }
 
     /* Add elements to each switch column */
@@ -1922,11 +1922,11 @@ int32_t flecs_table_appendn(
     ecs_assert(!table->lock, ECS_LOCKED_STORAGE, NULL);
 
     flecs_table_check_sanity(table);
-
     int32_t cur_count = flecs_table_data_count(data);
     int32_t result = flecs_table_grow_data(
         world, table, data, to_add, cur_count + to_add, ids);
     flecs_table_check_sanity(table);
+
     return result;
 }
 
diff --git a/test/api/project.json b/test/api/project.json
@@ -815,6 +815,7 @@
                 "ctor_on_move_pair",
                 "move_on_realloc",
                 "move_on_bulk_new",
+                "on_add_on_bulk_new",
                 "move_on_delete",
                 "move_dtor_on_delete",
                 "copy_on_override_pair",
diff --git a/test/api/src/ComponentLifecycle.c b/test/api/src/ComponentLifecycle.c
diff --git a/test/api/src/main.c b/test/api/src/main.c

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include <time_interval.h>`
`2`		`-#include <basics.h>`
`3`	`2`	`#include <stdio.h>`
`4`	`3`
`5`	`4`	`// This example shows how to run a system at a specified time interval.`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`	`"public": false,`
`9`	`9`	`"language": "c++"`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`