From 36b95866ad91a21f7bac61b112612026946dd548 Mon Sep 17 00:00:00 2001
From: "Spencer C. Imbleau" <spencer@imbleau.com>
Date: Sat, 3 Aug 2024 20:25:07 -0400
Subject: [PATCH] fix: canvas layer changes, refactor to plugin settings

---
 CHANGELOG.md                       |   1 +
 examples/cube3d/src/main.rs        |   2 +-
 examples/demo/src/main.rs          |   2 +-
 examples/drag_n_drop/src/main.rs   |   2 +-
 examples/lottie/src/main.rs        |   2 +-
 examples/render_layers/src/main.rs | 112 +++++++++++++----------------
 examples/scene/src/main.rs         |   2 +-
 examples/scene_ui/src/main.rs      |   2 +-
 examples/svg/src/main.rs           |   2 +-
 examples/text/src/main.rs          |   2 +-
 src/lib.rs                         |   2 +-
 src/plugin.rs                      |  12 +++-
 src/render/plugin.rs               |  12 ++--
 src/render/systems.rs              |  29 +++++---
 14 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71e00d0..48b02c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 
 ### Changed
 
+- `VelloPlugin` now has configuration. To retain previous behavior, use `VelloPlugin::default()`.
 - The font API has changed significantly. Please visit `examples/text` for further usage. This is to prepare for additional text features such as linebreak behavior, bounded text, and text justification.
   - `VelloText` has been renamed to `VelloTextSection`.
   - `VelloText.content` has been renamed to `VelloText.value`.
diff --git a/examples/cube3d/src/main.rs b/examples/cube3d/src/main.rs
index 6940bcf..11cf294 100644
--- a/examples/cube3d/src/main.rs
+++ b/examples/cube3d/src/main.rs
@@ -33,7 +33,7 @@ fn main() {
     let mut app = App::new();
 
     app.add_plugins(DefaultPlugins)
-        .add_plugins(VelloPlugin)
+        .add_plugins(VelloPlugin::default())
         .add_systems(Startup, setup)
         .add_systems(Update, cube_rotator_system)
         .add_plugins(ExtractComponentPlugin::<VelloTarget>::default());
diff --git a/examples/demo/src/main.rs b/examples/demo/src/main.rs
index 533b625..4eedd25 100644
--- a/examples/demo/src/main.rs
+++ b/examples/demo/src/main.rs
@@ -15,7 +15,7 @@ fn main() {
         ..default()
     }))
     .add_plugins(EguiPlugin)
-    .add_plugins(VelloPlugin)
+    .add_plugins(VelloPlugin::default())
     .init_resource::<EmbeddedAssetRegistry>()
     .add_plugins(bevy_pancam::PanCamPlugin)
     .add_systems(Startup, setup_vector_graphics)
diff --git a/examples/drag_n_drop/src/main.rs b/examples/drag_n_drop/src/main.rs
index 9424b82..0bca583 100644
--- a/examples/drag_n_drop/src/main.rs
+++ b/examples/drag_n_drop/src/main.rs
@@ -10,7 +10,7 @@ fn main() {
         meta_check: AssetMetaCheck::Never,
         ..default()
     }))
-    .add_plugins(VelloPlugin)
+    .add_plugins(VelloPlugin::default())
     .add_systems(Startup, setup_vector_graphics)
     .add_systems(Update, drag_and_drop);
     embedded_asset!(app, "assets/fountain.svg");
diff --git a/examples/lottie/src/main.rs b/examples/lottie/src/main.rs
index 4a0d30c..f3e3306 100644
--- a/examples/lottie/src/main.rs
+++ b/examples/lottie/src/main.rs
@@ -10,7 +10,7 @@ fn main() {
         meta_check: AssetMetaCheck::Never,
         ..default()
     }))
-    .add_plugins(VelloPlugin)
+    .add_plugins(VelloPlugin::default())
     .add_systems(Startup, load_lottie);
     embedded_asset!(app, "assets/Tiger.json");
     app.run();
diff --git a/examples/render_layers/src/main.rs b/examples/render_layers/src/main.rs
index 95dc339..84a328a 100644
--- a/examples/render_layers/src/main.rs
+++ b/examples/render_layers/src/main.rs
@@ -6,55 +6,71 @@ use bevy_vello::{prelude::*, VelloPlugin};
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(VelloPlugin)
-        .add_systems(Startup, (setup_animation, setup_background))
+        .add_plugins(VelloPlugin::default())
         .add_systems(
-            Update,
+            Startup,
             (
-                layer0_animation,
-                layer1_animation,
-                layer2_background,
-                run_gizmos,
+                setup_canvas,
+                setup_gizmos,
+                setup_animation,
+                setup_background,
             ),
         )
+        .add_systems(Update, (animation, background, run_gizmos))
         .run();
 }
 
-/// A tag that will mark the scene on RenderLayer 0.
+/// A tag that will mark the scene with animation.
 #[derive(Component)]
-struct Layer0Scene;
+struct AnimationScene;
 
-/// A tag that will mark the scene on RenderLayer 1.
+/// A tag that will mark the scene with the blue square.
 #[derive(Component)]
-struct Layer1Scene;
+struct BackgroundScene;
 
-/// A tag that will mark the scene on RenderLayer 2.
-#[derive(Component)]
-struct Layer2Scene;
+fn setup_canvas(mut settings: ResMut<VelloRenderSettings>) {
+    // There's only 1 Vello canvas, so as long as you use a layer that has a camera, you're good!
+    settings.canvas_render_layers = RenderLayers::layer(3); // the gizmo camera layer
+}
 
-fn setup_animation(mut commands: Commands) {
-    const LAYER_0: RenderLayers = RenderLayers::layer(0);
-    const LAYER_1: RenderLayers = RenderLayers::layer(1);
+fn setup_gizmos(mut commands: Commands, mut config_store: ResMut<GizmoConfigStore>) {
+    // This camera can only see Gizmos.
+    commands.spawn((
+        Camera2dBundle {
+            camera: Camera {
+                // This camera will render LAST.
+                order: 1,
+                ..default()
+            },
+            ..default()
+        },
+        RenderLayers::layer(3),
+    ));
+    let (config, _) = config_store.config_mut::<DefaultGizmoConfigGroup>();
+    config.render_layers = RenderLayers::layer(3);
+}
 
-    // This camera can see everything on Layer 1 and Layer 2.
+fn setup_animation(mut commands: Commands) {
     commands.spawn((
         Camera2dBundle {
             camera: Camera {
                 // This camera will render AFTER the blue background camera!
-                order: 1,
+                order: 0,
                 ..default()
             },
             ..default()
         },
-        LAYER_0.union(&LAYER_1),
+        RenderLayers::layer(2),
     ));
 
-    commands.spawn((VelloSceneBundle::default(), Layer0Scene, LAYER_0));
-    commands.spawn((VelloSceneBundle::default(), Layer1Scene, LAYER_1));
+    commands.spawn((
+        VelloSceneBundle::default(),
+        AnimationScene,
+        RenderLayers::layer(2),
+    ));
 }
 
 fn setup_background(mut commands: Commands) {
-    const LAYER: RenderLayers = RenderLayers::layer(2);
     commands.spawn((
         Camera2dBundle {
             camera: Camera {
@@ -64,13 +80,17 @@ fn setup_background(mut commands: Commands) {
             },
             ..default()
         },
-        LAYER,
+        RenderLayers::layer(1),
+    ));
+    commands.spawn((
+        VelloSceneBundle::default(),
+        BackgroundScene,
+        RenderLayers::layer(1),
     ));
-    commands.spawn((VelloSceneBundle::default(), Layer2Scene, LAYER));
 }
 
-fn layer0_animation(
-    mut query_scene: Query<(&mut Transform, &mut VelloScene), With<Layer0Scene>>,
+fn animation(
+    mut query_scene: Query<(&mut Transform, &mut VelloScene), With<AnimationScene>>,
     time: Res<Time>,
 ) {
     let sin_time = time.elapsed_seconds().sin().mul_add(0.5, 0.5);
@@ -95,43 +115,11 @@ fn layer0_animation(
     );
 
     transform.scale = Vec3::lerp(Vec3::ONE * 0.5, Vec3::ONE * 1.0, sin_time);
-    transform.translation =
-        Vec3::lerp(Vec3::X * -100.0, Vec3::X * 100.0, sin_time) - Vec3::Y * 100.0;
-    transform.rotation = Quat::from_rotation_z(-std::f32::consts::TAU * sin_time);
-}
-
-fn layer1_animation(
-    mut query_scene: Query<(&mut Transform, &mut VelloScene), With<Layer1Scene>>,
-    time: Res<Time>,
-) {
-    let sin_time = time.elapsed_seconds().sin().mul_add(0.5, 0.5);
-    let (mut transform, mut scene) = query_scene.single_mut();
-    // Reset scene every frame
-    *scene = VelloScene::default();
-
-    // Animate color green to blue
-    let c = Vec3::lerp(
-        Vec3::new(1.0, -1.0, 0.0),
-        Vec3::new(1.0, 1.0, 0.0),
-        sin_time + 0.5,
-    );
-
-    // Animate the corner radius
-    scene.fill(
-        peniko::Fill::NonZero,
-        kurbo::Affine::default(),
-        peniko::Color::rgb(c.x as f64, c.y as f64, c.z as f64),
-        None,
-        &kurbo::RoundedRect::new(-50.0, -50.0, 50.0, 50.0, (sin_time as f64) * 50.0),
-    );
-
-    transform.scale = Vec3::lerp(Vec3::ONE * 0.5, Vec3::ONE * 1.0, sin_time);
-    transform.translation =
-        Vec3::lerp(Vec3::X * -100.0, Vec3::X * 100.0, sin_time) * Vec3::NEG_X + Vec3::Y * 100.0;
+    transform.translation = Vec3::lerp(Vec3::X * -100.0, Vec3::X * 100.0, sin_time);
     transform.rotation = Quat::from_rotation_z(-std::f32::consts::TAU * sin_time);
 }
 
-fn layer2_background(mut query_scene: Query<&mut VelloScene, With<Layer2Scene>>) {
+fn background(mut query_scene: Query<&mut VelloScene, With<BackgroundScene>>) {
     let mut scene = query_scene.single_mut();
     *scene = VelloScene::default();
     scene.fill(
@@ -144,5 +132,5 @@ fn layer2_background(mut query_scene: Query<&mut VelloScene, With<Layer2Scene>>)
 }
 
 fn run_gizmos(mut gizmos: Gizmos) {
-    gizmos.circle_2d(Vec2::splat(0.0), 20.0, css::RED);
+    gizmos.circle_2d(Vec2::splat(0.0), 100.0, css::MAGENTA);
 }
diff --git a/examples/scene/src/main.rs b/examples/scene/src/main.rs
index 5266236..95828b2 100644
--- a/examples/scene/src/main.rs
+++ b/examples/scene/src/main.rs
@@ -8,7 +8,7 @@ use bevy_vello::{
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(VelloPlugin)
+        .add_plugins(VelloPlugin::default())
         .add_systems(Startup, setup_vector_graphics)
         .add_systems(Update, simple_animation)
         .run();
diff --git a/examples/scene_ui/src/main.rs b/examples/scene_ui/src/main.rs
index c78cc9d..6735c68 100644
--- a/examples/scene_ui/src/main.rs
+++ b/examples/scene_ui/src/main.rs
@@ -5,7 +5,7 @@ use std::f64::consts::{FRAC_PI_4, SQRT_2};
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugins(VelloPlugin)
+        .add_plugins(VelloPlugin::default())
         .add_systems(Startup, setup_ui)
         .add_systems(Update, update_ui)
         .run();
diff --git a/examples/svg/src/main.rs b/examples/svg/src/main.rs
index 91be0f9..8db803e 100644
--- a/examples/svg/src/main.rs
+++ b/examples/svg/src/main.rs
@@ -10,7 +10,7 @@ fn main() {
         meta_check: AssetMetaCheck::Never,
         ..default()
     }))
-    .add_plugins(VelloPlugin)
+    .add_plugins(VelloPlugin::default())
     .add_systems(Startup, load_svg);
     embedded_asset!(app, "assets/fountain.svg");
     app.run();
diff --git a/examples/text/src/main.rs b/examples/text/src/main.rs
index e7e857e..f152d0d 100644
--- a/examples/text/src/main.rs
+++ b/examples/text/src/main.rs
@@ -10,7 +10,7 @@ fn main() {
         meta_check: AssetMetaCheck::Never,
         ..default()
     }))
-    .add_plugins(VelloPlugin)
+    .add_plugins(VelloPlugin::default())
     .add_systems(
         Startup,
         (setup_camera, setup_screenspace_text, setup_worldspace_text),
diff --git a/src/lib.rs b/src/lib.rs
index 8213584..8c01e21 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,7 +24,7 @@ pub mod prelude {
     pub use crate::{
         debug::DebugVisualizations,
         integrations::{VectorFile, VelloAsset, VelloAssetAnchor},
-        render::VelloCanvasMaterial,
+        render::{VelloCanvasMaterial, VelloRenderSettings},
         text::{VelloFont, VelloTextAnchor, VelloTextSection, VelloTextStyle},
         CoordinateSpace, VelloAssetBundle, VelloScene, VelloSceneBundle, VelloTextBundle,
     };
diff --git a/src/plugin.rs b/src/plugin.rs
index e50e168..81b08b1 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -1,14 +1,20 @@
 use crate::{
     debug::DebugVisualizationsPlugin, render::VelloRenderPlugin, text::VelloFontLoader, VelloAsset,
-    VelloFont,
+    VelloFont, VelloRenderSettings,
 };
-use bevy::{asset::load_internal_binary_asset, prelude::*};
+use bevy::{asset::load_internal_binary_asset, prelude::*, render::view::RenderLayers};
 
-pub struct VelloPlugin;
+#[derive(Resource, Default, Debug)]
+pub struct VelloPlugin {
+    pub canvas_render_layers: RenderLayers,
+}
 
 impl Plugin for VelloPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(VelloRenderPlugin)
+            .insert_resource(VelloRenderSettings {
+                canvas_render_layers: self.canvas_render_layers.clone(),
+            })
             .add_plugins(DebugVisualizationsPlugin)
             .init_asset::<VelloAsset>()
             .init_asset::<VelloFont>()
diff --git a/src/render/plugin.rs b/src/render/plugin.rs
index 8f0aaf7..5369e2b 100644
--- a/src/render/plugin.rs
+++ b/src/render/plugin.rs
@@ -21,10 +21,10 @@ use bevy::{
 
 pub struct VelloRenderPlugin;
 
-#[derive(Default, Resource, Clone)]
+#[derive(Resource, Default, Clone, Debug)]
 pub struct VelloRenderSettings {
-    /// the render layer that will be used for the vello canvas mesh
-    pub canvas_render_layers: Option<RenderLayers>,
+    /// The render layer that will be used for the vello canvas mesh.
+    pub canvas_render_layers: RenderLayers,
 }
 
 impl Plugin for VelloRenderPlugin {
@@ -81,7 +81,11 @@ impl Plugin for VelloRenderPlugin {
         .add_systems(Startup, systems::setup_ss_rendertarget)
         .add_systems(
             Update,
-            (systems::resize_rendertargets, systems::clear_when_empty),
+            (
+                systems::resize_rendertargets,
+                systems::hide_when_empty,
+                systems::settings_change_detection,
+            ),
         )
         .add_systems(
             PostUpdate,
diff --git a/src/render/systems.rs b/src/render/systems.rs
index 78b4ee6..b260e12 100644
--- a/src/render/systems.rs
+++ b/src/render/systems.rs
@@ -283,7 +283,7 @@ pub fn setup_ss_rendertarget(
     mut custom_materials: ResMut<Assets<VelloCanvasMaterial>>,
     windows: Query<&Window>,
     mut render_target_mesh_handle: Local<Option<Handle<Mesh>>>,
-    config: Option<Res<VelloRenderSettings>>,
+    settings: Res<VelloRenderSettings>,
 ) {
     let Ok(window) = windows.get_single() else {
         return;
@@ -319,26 +319,35 @@ pub fn setup_ss_rendertarget(
         texture: texture_image,
     });
 
-    let entity = commands
+    commands
         .spawn(MaterialMesh2dBundle {
             mesh,
             material,
-            transform: Transform::from_translation(0.001 * Vec3::NEG_Z), /* Make sure the vello
-                                                                          * canvas renders behind
-                                                                          * Gizmos */
-            ..Default::default()
+            ..default()
         })
         .insert(NoFrustumCulling)
         .insert(render_target)
-        .id();
+        .insert(settings.canvas_render_layers.clone());
+}
 
-    if let Some(layer) = config.and_then(|config| config.canvas_render_layers.clone()) {
-        commands.entity(entity).insert(layer);
+/// Listen for settings changes that a developer could make.
+pub fn settings_change_detection(
+    mut commands: Commands,
+    mut query_render_target: Query<Entity, With<SSRenderTarget>>,
+    settings: Res<VelloRenderSettings>,
+) {
+    if let Ok(entity) = query_render_target.get_single_mut() {
+        if settings.is_changed() {
+            // Replace the canvas render layers
+            commands
+                .entity(entity)
+                .insert(settings.canvas_render_layers.clone());
+        }
     }
 }
 
 /// Hide the render target canvas if there is nothing to render
-pub fn clear_when_empty(
+pub fn hide_when_empty(
     mut query_render_target: Query<&mut Visibility, With<SSRenderTarget>>,
     render_items: Query<
         (),