Merge pull request #249 from StarArawn/v0.4.1

StarArawn · web-flow · commit 228473728242 · 2023-05-01T22:43:35.000-04:00
v0.4.1
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "kayak_ui"
 description = "A UI library built using the bevy game engine!"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 resolver = "2"
 authors = ["John Mitchell"]
diff --git a/examples/svg.rs b/examples/svg.rs
@@ -20,17 +20,23 @@ fn startup(
     let parent_id = None;
     rsx! {
         <KayakAppBundle>
-            <KSvgBundle
-                svg={KSvg(svg)}
+            <ElementBundle
                 styles={KStyle {
                     position_type: StyleProp::Value(KPositionType::SelfDirected),
-                    left: StyleProp::Value(Units::Pixels(10.0)),
-                    top: StyleProp::Value(Units::Pixels(10.0)),
-                    width: StyleProp::Value(Units::Pixels(800.0)),
-                    height: StyleProp::Value(Units::Pixels(800.0)),
+                    left: StyleProp::Value(Units::Pixels(-34.545261 * 7.6)),
+                    top: StyleProp::Value(Units::Pixels(10.0 - 95.557219 * 7.6)),
                     ..Default::default()
                 }}
-            />
+            >
+                <KSvgBundle
+                    svg={KSvg(svg)}
+                    styles={KStyle {
+                        width: StyleProp::Value(Units::Pixels(800.0)),
+                        height: StyleProp::Value(Units::Pixels(800.0)),
+                        ..Default::default()
+                    }}
+                />
+            </ElementBundle>
         </KayakAppBundle>
     };
 
diff --git a/examples/tabs/tabs.rs b/examples/tabs/tabs.rs
@@ -75,10 +75,10 @@ fn startup(
                             ..Default::default()
                         }}
                     >
-                        <TabBundle tab={Tab { index: 0 }}>
+                        <TabBundle key={"tab1"} tab={Tab { index: 0 }}>
                             <TextWidgetBundle text={TextProps { content: "Tab 1 Content".into(), size: 14.0, line_height: Some(14.0), ..Default::default() }} />
                         </TabBundle>
-                        <TabBundle tab={Tab { index: 1 }}>
+                        <TabBundle key={"tab2"} tab={Tab { index: 1 }}>
                             <TextWidgetBundle text={TextProps { content: "Tab 2 Content".into(), size: 14.0, line_height: Some(14.0), ..Default::default() }} />
                         </TabBundle>
                     </ElementBundle>
diff --git a/src/children.rs b/src/children.rs
@@ -63,6 +63,7 @@ impl KChildren {
         for child in self.inner.iter() {
             if let Some(parent_id) = parent_id {
                 if let Some(mut entity_commands) = commands.get_entity(*child) {
+                    entity_commands.remove::<Parent>();
                     entity_commands.set_parent(parent_id);
                 }
             }
diff --git a/src/context.rs b/src/context.rs
diff --git a/src/context_entities.rs b/src/context_entities.rs
@@ -8,7 +8,7 @@ use dashmap::DashMap;
 
 #[derive(Debug, Clone)]
 pub struct ContextEntities {
-    ce: Arc<DashMap<Entity, DashMap<TypeId, Entity>>>,
+    ce: Arc<DashMap<Option<Entity>, DashMap<TypeId, Entity>>>,
 }
 
 impl ContextEntities {
@@ -20,7 +20,7 @@ impl ContextEntities {
 
     pub fn add_context_entity<T: Default + 'static>(
         &self,
-        parent_id: Entity,
+        parent_id: Option<Entity>,
         context_entity: Entity,
     ) {
         if !self.ce.contains_key(&parent_id) {
@@ -30,7 +30,10 @@ impl ContextEntities {
         inner.insert(T::default().type_id(), context_entity);
     }
 
-    pub fn get_context_entity<T: Default + 'static>(&self, parent_id: Entity) -> Option<Entity> {
+    pub fn get_context_entity<T: Default + 'static>(
+        &self,
+        parent_id: Option<Entity>,
+    ) -> Option<Entity> {
         if !self.ce.contains_key(&parent_id) {
             return None;
         }
diff --git a/src/event_dispatcher.rs b/src/event_dispatcher.rs
@@ -425,9 +425,8 @@ impl EventDispatcher {
                             let mut stack_children = Vec::new();
                             for child in children {
                                 let child_z = world
-                                    .entity(child.0)
-                                    .get::<Node>()
-                                    .map(|node| node.z)
+                                    .get_entity(child.0)
+                                    .map(|e| e.get::<Node>().map(|node| node.z).unwrap_or(0.0))
                                     .unwrap_or(0.0);
                                 stack_children.push((child_z, (*child, depth + 1)));
                             }
@@ -862,7 +861,7 @@ impl EventDispatcher {
     }
 }
 
-#[derive(Resource)]
+#[derive(Resource, Default)]
 pub struct EventDispatcherContext {
     cursor_capture: Option<WrappedIndex>,
 }
diff --git a/src/on_event.rs b/src/on_event.rs
@@ -13,7 +13,7 @@ use crate::widget_state::WidgetState;
 /// as a parameter.
 #[derive(Component, Clone)]
 pub struct OnEvent {
-    has_initialized: bool,
+    has_initialized: Arc<RwLock<bool>>,
     system: Arc<RwLock<dyn System<In = Entity, Out = ()>>>,
 }
 
@@ -22,7 +22,6 @@ impl Default for OnEvent {
         Self::new(|In(_entity)| {})
     }
 }
-
 impl OnEvent {
     /// Create a new event handler
     ///
@@ -31,7 +30,7 @@ impl OnEvent {
     /// 2. The event
     pub fn new<Params>(system: impl IntoSystem<Entity, (), Params>) -> OnEvent {
         Self {
-            has_initialized: false,
+            has_initialized: Arc::new(RwLock::new(false)),
             system: Arc::new(RwLock::new(IntoSystem::into_system(system))),
         }
     }
@@ -48,21 +47,23 @@ impl OnEvent {
         world: &mut World,
     ) -> (EventDispatcherContext, KEvent) {
         if let Ok(mut system) = self.system.try_write() {
-            if !self.has_initialized {
-                system.initialize(world);
-                self.has_initialized = true;
+            if let Ok(mut has_initialized) = self.has_initialized.try_write() {
+                if !*has_initialized {
+                    system.initialize(world);
+                    *has_initialized = true;
+                }
             }
             // Insert resources
             world.insert_resource(event_dispatcher_context);
             world.insert_resource(widget_state);
             world.insert_resource(event);
 
             system.run(entity, world);
+            system.apply_buffers(world);
 
             event_dispatcher_context = world.remove_resource::<EventDispatcherContext>().unwrap();
             event = world.remove_resource::<KEvent>().unwrap();
-
-            system.apply_buffers(world);
+            world.remove_resource::<WidgetState>().unwrap();
         }
         (event_dispatcher_context, event)
     }
diff --git a/src/render/ui_pass.rs b/src/render/ui_pass.rs
@@ -4,7 +4,7 @@ use bevy::ecs::prelude::*;
 use bevy::prelude::{Color, Image};
 use bevy::render::render_asset::RenderAssets;
 use bevy::render::render_phase::{
-    BatchedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId, PhaseItem,
+    BatchedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId, DrawFunctions, PhaseItem,
 };
 use bevy::render::render_resource::{CachedRenderPipelineId, RenderPassColorAttachment};
 use bevy::render::{
@@ -209,6 +209,10 @@ impl Node for MainPassUINode {
             if let Some(opacity_layer_manager) =
                 opacity_layer_manager.camera_layers.get(&view_entity)
             {
+                let draw_functions = world.resource::<DrawFunctions<TransparentOpacityUI>>();
+                let mut draw_functions = draw_functions.write();
+                draw_functions.prepare(world);
+
                 for layer_id in 1..MAX_OPACITY_LAYERS {
                     // Start new render pass.
                     let gpu_images = world.get_resource::<RenderAssets<Image>>().unwrap();
@@ -230,7 +234,14 @@ impl Node for MainPassUINode {
                     let mut tracked_pass =
                         render_context.begin_tracked_render_pass(pass_descriptor);
 
-                    transparent_opacity_phase.render(&mut tracked_pass, world, view_entity);
+                    for item in transparent_opacity_phase
+                        .items
+                        .iter()
+                        .filter(|i| i.opacity_layer == layer_id)
+                    {
+                        let draw_function = draw_functions.get_mut(item.draw_function()).unwrap();
+                        draw_function.draw(world, &mut tracked_pass, view_entity, item);
+                    }
                 }
             }
         }
diff --git a/src/render/unified/pipeline.rs b/src/render/unified/pipeline.rs
@@ -950,12 +950,7 @@ pub fn queue_quads_inner(
                     position: final_position.into(),
                     color,
                     uv: [0.0; 4],
-                    pos_size: [
-                        sprite_rect.min.x,
-                        sprite_rect.min.y,
-                        sprite_rect.size().x,
-                        sprite_rect.size().y,
-                    ],
+                    pos_size: [0.0, 0.0, sprite_rect.size().x, sprite_rect.size().y],
                 });
             }
             *index += indices.len() as u32;
diff --git a/src/tree.rs b/src/tree.rs
@@ -1,8 +1,9 @@
-use bevy::prelude::Entity;
+use bevy::prelude::{Entity, World};
 use bevy::utils::HashMap;
 use morphorm::Hierarchy;
 use std::iter::Rev;
 
+use crate::context::WidgetName;
 use crate::node::WrappedIndex;
 
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
@@ -34,6 +35,25 @@ impl ChildChanges {
             .iter()
             .all(|change| change.3.iter().all(|c| *c == Change::Unchanged))
     }
+
+    pub fn debug_print(&self, world: &World) {
+        for (index, child, parent, changes) in self.changes.iter() {
+            if let Some(entity_ref) = world.get_entity(child.0) {
+                let name = entity_ref
+                    .get::<WidgetName>()
+                    .map(|n| n.0.clone())
+                    .unwrap_or("Unknown".into());
+                println!(
+                    "[name: {}, index: {}, entity: {}, parent: {},  change: {:?}]",
+                    name,
+                    index,
+                    child.0.index(),
+                    parent.0.index(),
+                    changes
+                );
+            }
+        }
+    }
 }
 
 impl From<Vec<(usize, WrappedIndex, WrappedIndex, Vec<Change>)>> for ChildChanges {
@@ -59,6 +79,11 @@ impl Tree {
         }
     }
 
+    pub fn remove_without_children(&mut self, index: WrappedIndex) {
+        self.parents.remove(&index);
+        self.children.remove(&index);
+    }
+
     /// Remove the given node and recursively removes its descendants
     pub fn remove(&mut self, index: WrappedIndex) -> Vec<WrappedIndex> {
         let parent = self.parents.remove(&index);
@@ -630,19 +655,74 @@ impl Tree {
 
     /// Sometimes we need to see the entire tree even dangling nodes.
     /// This function will display everything.
-    pub fn dump_all(&self) {
+    pub fn dump_all(&self, world: &World) {
         let mut children = self.children.iter().collect::<Vec<_>>();
         children.sort_by(|(a, _), (b, _)| a.0.index().partial_cmp(&b.0.index()).unwrap());
 
         for (parent, children) in children.iter() {
-            println!("[{}]", parent.0.index());
+            let name = if let Some(entity_ref) = world.get_entity(parent.0) {
+                entity_ref.get::<WidgetName>().map(|n| n.0.clone())
+            } else {
+                None
+            };
+            println!(
+                "[{}::{}]",
+                name.unwrap_or("Unknown".into()),
+                parent.0.index()
+            );
             for child in children.iter() {
-                println!("    [{}]", child.0.index());
+                let name = if let Some(entity_ref) = world.get_entity(parent.0) {
+                    entity_ref.get::<WidgetName>().map(|n| n.0.clone())
+                } else {
+                    None
+                };
+                println!(
+                    "    [{}::{}]",
+                    name.unwrap_or("Unknown".into()),
+                    child.0.index()
+                );
             }
             println!();
         }
     }
 
+    /// Sometimes we need to see the entire tree even dangling nodes.
+    /// This function will display everything.
+    pub fn dump_all_at(&self, world: Option<&World>, parent: Entity) {
+        let no_children = vec![];
+        let children = self
+            .children
+            .get(&WrappedIndex(parent))
+            .unwrap_or(&no_children);
+
+        let name: Option<String> = if let Some(world) = world {
+            if let Some(entity_ref) = world.get_entity(parent) {
+                entity_ref.get::<WidgetName>().map(|n| n.0.clone())
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+        println!("[{}::{}]", name.unwrap_or("Unknown".into()), parent.index());
+        for child in children.iter() {
+            let name = if let Some(world) = world {
+                if let Some(entity_ref) = world.get_entity(child.0) {
+                    entity_ref.get::<WidgetName>().map(|n| n.0.clone())
+                } else {
+                    None
+                }
+            } else {
+                None
+            };
+            println!(
+                "    [{}::{}]",
+                name.unwrap_or("Unknown".into()),
+                child.0.index()
+            );
+        }
+    }
+
     /// Dumps a section of the tree's current state to the console (starting from a specific index)
     ///
     /// To dump the entire tree, use [dump] instead.
diff --git a/src/widget_context.rs b/src/widget_context.rs

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ impl KChildren {`
`63`	`63`	`for child in self.inner.iter() {`
`64`	`64`	`if let Some(parent_id) = parent_id {`
`65`	`65`	`if let Some(mut entity_commands) = commands.get_entity(*child) {`
	`66`	`+ entity_commands.remove::<Parent>();`
`66`	`67`	`entity_commands.set_parent(parent_id);`
`67`	`68`	`}`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -425,9 +425,8 @@ impl EventDispatcher {`
`425`	`425`	`let mut stack_children = Vec::new();`
`426`	`426`	`for child in children {`
`427`	`427`	`let child_z = world`
`428`		`- .entity(child.0)`
`429`		`- .get::<Node>()`
`430`		`- .map(\|node\| node.z)`
	`428`	`+ .get_entity(child.0)`
	`429`	`+ .map(\|e\| e.get::<Node>().map(\|node\| node.z).unwrap_or(0.0))`
`431`	`430`	`.unwrap_or(0.0);`
`432`	`431`	`stack_children.push((child_z, (*child, depth + 1)));`
`433`	`432`	`}`
`@@ -862,7 +861,7 @@ impl EventDispatcher {`
`862`	`861`	`}`
`863`	`862`	`}`
`864`	`863`
`865`		`-#[derive(Resource)]`
	`864`	`+#[derive(Resource, Default)]`
`866`	`865`	`pub struct EventDispatcherContext {`
`867`	`866`	`cursor_capture: Option<WrappedIndex>,`
`868`	`867`	`}`