diff --git a/node-graph/libraries/rendering/src/render_ext.rs b/node-graph/libraries/rendering/src/render_ext.rs index 5455607958..694ccb8d75 100644 --- a/node-graph/libraries/rendering/src/render_ext.rs +++ b/node-graph/libraries/rendering/src/render_ext.rs @@ -1,9 +1,11 @@ use crate::renderer::{RenderParams, format_transform_matrix}; +use crate::{Render, RenderSvgSegmentList, SvgRender}; use core_types::color::SRGBA8; use core_types::list::List; use core_types::uuid::generate_uuid; use core_types::{ATTR_GRADIENT_TYPE, ATTR_SPREAD_METHOD, ATTR_TRANSFORM, Color}; use glam::{DAffine2, DVec2}; +use graphic_types::Graphic; use graphic_types::vector_types::gradient::GradientType; use graphic_types::vector_types::vector::style::{PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin}; use std::fmt::Write; @@ -12,7 +14,17 @@ use vector_types::gradient::GradientSpreadMethod; pub trait RenderExt { type Output; - fn render(&self, svg_defs: &mut String, element_transform: DAffine2, stroke_transform: DAffine2, bounds: DAffine2, transformed_bounds: DAffine2, render_params: &RenderParams) -> Self::Output; + #[allow(clippy::too_many_arguments)] + fn render( + &self, + svg_defs: &mut String, + item_transform: DAffine2, + element_transform: DAffine2, + stroke_transform: DAffine2, + bounds: DAffine2, + transformed_bounds: DAffine2, + render_params: &RenderParams, + ) -> Self::Output; } impl RenderExt for List { @@ -21,6 +33,7 @@ impl RenderExt for List { fn render( &self, _svg_defs: &mut String, + _item_transform: DAffine2, _element_transform: DAffine2, _stroke_transform: DAffine2, _bounds: DAffine2, @@ -42,7 +55,16 @@ impl RenderExt for List { type Output = u64; /// Adds the gradient def through mutating the first argument, returning the gradient ID. - fn render(&self, svg_defs: &mut String, element_transform: DAffine2, stroke_transform: DAffine2, bounds: DAffine2, transformed_bounds: DAffine2, _render_params: &RenderParams) -> Self::Output { + fn render( + &self, + svg_defs: &mut String, + _item_transform: DAffine2, + element_transform: DAffine2, + stroke_transform: DAffine2, + bounds: DAffine2, + transformed_bounds: DAffine2, + _render_params: &RenderParams, + ) -> Self::Output { let mut stop = String::new(); let Some(stops) = self.element(0) else { return 0 }; @@ -118,6 +140,7 @@ impl RenderExt for Stroke { fn render( &self, _svg_defs: &mut String, + _item_transform: DAffine2, _element_transform: DAffine2, _stroke_transform: DAffine2, _bounds: DAffine2, @@ -174,3 +197,73 @@ impl RenderExt for Stroke { attributes } } + +impl RenderExt for List { + type Output = String; + + fn render( + &self, + svg_defs: &mut String, + item_transform: DAffine2, + element_transform: DAffine2, + stroke_transform: DAffine2, + bounds: DAffine2, + transformed_bounds: DAffine2, + render_params: &RenderParams, + ) -> Self::Output { + let fill_graphic = self.element(0); + + match fill_graphic { + Some(Graphic::Color(color_list)) => color_list.render(svg_defs, item_transform, element_transform, stroke_transform, bounds, transformed_bounds, render_params), + Some(Graphic::Gradient(gradient_list)) => { + let gradient_id = gradient_list.render(svg_defs, item_transform, element_transform, stroke_transform, bounds, transformed_bounds, render_params); + format!(r##" fill="url(#{gradient_id})""##) + } + Some(Graphic::Vector(_)) | Some(Graphic::RasterCPU(_)) | Some(Graphic::RasterGPU(_)) | Some(Graphic::Graphic(_)) => { + render_svg_fill_pattern(svg_defs, self, item_transform, bounds, render_params) + .map(|id| format!(r##" fill="url(#{id})""##)) + .unwrap_or_else(|| r#" fill="none""#.to_string()) + } + None => r#" fill="none""#.to_string(), + } + } +} + +/// Emits an SVG `` paint server into `svg_defs` that renders the given graphic list as the fill content, and returns the pattern ID. +/// Currently, this function is only used for clipping-based filling, not for tiling. +fn render_svg_fill_pattern(svg_defs: &mut String, fill_graphic_list: &List, item_transform: DAffine2, bounds: DAffine2, render_params: &RenderParams) -> Option { + let min = bounds.transform_point2(DVec2::ZERO); + let max = bounds.transform_point2(DVec2::ONE); + let size = max - min; + if size.x <= 0. || size.y <= 0. { + return None; + } + + // Render the pattern content recursively + let mut content = SvgRender::new(); + fill_graphic_list.render_svg(&mut content, &render_params.for_pattern()); + + // Unwrap the inner def element + write!(svg_defs, "{}", content.svg_defs).unwrap(); + + let pattern_transform = item_transform * DAffine2::from_translation(min); + let transform_str = format_transform_matrix(pattern_transform); + let transform_attr = if transform_str.is_empty() { + String::new() + } else { + format!(r#" patternTransform="{transform_str}""#) + }; + + let pattern_id = format!("pattern-{}", generate_uuid()); + write!( + svg_defs, + r##""##, + size.x, size.y, + ) + .unwrap(); + + let content_shift = format_transform_matrix(DAffine2::from_translation(-min)); + write!(svg_defs, r##"{}"##, content.svg.to_svg_string()).unwrap(); + + Some(pattern_id) +} diff --git a/node-graph/libraries/rendering/src/renderer.rs b/node-graph/libraries/rendering/src/renderer.rs index e5d54ee6a5..0a3493e9f1 100644 --- a/node-graph/libraries/rendering/src/renderer.rs +++ b/node-graph/libraries/rendering/src/renderer.rs @@ -346,87 +346,17 @@ fn fill_covers_opaquely(fill_graphic: Option<&Graphic>) -> bool { } } -/// Emits a SVG `` paint server element that renders any graphic element into def and returns the id. -/// Currently this function uses `` as a clip-based paint server, which means the content is rendered once without tiling. -fn render_svg_fill_pattern(svg_defs: &mut String, fill_graphic_list: &List, path_bbox: [DVec2; 2], item_transform: DAffine2, render_params: &RenderParams) -> Option { - let [min, max] = path_bbox; - let size = max - min; - if size.x <= 0. || size.y <= 0. { - return None; - } - - // Render the pattern content recursively - let mut content = SvgRender::new(); - fill_graphic_list.render_svg(&mut content, &render_params.for_pattern()); - - // Unwrap the inner def element - write!(svg_defs, "{}", content.svg_defs).unwrap(); - - let pattern_transform = item_transform * DAffine2::from_translation(min); - let transform_str = format_transform_matrix(pattern_transform); - let transform_attr = if transform_str.is_empty() { - String::new() - } else { - format!(r#" patternTransform="{transform_str}""#) - }; - - let pattern_id = format!("pattern-{}", generate_uuid()); - write!( - svg_defs, - r##""##, - size.x, size.y, - ) - .unwrap(); - - let content_shift = format_transform_matrix(DAffine2::from_translation(-min)); - write!(svg_defs, r##"{}"##, content.svg.to_svg_string()).unwrap(); - - Some(pattern_id) -} - -/// Returns the fill attribute for SVG tags corresponding to the given fill_graphic. -#[allow(clippy::too_many_arguments)] -fn compute_svg_fill_attribute( - fill_graphic_list: Option<&List>, - defs: &mut String, - element_transform: DAffine2, - applied_stroke_transform: DAffine2, - bounds_matrix: DAffine2, - transformed_bounds_matrix: DAffine2, - item_transform: DAffine2, - render_params: &RenderParams, -) -> String { - let fill_graphic = fill_graphic_list.and_then(|l| l.element(0)); - - match fill_graphic { - Some(Graphic::Color(color_list)) => color_list.render(defs, element_transform, applied_stroke_transform, bounds_matrix, transformed_bounds_matrix, render_params), - Some(Graphic::Gradient(gradient_list)) => { - let gradient_id = gradient_list.render(defs, element_transform, applied_stroke_transform, bounds_matrix, transformed_bounds_matrix, render_params); - format!(r##" fill="url(#{gradient_id})""##) - } - Some(Graphic::Vector(_)) | Some(Graphic::RasterCPU(_)) | Some(Graphic::RasterGPU(_)) | Some(Graphic::Graphic(_)) => { - let list = fill_graphic_list.unwrap(); - let min = bounds_matrix.transform_point2(DVec2::ZERO); - let max = bounds_matrix.transform_point2(DVec2::ONE); - render_svg_fill_pattern(defs, list, [min, max], item_transform, render_params) - .map(|id| format!(r##" fill="url(#{id})""##)) - .unwrap_or_else(|| r#" fill="none""#.to_string()) - } - None => r#" fill="none""#.to_string(), - } -} - /// Emits an SVG `` element with the resolved fill attribute corresponding to the given fill_graphic. #[allow(clippy::too_many_arguments)] fn emit_svg_fill_path( render: &mut SvgRender, d: String, - element_transform: DAffine2, fill_graphic_list: Option<&List>, + item_transform: DAffine2, + element_transform: DAffine2, applied_stroke_transform: DAffine2, bounds_matrix: DAffine2, transformed_bounds_matrix: DAffine2, - item_transform: DAffine2, render_params: &RenderParams, ) { render.leaf_tag("path", |attributes| { @@ -436,16 +366,19 @@ fn emit_svg_fill_path( attributes.push(ATTR_TRANSFORM, matrix); } let defs = &mut attributes.0.svg_defs; - let fill_attribute = compute_svg_fill_attribute( - fill_graphic_list, - defs, - element_transform, - applied_stroke_transform, - bounds_matrix, - transformed_bounds_matrix, - item_transform, - render_params, - ); + let fill_attribute = fill_graphic_list + .map(|list| { + list.render( + defs, + item_transform, + element_transform, + applied_stroke_transform, + bounds_matrix, + transformed_bounds_matrix, + render_params, + ) + }) + .unwrap_or_else(|| r#" fill="none""#.to_string()); attributes.push_val(fill_attribute); }); } @@ -1093,12 +1026,12 @@ impl Render for List { emit_svg_fill_path( render, path.clone(), - element_transform, fill_graphic_list.as_deref(), + item_transform, + element_transform, applied_stroke_transform, bounds_matrix, transformed_bounds_matrix, - item_transform, render_params, ); } @@ -1125,12 +1058,12 @@ impl Render for List { emit_svg_fill_path( render, face_d, - element_transform, fill_graphic_list.as_deref(), + item_transform, + element_transform, applied_stroke_transform, bounds_matrix, transformed_bounds_matrix, - item_transform, render_params, ); } @@ -1177,22 +1110,36 @@ impl Render for List { let stroke_attribute = vector .style .stroke() - .map(|stroke| stroke.render(defs, element_transform, applied_stroke_transform, bounds_matrix, transformed_bounds_matrix, &render_params)) + .map(|stroke| { + stroke.render( + defs, + item_transform, + element_transform, + applied_stroke_transform, + bounds_matrix, + transformed_bounds_matrix, + &render_params, + ) + }) .unwrap_or_default(); let fill_attribute = if needs_separate_alignment_fill || use_face_fill { r#" fill="none""#.to_string() } else { - compute_svg_fill_attribute( - fill_graphic_list.as_deref(), - defs, - element_transform, - applied_stroke_transform, - bounds_matrix, - transformed_bounds_matrix, - item_transform, - &render_params, - ) + fill_graphic_list + .as_deref() + .map(|list| { + list.render( + defs, + item_transform, + element_transform, + applied_stroke_transform, + bounds_matrix, + transformed_bounds_matrix, + &render_params, + ) + }) + .unwrap_or_else(|| r#" fill="none""#.to_string()) }; if let Some((id, mask_type, _)) = push_id { @@ -1221,12 +1168,12 @@ impl Render for List { emit_svg_fill_path( render, path.clone(), - element_transform, fill_graphic_list.as_deref(), + item_transform, + element_transform, applied_stroke_transform, bounds_matrix, transformed_bounds_matrix, - item_transform, render_params, ); }