fix system::new, add entity registration, and add missing pipeline

Indra-db · Mar 4, 2024 · 8321310 · 8321310
1 parent d1a7cd2
commit 8321310
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/flecs_ecs/src/addons/system/system_builder.rs b/flecs_ecs/src/addons/system/system_builder.rs
@@ -72,7 +72,26 @@ where
         };
         obj.desc.query = *obj.query_builder.get_desc_query();
         obj.desc.query.filter = *obj.filter_builder.get_desc_filter();
+        let entity_desc: ecs_entity_desc_t = ecs_entity_desc_t {
+            name: std::ptr::null(),
+            sep: SEPARATOR.as_ptr(),
+            root_sep: SEPARATOR.as_ptr(),
+            ..Default::default()
+        };
+        obj.desc.entity = unsafe { ecs_entity_init(obj.world.raw_world, &entity_desc) };
+
         T::populate(&mut obj);
+
+        #[cfg(feature = "flecs_pipeline")]
+        unsafe {
+            ecs_add_id(
+                world.raw_world,
+                obj.desc.entity,
+                ecs_dependson(ECS_ON_UPDATE),
+            );
+            ecs_add_id(world.raw_world, obj.desc.entity, ECS_ON_UPDATE);
+        }
+
         obj
     }
 
@@ -84,7 +103,26 @@ where
         };
         obj.desc.query = *obj.query_builder.get_desc_query();
         obj.desc.query.filter = *obj.filter_builder.get_desc_filter();
+        let entity_desc: ecs_entity_desc_t = ecs_entity_desc_t {
+            name: std::ptr::null(),
+            sep: SEPARATOR.as_ptr(),
+            root_sep: SEPARATOR.as_ptr(),
+            ..Default::default()
+        };
+        obj.desc.entity = unsafe { ecs_entity_init(obj.world.raw_world, &entity_desc) };
+
         T::populate(&mut obj);
+
+        #[cfg(feature = "flecs_pipeline")]
+        unsafe {
+            ecs_add_id(
+                world.raw_world,
+                obj.desc.entity,
+                ecs_dependson(ECS_ON_UPDATE),
+            );
+            ecs_add_id(world.raw_world, obj.desc.entity, ECS_ON_UPDATE);
+        }
+
         obj
     }
 

diff --git a/flecs_ecs/src/core/observer_builder.rs b/flecs_ecs/src/core/observer_builder.rs
@@ -70,6 +70,7 @@ where
         let entity_desc: ecs_entity_desc_t = ecs_entity_desc_t {
             name: std::ptr::null(),
             sep: SEPARATOR.as_ptr(),
+            root_sep: SEPARATOR.as_ptr(),
             ..default::Default::default()
         };
 

diff --git a/flecs_ecs/src/core/world.rs b/flecs_ecs/src/core/world.rs
@@ -3411,7 +3411,7 @@ impl World {
     ///
     /// * C++ API: `world::system`
     #[doc(alias = "world::system")]
-    pub fn system(&self, entity: Entity) -> System {
+    pub fn system_from_entity(&self, entity: Entity) -> System {
         System::new_from_existing(self, entity)
     }
 

diff --git a/flecs_ecs/tests/common.rs b/flecs_ecs/tests/common.rs
@@ -1,6 +1,5 @@
 use flecs_ecs::core::{c_types::*, component_registration::*};
 use flecs_ecs_derive::Component;
-use std::{ffi::CStr, sync::OnceLock};
 
 #[cfg(test)]
 #[ctor::ctor]