StarArawn · StarArawn · Aug 4, 2024 · Aug 3, 2024 · Aug 4, 2024 · Aug 4, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,7 +48,7 @@ bevy = { version = "0.14", features = ["jpeg"] }
 [patch.crates-io]
 bevy_mod_picking = { git = "https://github.com/StarArawn/bevy_mod_picking", branch = "main" }
 bevy_eventlistener = { git = "https://github.com/StarArawn/bevy_eventlistener", branch = "main" }
-bevy_vello = { git = "https://github.com/ChristopherBiscardi/bevy_vello", branch = "renderlayer-canvas-fix" }
+bevy_vello = { git = "https://github.com/linebender/bevy_vello", rev = "f21cdc2" }
 
 [[example]]
 name = "todo"

diff --git a/examples/calc.rs b/examples/calc.rs
@@ -26,7 +26,7 @@ fn get_buttons() -> [&'static str; 16] {
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .insert_resource(CalcOutput("".into()))

diff --git a/examples/children.rs b/examples/children.rs
@@ -84,7 +84,7 @@ fn baz_render(entity: Res<CurrentWidget>, query: Query<&BazWidget>) {
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(WorldInspectorPlugin::new())
         .add_plugins(DefaultPickingPlugins)
         .register_widget::<FooWidget>()

diff --git a/examples/classes.rs b/examples/classes.rs
@@ -43,7 +43,7 @@ mod classes {
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/clipping.rs b/examples/clipping.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/counter.rs b/examples/counter.rs
@@ -108,7 +108,7 @@ fn render(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .register_widget::<CounterWidget>()

diff --git a/examples/focus.rs b/examples/focus.rs
@@ -84,7 +84,7 @@ fn focus_render(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .insert_resource(DebugPickingMode::Normal)
         .register_widget::<FocusWidget>()

diff --git a/examples/icon_button.rs b/examples/icon_button.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .insert_resource(DebugPickingMode::Normal)
         .add_systems(Startup, startup)

diff --git a/examples/image.rs b/examples/image.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/image_contained.rs b/examples/image_contained.rs
@@ -151,7 +151,7 @@ fn render(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .register_widget::<MyWidget>()
         .add_systems(Startup, startup)

diff --git a/examples/modal.rs b/examples/modal.rs
@@ -153,7 +153,7 @@ fn render(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .register_widget::<MyWidget>()
         .add_systems(Startup, startup)

diff --git a/examples/render_layers.rs b/examples/render_layers.rs
@@ -0,0 +1,75 @@
+use bevy::{prelude::*, render::view::RenderLayers};
+use bevy_mod_picking::DefaultPickingPlugins;
+use bevy_vello::render::VelloRenderSettings;
+use woodpecker_ui::prelude::*;
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_plugins(WoodpeckerUIPlugin)
+        .insert_resource(VelloRenderSettings {
+            canvas_render_layers: RenderLayers::layer(1),
+        })
+        .add_plugins(DefaultPickingPlugins)
+        .add_systems(Startup, startup)
+        .add_systems(Update, flip_render_layers)
+        .run();
+}
+
+fn flip_render_layers(
+    mut query: Query<&mut RenderLayers, With<Camera2d>>,
+    input: Res<ButtonInput<KeyCode>>,
+    mut local: Local<u8>,
+) {
+    if input.just_pressed(KeyCode::Space) {
+        for mut layer in &mut query {
+            *layer = match *local {
+                0 => {
+                    info!("camera showing layer 0");
+                    *local = 1;
+                    RenderLayers::layer(0)
+                }
+                1 => {
+                    info!("camera showing layer 1");
+                    *local = 0;
+                    RenderLayers::layer(1)
+                }
+                _ => unreachable!(),
+            };
+        }
+    }
+}
+fn startup(
+    mut commands: Commands,
+    mut ui_context: ResMut<WoodpeckerContext>,
+    mut font_manager: ResMut<FontManager>,
+    asset_server: Res<AssetServer>,
+) {
+    commands.spawn((Camera2dBundle::default(), RenderLayers::layer(1)));
+
+    let font = asset_server.load("Outfit/static/Outfit-Regular.ttf");
+    font_manager.add(&font);
+
+    let root = commands
+        .spawn(WoodpeckerAppBundle {
+            children: WidgetChildren::default().with_child::<Element>((
+                ElementBundle {
+                    styles: WoodpeckerStyle {
+                        font_size: 50.0,
+                        color: Srgba::RED.into(),
+                        margin: Edge::all(10.0),
+                        font: Some(font.id()),
+                        ..Default::default()
+                    },
+                    ..Default::default()
+                },
+                WidgetRender::Text {
+                    content: "Space to change Camera RenderLayer. WoodPecker is on layer 1".into(),
+                    word_wrap: true,
+                },
+            )),
+            ..Default::default()
+        })
+        .id();
+    ui_context.set_root_widget(root);
+}
diff --git a/examples/scrolling.rs b/examples/scrolling.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/svg.rs b/examples/svg.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/text.rs b/examples/text.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/text_box.rs b/examples/text_box.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/examples/todo/todo.rs b/examples/todo/todo.rs
@@ -14,7 +14,7 @@ pub struct TodoListData(Vec<String>);
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .register_widget::<TodoList>()
         .register_widget::<TodoInput>()

diff --git a/examples/transition.rs b/examples/transition.rs
@@ -5,7 +5,7 @@ use woodpecker_ui::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(WoodpeckerUIPlugin::default())
+        .add_plugins(WoodpeckerUIPlugin)
         .add_plugins(DefaultPickingPlugins)
         .add_systems(Startup, startup)
         .run();

diff --git a/src/lib.rs b/src/lib.rs
@@ -11,7 +11,7 @@
 //! - [Taffy](https://github.com/DioxusLabs/taffy) layouting
 //! - [Cosmic Text](https://github.com/pop-os/cosmic-text) for text layouting
 //! - A few helper widgets to get you started
-//! 
+//!
 //! ## Example:
 //! ```rust
 //! fn startup(
@@ -59,10 +59,10 @@
 //!         .id();
 //!     ui_context.set_root_widget(root);
 //! }
-//! 
+//!
 //! ```
 use bevy::{
-    asset::embedded_asset, prelude::*, reflect::GetTypeRegistration, render::view::RenderLayers,
+    asset::embedded_asset, prelude::*, reflect::GetTypeRegistration,
 };
 use bevy_mod_picking::{events::Pointer, prelude::EventListenerPlugin};
 use bevy_trait_query::RegisterExt;
@@ -136,7 +136,7 @@ pub struct ParentWidget(pub Entity);
 
 impl ParentWidget {
     /// Converts a ParentWidget into a CurrentWidget
-    /// 
+    ///
     /// Note: Really just a convince function.
     pub fn as_current(&self) -> CurrentWidget {
         CurrentWidget(self.0)
@@ -151,7 +151,7 @@ pub struct CurrentWidget(pub Entity);
 
 impl CurrentWidget {
     /// Converts a CurrentWidget into a ParentWidget.
-    /// 
+    ///
     /// Note: Really just a convince function.
     pub fn as_parent(&self) -> ParentWidget {
         ParentWidget(self.0)
@@ -161,17 +161,13 @@ impl CurrentWidget {
 /// The Woodpecker UI bevy Plugin
 /// Add this to bevy to use.
 #[derive(Default)]
-pub struct WoodpeckerUIPlugin {
-    pub render_layers: Option<RenderLayers>,
-}
+pub struct WoodpeckerUIPlugin;
 
 impl Plugin for WoodpeckerUIPlugin {
     fn build(&self, app: &mut App) {
         embedded_asset!(app, "embedded_assets/Poppins-Regular.ttf");
         app.add_plugins(WoodpeckerLayoutPlugin)
-            .add_plugins(VelloPlugin {
-                canvas_render_layers: self.render_layers.clone(),
-            })
+            .add_plugins(VelloPlugin::default())
             .add_plugins(WoodpeckerUIWidgetPlugin)
             .add_plugins(EventListenerPlugin::<focus::WidgetFocus>::default())
             .add_plugins(EventListenerPlugin::<focus::WidgetBlur>::default())
@@ -238,17 +234,15 @@ fn has_root() -> impl Condition<(), ()> {
 
 fn startup(
     mut commands: Commands,
-    vello_render_config: Res<bevy_vello::render::VelloRenderPlugin>,
+    vello_render_config: Res<bevy_vello::render::VelloRenderSettings>,
 ) {
-    let entity = commands
-        .spawn(VelloSceneBundle {
+    commands.spawn((
+        VelloSceneBundle {
             coordinate_space: CoordinateSpace::ScreenSpace,
             ..Default::default()
-        })
-        .id();
-    if let Some(layers) = &vello_render_config.canvas_render_layers {
-        commands.entity(entity).insert(layers.clone());
-    }
+        },
+        vello_render_config.canvas_render_layers.clone(),
+    ));
 }
 
 /// A trait that gives us some extra functionality for register widgets