kitsunecafe
/
bevy_dioxus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP: Direct world access for tick_dioxus_ui()

This commit is contained in:
JMS55 2023-12-15 16:20:05 -08:00
parent 98a22580a1
commit 138a2b5b20
2 changed files with 97 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib.rs
View File

@ -43,8 +43,6 @@ pub struct DioxusUiBundle {
#[derive(Component)]
pub struct DioxusUiRoot {
virtual_dom: VirtualDomUnsafe,
parent_to_children: HashMap<(Entity, u8), Entity>,
children_to_parent: EntityHashMap<Entity, Entity>,
element_id_to_bevy_ui_entity: HashMap<ElementId, Entity>,
bevy_ui_entity_to_element_id: EntityHashMap<Entity, ElementId>,
templates: HashMap<String, BevyTemplate>,
@ -55,8 +53,6 @@ impl DioxusUiRoot {
pub fn new(root_component: fn(Scope) -> Element) -> Self {
Self {
virtual_dom: VirtualDomUnsafe::new(root_component),
parent_to_children: HashMap::new(),
children_to_parent: EntityHashMap::default(),
element_id_to_bevy_ui_entity: HashMap::new(),
bevy_ui_entity_to_element_id: EntityHashMap::default(),
templates: HashMap::new(),

152
src/tick.rs
View File

@ -1,5 +1,5 @@
use crate::{
apply_mutations::apply_mutations,
apply_mutations::{apply_mutations, BevyTemplate},
deferred_system::DeferredSystemRegistry,
events::EventReaders,
hooks::{EcsContext, EcsSubscriptions},
@ -8,27 +8,27 @@ use crate::{
use bevy::{
ecs::{
entity::Entity,
system::{CommandQueue, Commands},
world::{Mut, World},
},
hierarchy::Parent,
prelude::{Deref, DerefMut},
utils::synccell::SyncCell,
utils::{hashbrown::HashMap, synccell::SyncCell, EntityHashMap},
};
use dioxus::core::{Element, Scope, VirtualDom};
use std::{mem, rc::Rc, sync::Arc};
use dioxus::core::{Element, ElementId, Scope, VirtualDom};
use std::{any::Any, mem, rc::Rc, sync::Arc};
pub fn tick_dioxus_ui(world: &mut World) {
run_deferred_systems(world);
let world_ptr: *mut World = world;
let world_cell = world.as_unsafe_world_cell();
let ecs_subscriptions = unsafe { world_cell.get_resource::<EcsSubscriptions>().unwrap() };
let events = unsafe {
let ui_events = unsafe {
world_cell
.get_resource_mut::<EventReaders>()
.unwrap()
.get_dioxus_events(world_cell.get_resource().unwrap())
};
let mut command_queue = CommandQueue::default();
let mut commands = Commands::new_from_entities(&mut command_queue, world_cell.entities());
for (root_entity, mut dioxus_ui_root) in unsafe {
world_cell
@ -38,8 +38,6 @@ pub fn tick_dioxus_ui(world: &mut World) {
} {
let DioxusUiRoot {
virtual_dom,
parent_to_children,
children_to_parent,
element_id_to_bevy_ui_entity,
bevy_ui_entity_to_element_id,
templates,
@ -47,59 +45,33 @@ pub fn tick_dioxus_ui(world: &mut World) {
} = &mut *dioxus_ui_root;
let virtual_dom = virtual_dom.get();
let schedule_update = virtual_dom.base_scope().schedule_update_any();
for scope_id in &*ecs_subscriptions.world_and_queries {
schedule_update(*scope_id);
}
for (resource_id, scope_ids) in &*ecs_subscriptions.resources {
if unsafe { world_cell.world() }.is_resource_changed_by_id(*resource_id) {
for scope_id in scope_ids {
schedule_update(*scope_id);
}
}
}
dispatch_ui_events(
&ui_events,
bevy_ui_entity_to_element_id,
virtual_dom,
unsafe { world_cell.world() },
);
virtual_dom
.base_scope()
.provide_context(EcsContext { world: world_ptr });
schedule_ui_renders_from_ecs_subscriptions(
virtual_dom,
unsafe { world_cell.get_resource::<EcsSubscriptions>().unwrap() },
unsafe { world_cell.world() },
);
for (mut target, name, data) in &events {
let mut target_element_id = bevy_ui_entity_to_element_id.get(&target);
while target_element_id.is_none() {
target = children_to_parent[&target];
target_element_id = bevy_ui_entity_to_element_id.get(&target);
}
virtual_dom.handle_event(name, Rc::clone(data), *target_element_id.unwrap(), true);
}
if *needs_rebuild {
apply_mutations(
virtual_dom.rebuild(),
parent_to_children,
children_to_parent,
element_id_to_bevy_ui_entity,
bevy_ui_entity_to_element_id,
templates,
root_entity,
&mut commands,
);
*needs_rebuild = false;
}
apply_mutations(
virtual_dom.render_immediate(),
parent_to_children,
children_to_parent,
render_ui(
virtual_dom,
needs_rebuild,
element_id_to_bevy_ui_entity,
bevy_ui_entity_to_element_id,
templates,
root_entity,
&mut commands,
unsafe { world_cell.world_mut() },
world_ptr,
);
}
}
command_queue.apply(world);
fn run_deferred_systems(world: &mut World) {
for system_id in mem::take(&mut *world.resource_mut::<DeferredSystemRegistry>().run_queue) {
let _ = world.run_system(system_id);
}
@ -115,6 +87,76 @@ pub fn tick_dioxus_ui(world: &mut World) {
});
}
fn schedule_ui_renders_from_ecs_subscriptions(
virtual_dom: &mut VirtualDom,
ecs_subscriptions: &EcsSubscriptions,
world: &World,
) {
let schedule_update = virtual_dom.base_scope().schedule_update_any();
for scope_id in &*ecs_subscriptions.world_and_queries {
schedule_update(*scope_id);
}
for (resource_id, scope_ids) in &*ecs_subscriptions.resources {
if world.is_resource_changed_by_id(*resource_id) {
for scope_id in scope_ids {
schedule_update(*scope_id);
}
}
}
}
fn dispatch_ui_events(
events: &Vec<(Entity, &str, Rc<dyn Any>)>,
bevy_ui_entity_to_element_id: &mut EntityHashMap<Entity, ElementId>,
virtual_dom: &mut VirtualDom,
world: &World,
) {
for (mut target, name, data) in events {
let mut target_element_id = bevy_ui_entity_to_element_id.get(&target);
while target_element_id.is_none() {
target = world.entity(target).get::<Parent>().unwrap().get();
target_element_id = bevy_ui_entity_to_element_id.get(&target);
}
virtual_dom.handle_event(name, Rc::clone(data), *target_element_id.unwrap(), true);
}
}
fn render_ui(
virtual_dom: &mut VirtualDom,
needs_rebuild: &mut bool,
element_id_to_bevy_ui_entity: &mut HashMap<ElementId, Entity>,
bevy_ui_entity_to_element_id: &mut EntityHashMap<Entity, ElementId>,
templates: &mut HashMap<String, BevyTemplate>,
root_entity: Entity,
world: &mut World,
world_ptr: *mut World,
) {
virtual_dom
.base_scope()
.provide_context(EcsContext { world: world_ptr });
if *needs_rebuild {
apply_mutations(
virtual_dom.rebuild(),
element_id_to_bevy_ui_entity,
bevy_ui_entity_to_element_id,
templates,
root_entity,
world,
);
*needs_rebuild = false;
}
apply_mutations(
virtual_dom.render_immediate(),
element_id_to_bevy_ui_entity,
bevy_ui_entity_to_element_id,
templates,
root_entity,
world,
);
}
#[derive(Deref, DerefMut)]
pub struct VirtualDomUnsafe(pub SyncCell<VirtualDom>);
unsafe impl Send for VirtualDomUnsafe {}