Merge branch 'master' of https://github.com/Indra-db/flecs-ecs-rs

Indra-db · Mar 24, 2024 · c264f95 · c264f95
2 parents f8396ab + 0aeb10e
commit c264f95
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ For detailed feature progress, please visit the [issues](https://github.com/Indr
 - [ ] Addons ![](https://geps.dev/progress/40?dangerColor=800000&warningColor=ff9900&successColor=006600) (most important ones are done!)
 - [ ] Documentation ![](https://geps.dev/progress/70?dangerColor=800000&warningColor=ff9900&successColor=006600) codebase documented with C++ alias. missing 30% is adding Rust syntax to Flecs docs site.
 - [ ] Test suite ![](https://geps.dev/progress/15?dangerColor=800000&warningColor=ff9900&successColor=006600)
-- [ ] Examples ![](https://geps.dev/progress/60?dangerColor=800000&warningColor=ff9900&successColor=006600)[Click me for more info](https://github.com/Indra-db/flecs-ecs-rs/issues/12)
+- [ ] Examples ![](https://geps.dev/progress/60?dangerColor=800000&warningColor=ff9900&successColor=006600)[Click me for more info](https://github.com/Indra-db/flecs-ecs-rs/issues/12) - of the current supported features, all examples are done
 
 ## The Aim
 

diff --git a/flecs_ecs/src/core/component.rs b/flecs_ecs/src/core/component.rs
@@ -3,14 +3,14 @@
 use crate::{
     core::{get_full_type_name, FlecsErrorCode},
     ecs_assert,
-    sys::{ecs_get_hooks_id, ecs_opaque_init, ecs_set_hooks_id},
+    sys::{ecs_get_hooks_id, ecs_set_hooks_id},
 };
 
 #[cfg(feature = "flecs_meta")]
-use crate::addons::meta::Opaque;
+use crate::{addons::meta::Opaque, core::c_types::EntityT, sys::ecs_opaque_init};
 
 use super::{
-    c_types::{EntityT, IdT, IterT, TypeHooksT},
+    c_types::{IdT, IterT, TypeHooksT},
     component_registration::CachedComponentData,
     ecs_field,
     entity::Entity,

diff --git a/flecs_ecs/src/core/world.rs b/flecs_ecs/src/core/world.rs
@@ -6,13 +6,16 @@ use std::{ffi::CStr, ops::Deref, os::raw::c_void};
 use crate::addons::app::App;
 
 #[cfg(feature = "flecs_system")]
-use crate::addons::system::{System, SystemBuilder};
+use crate::{
+    addons::system::{System, SystemBuilder},
+    sys::ecs_system_desc_t,
+};
 
 #[cfg(feature = "flecs_pipeline")]
-use crate::addons::pipeline::PipelineBuilder;
+use crate::{addons::pipeline::PipelineBuilder, sys};
 
 use crate::sys::{
-    self, ecs_async_stage_free, ecs_async_stage_new, ecs_atfini, ecs_count_id, ecs_ctx_free_t,
+    ecs_async_stage_free, ecs_async_stage_new, ecs_atfini, ecs_count_id, ecs_ctx_free_t,
     ecs_defer_begin, ecs_defer_end, ecs_defer_resume, ecs_defer_suspend, ecs_delete_with, ecs_dim,
     ecs_enable_range_check, ecs_ensure, ecs_exists, ecs_fini, ecs_fini_action_t, ecs_frame_begin,
     ecs_frame_end, ecs_get_alive, ecs_get_ctx, ecs_get_id, ecs_get_mut_id, ecs_get_name,
@@ -22,7 +25,7 @@ use crate::sys::{
     ecs_remove_all, ecs_run_post_frame, ecs_set_alias, ecs_set_automerge, ecs_set_ctx,
     ecs_set_entity_range, ecs_set_lookup_path, ecs_set_scope, ecs_set_stage_count, ecs_set_with,
     ecs_should_quit, ecs_stage_is_async, ecs_stage_is_readonly, ecs_stage_t_magic,
-    ecs_system_desc_t, ecs_world_info_t, ecs_world_t_magic,
+    ecs_world_info_t, ecs_world_t_magic,
 };
 
 use crate::{