Misc import changes

This commit is contained in:
JMS55 2023-12-27 11:24:36 -08:00
parent cb57dca6b9
commit 01eed81bf1
2 changed files with 7 additions and 8 deletions

View file

@ -13,8 +13,6 @@ use dioxus::{
hooks::use_on_destroy, hooks::use_on_destroy,
}; };
pub use crate::deferred_system::use_system_scheduler;
#[derive(Default)] #[derive(Default)]
pub(crate) struct EcsSubscriptions { pub(crate) struct EcsSubscriptions {
pub resources: Box<HashMap<ComponentId, HashSet<ScopeId>>>, pub resources: Box<HashMap<ComponentId, HashSet<ScopeId>>>,
@ -84,14 +82,14 @@ pub fn use_resource<'a, T: Resource>(cx: &'a ScopeState) -> &'a T {
world.resource() world.resource()
} }
pub fn use_query<'a, Q>(cx: &'a ScopeState) -> DioxusUiQuery<'a, Q, ()> pub fn use_query<'a, Q>(cx: &'a ScopeState) -> UseQuery<'a, Q, ()>
where where
Q: ReadOnlyWorldQuery, Q: ReadOnlyWorldQuery,
{ {
use_query_filtered(cx) use_query_filtered(cx)
} }
pub fn use_query_filtered<'a, Q, F>(cx: &'a ScopeState) -> DioxusUiQuery<'a, Q, F> pub fn use_query_filtered<'a, Q, F>(cx: &'a ScopeState) -> UseQuery<'a, Q, F>
where where
Q: ReadOnlyWorldQuery, Q: ReadOnlyWorldQuery,
F: ReadOnlyWorldQuery, F: ReadOnlyWorldQuery,
@ -111,18 +109,18 @@ where
unsafe { &mut *subscription_manager }.remove(&scope_id); unsafe { &mut *subscription_manager }.remove(&scope_id);
}); });
DioxusUiQuery { UseQuery {
query_state: QueryState::new(world), query_state: QueryState::new(world),
world_cell: world.as_unsafe_world_cell(), world_cell: world.as_unsafe_world_cell(),
} }
} }
pub struct DioxusUiQuery<'a, Q: ReadOnlyWorldQuery, F: ReadOnlyWorldQuery> { pub struct UseQuery<'a, Q: ReadOnlyWorldQuery, F: ReadOnlyWorldQuery> {
query_state: QueryState<Q, F>, query_state: QueryState<Q, F>,
world_cell: UnsafeWorldCell<'a>, world_cell: UnsafeWorldCell<'a>,
} }
impl<'a, Q, F> DioxusUiQuery<'a, Q, F> impl<'a, Q, F> UseQuery<'a, Q, F>
where where
Q: ReadOnlyWorldQuery, Q: ReadOnlyWorldQuery,
F: ReadOnlyWorldQuery, F: ReadOnlyWorldQuery,

View file

@ -28,7 +28,8 @@ use bevy::{
use dioxus::core::{Element, ElementId, Scope, VirtualDom}; use dioxus::core::{Element, ElementId, Scope, VirtualDom};
pub mod prelude { pub mod prelude {
pub use super::ecs_hooks::*; pub use super::deferred_system::use_system_scheduler;
pub use super::ecs_hooks::{use_query, use_query_filtered, use_resource, use_world};
pub use super::elements::*; pub use super::elements::*;
pub use super::use_state_send::*; pub use super::use_state_send::*;
pub use super::{DioxusUiBundle, DioxusUiPlugin, DioxusUiRoot}; pub use super::{DioxusUiBundle, DioxusUiPlugin, DioxusUiRoot};