Add filter and backdrop to PaintScene and LayerCommand

Signed-off-by: Nico Burns <nico@nicoburns.com>

Author: nicoburns

crates/anyrender/src/lib.rs

@@ -44,6 +44,7 @@ use recording::RenderCommand;
 use std::{any::Any, sync::Arc};
 
 pub mod filters;
+pub use filters::Filter;
 pub mod wasm_send_sync;
 pub use wasm_send_sync::*;
 pub mod types;
@@ -192,6 +193,8 @@ pub trait PaintScene: RenderContext {
         alpha: f32,
         transform: Affine,
         clip: &impl Shape,
+        filter: Option<Arc<Filter>>,
+        backdrop_filter: Option<Arc<Filter>>,
     );
 
     /// Pushes a new clip layer clipped by the specified shape.
@@ -260,6 +263,8 @@ pub trait PaintScene: RenderContext {
                     cmd.alpha,
                     scene_transform * cmd.transform,
                     &cmd.clip,
+                    cmd.filter,
+                    cmd.backdrop_filter,
                 ),
                 RenderCommand::PushClipLayer(cmd) => {
                     self.push_clip_layer(scene_transform * cmd.transform, &cmd.clip)

crates/anyrender/src/null_backend.rs

@@ -1,6 +1,6 @@
 //! A dummy implementation of the AnyRender traits while simply ignores all commands
 
-use crate::{ImageRenderer, PaintScene, RenderContext, WindowHandle, WindowRenderer};
+use crate::{Filter, ImageRenderer, PaintScene, RenderContext, WindowHandle, WindowRenderer};
 use std::sync::Arc;
 
 #[derive(Copy, Clone, Default)]
@@ -102,6 +102,8 @@ impl PaintScene for NullScenePainter {
         _alpha: f32,
         _transform: kurbo::Affine,
         _clip: &impl kurbo::Shape,
+        _filter: Option<Arc<Filter>>,
+        _backdrop_filter: Option<Arc<Filter>>,
     ) {
     }
 

crates/anyrender/src/recording.rs

@@ -1,4 +1,6 @@
-use crate::{Glyph, NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext};
+use std::sync::Arc;
+
+use crate::{Filter, Glyph, NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext};
 use kurbo::{Affine, BezPath, Rect, Shape, Stroke};
 use peniko::{BlendMode, Color, Fill, FontData, Style, StyleRef};
 
@@ -58,6 +60,8 @@ pub struct LayerCommand {
     pub transform: Affine,
     #[cfg_attr(feature = "serde", serde(with = "svg_path"))]
     pub clip: BezPath, // TODO: more shape options
+    pub filter: Option<Arc<Filter>>,
+    pub backdrop_filter: Option<Arc<Filter>>,
 }
 
 /// Pushes a new clip layer clipped by the specified shape.
@@ -178,6 +182,8 @@ impl PaintScene for Scene {
         alpha: f32,
         transform: Affine,
         clip: &impl Shape,
+        filter: Option<Arc<Filter>>,
+        backdrop_filter: Option<Arc<Filter>>,
     ) {
         let blend = blend.into();
         let clip = clip.into_path(self.tolerance);
@@ -186,6 +192,8 @@ impl PaintScene for Scene {
             alpha,
             transform,
             clip,
+            filter,
+            backdrop_filter,
         };
         self.commands.push(RenderCommand::PushLayer(layer));
     }

crates/anyrender_serialize/tests/serialize.rs

@@ -30,6 +30,8 @@ fn test_all_command_types_roundtrip() {
         0.75,
         Affine::translate((5.0, 5.0)),
         &Rect::new(0.0, 0.0, 500.0, 500.0),
+        None,
+        None,
     );
 
     // Fill (NonZero)
@@ -85,6 +87,8 @@ fn test_all_command_types_roundtrip() {
         1.0,
         Affine::IDENTITY,
         &Rect::new(0.0, 0.0, 500.0, 500.0),
+        None,
+        None,
     );
     scene.fill(
         Fill::NonZero,

crates/anyrender_skia/src/scene.rs

@@ -1,4 +1,6 @@
-use anyrender::{PaintScene, RenderContext};
+use std::sync::Arc;
+
+use anyrender::{Filter, PaintScene, RenderContext};
 use peniko::color::AlphaColor;
 use skia_safe::{
     BlurStyle, Canvas, Color, ColorSpace, Font, FontArguments, FontHinting, FontMgr, GlyphId,
@@ -411,6 +413,8 @@ impl PaintScene for SkiaScenePainter<'_> {
         alpha: f32,
         transform: kurbo::Affine,
         clip: &impl kurbo::Shape,
+        _filter: Option<Arc<Filter>>,
+        _backdrop_filter: Option<Arc<Filter>>,
     ) {
         let blend: peniko::BlendMode = blend.into();
 

crates/anyrender_svg/src/render.rs

@@ -39,6 +39,8 @@ pub(crate) fn render_group<S: PaintScene, F: FnMut(&mut S, &usvg::Node)>(
                             alpha,
                             global_transform * transform,
                             &local_path,
+                            None,
+                            None,
                         );
 
                         true
@@ -60,6 +62,8 @@ pub(crate) fn render_group<S: PaintScene, F: FnMut(&mut S, &usvg::Node)>(
                             alpha,
                             global_transform * transform,
                             &rect,
+                            None,
+                            None,
                         );
 
                         true

crates/anyrender_vello/src/scene.rs

@@ -1,4 +1,6 @@
-use anyrender::{NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext, ResourceId};
+use std::sync::Arc;
+
+use anyrender::{Filter, NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext, ResourceId};
 use kurbo::{Affine, Rect, Shape, Stroke};
 use peniko::{BlendMode, BrushRef, Color, Fill, FontData, ImageBrush, ImageData, StyleRef};
 use rustc_hash::FxHashMap;
@@ -70,6 +72,8 @@ impl PaintScene for VelloScenePainter<'_, '_> {
         alpha: f32,
         transform: Affine,
         clip: &impl Shape,
+        _filter: Option<Arc<Filter>>,
+        _backdrop_filter: Option<Arc<Filter>>,
     ) {
         self.inner
             .push_layer(Fill::NonZero, blend, alpha, transform, clip);

crates/anyrender_vello_cpu/src/scene.rs

@@ -1,4 +1,6 @@
-use anyrender::{NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext};
+use std::sync::Arc;
+
+use anyrender::{Filter, NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext};
 use glifo::FontEmbolden;
 use kurbo::{Affine, Diagonal2, Rect, Shape, Stroke};
 use peniko::{BlendMode, Color, Fill, FontData, ImageBrush, StyleRef};
@@ -63,6 +65,8 @@ impl PaintScene for VelloCpuScenePainter {
         alpha: f32,
         transform: Affine,
         clip: &impl Shape,
+        _filter: Option<Arc<Filter>>,
+        _backdrop_filter: Option<Arc<Filter>>,
     ) {
         self.render_ctx.set_transform(transform);
         self.render_ctx.push_layer(

crates/anyrender_vello_hybrid/src/scene.rs

@@ -1,4 +1,6 @@
-use anyrender::{NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext, ResourceId};
+use std::sync::Arc;
+
+use anyrender::{Filter, NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext, ResourceId};
 use glifo::FontEmbolden;
 use kurbo::{Affine, Diagonal2, Rect, Shape, Stroke};
 use peniko::{BlendMode, Color, Fill, FontData, ImageBrush, ImageData, StyleRef};
@@ -176,6 +178,8 @@ impl PaintScene for VelloHybridScenePainter<'_> {
         alpha: f32,
         transform: Affine,
         clip: &impl Shape,
+        _filter: Option<Arc<Filter>>,
+        _backdrop_filter: Option<Arc<Filter>>,
     ) {
         self.scene.set_transform(transform);
         self.layer_stack.push(LayerKind::Layer);

crates/anyrender_vello_hybrid/src/webgl_scene.rs

@@ -107,6 +107,8 @@ impl PaintScene for WebGlScenePainter<'_> {
         alpha: f32,
         transform: Affine,
         clip: &impl Shape,
+        _filter: Option<Arc<Filter>>,
+        _backdrop_filter: Option<Arc<Filter>>,
     ) {
         self.scene.set_transform(transform);
         self.layer_stack.push(LayerKind::Layer);